diff options
Diffstat (limited to 'sys/arch')
1115 files changed, 12091 insertions, 12137 deletions
diff --git a/sys/arch/alpha/alpha/api_up1000.c b/sys/arch/alpha/alpha/api_up1000.c index 6afe874496e..d56195ffe75 100644 --- a/sys/arch/alpha/alpha/api_up1000.c +++ b/sys/arch/alpha/alpha/api_up1000.c @@ -1,4 +1,4 @@ -/* $OpenBSD: api_up1000.c,v 1.4 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: api_up1000.c,v 1.5 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: api_up1000.c,v 1.4 2000/06/20 03:48:53 matt Exp $ */ /* @@ -74,9 +74,9 @@ int bootdev_debug; #define DPRINTF(x) #endif -void api_up1000_init __P((void)); -static void api_up1000_cons_init __P((void)); -static void api_up1000_device_register __P((struct device *, void *)); +void api_up1000_init(void); +static void api_up1000_cons_init(void); +static void api_up1000_device_register(struct device *, void *); void api_up1000_init() diff --git a/sys/arch/alpha/alpha/autoconf.c b/sys/arch/alpha/alpha/autoconf.c index be86d9a1a43..8720aff8677 100644 --- a/sys/arch/alpha/alpha/autoconf.c +++ b/sys/arch/alpha/alpha/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.18 2002/01/22 21:47:38 ericj Exp $ */ +/* $OpenBSD: autoconf.c,v 1.19 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: autoconf.c,v 1.16 1996/11/13 21:13:04 cgd Exp $ */ /* @@ -68,18 +68,18 @@ int booted_partition; struct bootdev_data *bootdev_data; char boot_dev[128]; -void parse_prom_bootdev __P((void)); -int atoi __P((char *)); -void setroot __P((void)); -void swapconf __P((void)); - -static struct device *parsedisk __P((char *str, int len, int defpart, - dev_t *devp)); -static struct device *getdisk __P((char *str, int len, int defpart, - dev_t *devp)); -int findblkmajor __P((struct device *dv)); -char *findblkname __P((int)); -static int getstr __P((char *cp, int size)); +void parse_prom_bootdev(void); +int atoi(char *); +void setroot(void); +void swapconf(void); + +static struct device *parsedisk(char *str, int len, int defpart, + dev_t *devp); +static struct device *getdisk(char *str, int len, int defpart, + dev_t *devp); +int findblkmajor(struct device *dv); +char *findblkname(int); +static int getstr(char *cp, int size); /* * cpu_configure: diff --git a/sys/arch/alpha/alpha/clockvar.h b/sys/arch/alpha/alpha/clockvar.h index bdf66e16909..be31826a80f 100644 --- a/sys/arch/alpha/alpha/clockvar.h +++ b/sys/arch/alpha/alpha/clockvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: clockvar.h,v 1.4 1996/10/30 22:37:59 niklas Exp $ */ +/* $OpenBSD: clockvar.h,v 1.5 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: clockvar.h,v 1.2 1996/04/17 22:01:21 cgd Exp $ */ /* @@ -55,9 +55,9 @@ struct clocktime { * chip-dependent routines. */ struct clockfns { - void (*cf_init) __P((struct device *)); - void (*cf_get) __P((struct device *, time_t, struct clocktime *)); - void (*cf_set) __P((struct device *, struct clocktime *)); + void (*cf_init)(struct device *); + void (*cf_get)(struct device *, time_t, struct clocktime *); + void (*cf_set)(struct device *, struct clocktime *); }; -void clockattach __P((struct device *, const struct clockfns *)); +void clockattach(struct device *, const struct clockfns *); diff --git a/sys/arch/alpha/alpha/cpu.c b/sys/arch/alpha/alpha/cpu.c index 727d6f19a02..1f25ced4856 100644 --- a/sys/arch/alpha/alpha/cpu.c +++ b/sys/arch/alpha/alpha/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.11 2001/11/06 19:53:13 miod Exp $ */ +/* $OpenBSD: cpu.c,v 1.12 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: cpu.c,v 1.44 2000/05/23 05:12:53 thorpej Exp $ */ /*- @@ -93,7 +93,7 @@ struct cpu_info cpu_info[ALPHA_MAXPROCS]; /* Bitmask of CPUs currently running. */ __volatile u_long cpus_running; -void cpu_boot_secondary __P((struct cpu_info *)); +void cpu_boot_secondary(struct cpu_info *); #else /* MULTIPROCESSOR */ struct cpu_info cpu_info_store; #endif /* MULTIPROCESSOR */ diff --git a/sys/arch/alpha/alpha/cpuconf.c b/sys/arch/alpha/alpha/cpuconf.c index 57b7fa1639c..040b04d4985 100644 --- a/sys/arch/alpha/alpha/cpuconf.c +++ b/sys/arch/alpha/alpha/cpuconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpuconf.c,v 1.6 2002/01/24 19:45:03 miod Exp $ */ +/* $OpenBSD: cpuconf.c,v 1.7 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: cpuconf.c,v 1.27 2000/06/26 02:42:04 enami Exp $ */ /*- @@ -74,67 +74,67 @@ #include <machine/rpb.h> #ifdef DEC_3000_500 -extern void dec_3000_500_init __P((void)); +extern void dec_3000_500_init(void); #else #define dec_3000_500_init platform_not_configured #endif #ifdef DEC_3000_300 -extern void dec_3000_300_init __P((void)); +extern void dec_3000_300_init(void); #else #define dec_3000_300_init platform_not_configured #endif #ifdef DEC_AXPPCI_33 -extern void dec_axppci_33_init __P((void)); +extern void dec_axppci_33_init(void); #else #define dec_axppci_33_init platform_not_configured #endif #ifdef DEC_2100_A50 -extern void dec_2100_a50_init __P((void)); +extern void dec_2100_a50_init(void); #else #define dec_2100_a50_init platform_not_configured #endif #ifdef DEC_KN20AA -extern void dec_kn20aa_init __P((void)); +extern void dec_kn20aa_init(void); #else #define dec_kn20aa_init platform_not_configured #endif #ifdef DEC_EB164 -extern void dec_eb164_init __P((void)); +extern void dec_eb164_init(void); #else #define dec_eb164_init platform_not_configured #endif #ifdef DEC_EB64PLUS -extern void dec_eb64plus_init __P((void)); +extern void dec_eb64plus_init(void); #else #define dec_eb64plus_init platform_not_configured #endif #ifdef DEC_KN300 -extern void dec_kn300_init __P((void)); +extern void dec_kn300_init(void); #else #define dec_kn300_init platform_not_configured #endif #ifdef DEC_550 -extern void dec_550_init __P((void)); +extern void dec_550_init(void); #else #define dec_550_init platform_not_configured #endif #ifdef DEC_6600 -extern void dec_6600_init __P((void)); +extern void dec_6600_init(void); #else #define dec_6600_init platform_not_configured #endif #ifdef API_UP1000 -extern void api_up1000_init __P((void)); +extern void api_up1000_init(void); #else #define api_up1000_init platform_not_configured #endif diff --git a/sys/arch/alpha/alpha/db_disasm.c b/sys/arch/alpha/alpha/db_disasm.c index 27346df86c3..21abd8d3639 100644 --- a/sys/arch/alpha/alpha/db_disasm.c +++ b/sys/arch/alpha/alpha/db_disasm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_disasm.c,v 1.14 2000/11/08 19:16:58 ericj Exp $ */ +/* $OpenBSD: db_disasm.c,v 1.15 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: db_disasm.c,v 1.8 2000/05/25 19:57:30 jhawk Exp $ */ /* @@ -186,7 +186,7 @@ static const struct tbl pal_op_tbl[] = { { NULL, -1 }, }; -static const char *pal_opname __P((int)); +static const char *pal_opname(int); static const char * pal_opname(op) @@ -242,7 +242,7 @@ static const char **arit_opname[8] = { arit_c0, arit_c2, 0, 0, arit_c9, arit_cB, arit_cD, arit_cF }; -static __inline const char *arit_name __P((int)); +static __inline const char *arit_name(int); static __inline const char * arit_name(op) int op; @@ -283,7 +283,7 @@ static const char *logical_c8[4] = { "andnot", "ornot", "xornot", 0 }; -static __inline const char *logical_name __P((int)); +static __inline const char *logical_name(int); static __inline const char * logical_name(op) int op; @@ -332,7 +332,7 @@ static const char *bitop_c67ab[4][4] = { /* 7 */ { 0, "inswh", "inslh", "insqh" }, }; -static __inline const char *bitop_name __P((int)); +static __inline const char *bitop_name(int); static __inline const char * bitop_name(op) int op; @@ -362,7 +362,7 @@ static const char *mul_opname[4] = { "mull", "mulq", "mull/v", "mulq/v" }; -static __inline const char *mul_name __P((int)); +static __inline const char *mul_name(int); static __inline const char * mul_name(op) int op; @@ -388,7 +388,7 @@ static const char *special_opname[8] = { "trapb", 0, "mb", 0, "fetch", "fetch_m", "rpcc", "rc" }; -static __inline const char *special_name __P((int)); +static __inline const char *special_name(int); static __inline const char * special_name(op) int op; @@ -431,7 +431,7 @@ static const char *intmisc_opname_3x[16] = { "maxuw4", "maxsb8", "maxsw4", }; -static __inline const char *intmisc_name __P((int)); +static __inline const char *intmisc_name(int); static __inline const char * intmisc_name(op) int op; @@ -452,7 +452,7 @@ intmisc_name(op) return (unk); } -static const char *float_name __P((const struct tbl[], int, const char *type)); +static const char *float_name(const struct tbl[], int, const char *type); static const char * float_name(tbl, op, type) @@ -802,7 +802,7 @@ static const char *name_of_register[32] = { static int regcount; /* how many regs used in this inst */ static int regnum[3]; /* which regs used in this inst */ -static const char *register_name __P((int)); +static const char *register_name(int); static const char * register_name (ireg) @@ -823,7 +823,7 @@ register_name (ireg) * (optional) alternate format. Return address of start of * next instruction. */ -int alpha_print_instruction __P((db_addr_t, alpha_instruction, boolean_t)); +int alpha_print_instruction(db_addr_t, alpha_instruction, boolean_t); db_addr_t db_disasm(loc, altfmt) diff --git a/sys/arch/alpha/alpha/db_interface.c b/sys/arch/alpha/alpha/db_interface.c index e154d286dc4..8056c1f83d1 100644 --- a/sys/arch/alpha/alpha/db_interface.c +++ b/sys/arch/alpha/alpha/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.13 2001/11/06 19:53:13 miod Exp $ */ +/* $OpenBSD: db_interface.c,v 1.14 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: db_interface.c,v 1.8 1999/10/12 17:08:57 jdolecek Exp $ */ /* @@ -81,8 +81,8 @@ extern int trap_types; int db_active = 0; -void db_mach_halt __P((db_expr_t, int, db_expr_t, char *)); -void db_mach_reboot __P((db_expr_t, int, db_expr_t, char *)); +void db_mach_halt(db_expr_t, int, db_expr_t, char *); +void db_mach_reboot(db_expr_t, int, db_expr_t, char *); struct db_command db_machine_cmds[] = { { "halt", db_mach_halt, 0, 0 }, diff --git a/sys/arch/alpha/alpha/db_trace.c b/sys/arch/alpha/alpha/db_trace.c index 1be316ba40c..b0ecd7a2d9c 100644 --- a/sys/arch/alpha/alpha/db_trace.c +++ b/sys/arch/alpha/alpha/db_trace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_trace.c,v 1.8 2001/11/06 19:53:13 miod Exp $ */ +/* $OpenBSD: db_trace.c,v 1.9 2002/03/14 01:26:26 millert Exp $ */ /* * Copyright (c) 1997 Niklas Hallqvist. All rights reserverd. @@ -117,11 +117,11 @@ struct opcode opcode[] = { { OPC_BR, "bgt", 1 }, /* 3F */ }; -static __inline int sext __P((u_int)); -static __inline int rega __P((u_int)); -static __inline int regb __P((u_int)); -static __inline int regc __P((u_int)); -static __inline int disp __P((u_int)); +static __inline int sext(u_int); +static __inline int rega(u_int); +static __inline int regb(u_int); +static __inline int regc(u_int); +static __inline int disp(u_int); static __inline int sext(x) diff --git a/sys/arch/alpha/alpha/dec_2100_a50.c b/sys/arch/alpha/alpha/dec_2100_a50.c index 08fbafb4586..369ecec0dad 100644 --- a/sys/arch/alpha/alpha/dec_2100_a50.c +++ b/sys/arch/alpha/alpha/dec_2100_a50.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dec_2100_a50.c,v 1.14 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: dec_2100_a50.c,v 1.15 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: dec_2100_a50.c,v 1.43 2000/05/22 20:13:31 thorpej Exp $ */ /* @@ -66,9 +66,9 @@ #endif static int comcnrate = CONSPEED; -void dec_2100_a50_init __P((void)); -static void dec_2100_a50_cons_init __P((void)); -static void dec_2100_a50_device_register __P((struct device *, void *)); +void dec_2100_a50_init(void); +static void dec_2100_a50_cons_init(void); +static void dec_2100_a50_device_register(struct device *, void *); const struct alpha_variation_table dec_2100_a50_variations[] = { { SV_ST_AVANTI, "AlphaStation 400 4/233 (\"Avanti\")" }, diff --git a/sys/arch/alpha/alpha/dec_3000_300.c b/sys/arch/alpha/alpha/dec_3000_300.c index c04d8ce7381..e223ee20dc5 100644 --- a/sys/arch/alpha/alpha/dec_3000_300.c +++ b/sys/arch/alpha/alpha/dec_3000_300.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dec_3000_300.c,v 1.8 2000/11/08 21:48:43 art Exp $ */ +/* $OpenBSD: dec_3000_300.c,v 1.9 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: dec_3000_300.c,v 1.30 2000/05/22 20:13:32 thorpej Exp $ */ /* @@ -60,9 +60,9 @@ #include "wsdisplay.h" -void dec_3000_300_init __P((void)); -static void dec_3000_300_cons_init __P((void)); -static void dec_3000_300_device_register __P((struct device *, void *)); +void dec_3000_300_init(void); +static void dec_3000_300_cons_init(void); +static void dec_3000_300_device_register(struct device *, void *); const struct alpha_variation_table dec_3000_300_variations[] = { { SV_ST_PELICAN, "DEC 3000/300 (\"Pelican\")" }, diff --git a/sys/arch/alpha/alpha/dec_3000_500.c b/sys/arch/alpha/alpha/dec_3000_500.c index fe0cf650b7c..06236b957d3 100644 --- a/sys/arch/alpha/alpha/dec_3000_500.c +++ b/sys/arch/alpha/alpha/dec_3000_500.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dec_3000_500.c,v 1.8 2000/11/08 21:48:43 art Exp $ */ +/* $OpenBSD: dec_3000_500.c,v 1.9 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: dec_3000_500.c,v 1.29 2000/05/22 20:13:32 thorpej Exp $ */ /* @@ -59,9 +59,9 @@ #include "wsdisplay.h" -void dec_3000_500_init __P((void)); -static void dec_3000_500_cons_init __P((void)); -static void dec_3000_500_device_register __P((struct device *, void *)); +void dec_3000_500_init(void); +static void dec_3000_500_cons_init(void); +static void dec_3000_500_device_register(struct device *, void *); static const char dec_3000_500_sp[] = "DEC 3000/400 (\"Sandpiper\")"; static const char dec_3000_500_sf[] = "DEC 3000/500 (\"Flamingo\")"; diff --git a/sys/arch/alpha/alpha/dec_550.c b/sys/arch/alpha/alpha/dec_550.c index 5f65ee2e9b7..817c69ef29a 100644 --- a/sys/arch/alpha/alpha/dec_550.c +++ b/sys/arch/alpha/alpha/dec_550.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dec_550.c,v 1.6 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: dec_550.c,v 1.7 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: dec_550.c,v 1.10 2000/06/20 03:48:53 matt Exp $ */ /* @@ -73,10 +73,10 @@ static int comcnrate = CONSPEED; #define DR_VERBOSE(f) while (0) -void dec_550_init __P((void)); -static void dec_550_cons_init __P((void)); -static void dec_550_device_register __P((struct device *, void *)); -static void dec_550_powerdown __P((void)); +void dec_550_init(void); +static void dec_550_cons_init(void); +static void dec_550_device_register(struct device *, void *); +static void dec_550_powerdown(void); void dec_550_init() diff --git a/sys/arch/alpha/alpha/dec_6600.c b/sys/arch/alpha/alpha/dec_6600.c index 5f975523b68..22a433b3e21 100644 --- a/sys/arch/alpha/alpha/dec_6600.c +++ b/sys/arch/alpha/alpha/dec_6600.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dec_6600.c,v 1.4 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: dec_6600.c,v 1.5 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: dec_6600.c,v 1.7 2000/06/20 03:48:54 matt Exp $ */ /* @@ -66,9 +66,9 @@ static int comcnrate __attribute__((unused)) = CONSPEED; -void dec_6600_init __P((void)); -static void dec_6600_cons_init __P((void)); -static void dec_6600_device_register __P((struct device *, void *)); +void dec_6600_init(void); +static void dec_6600_cons_init(void); +static void dec_6600_device_register(struct device *, void *); void dec_6600_init() diff --git a/sys/arch/alpha/alpha/dec_axppci_33.c b/sys/arch/alpha/alpha/dec_axppci_33.c index f9306372f72..71cc1aa20dc 100644 --- a/sys/arch/alpha/alpha/dec_axppci_33.c +++ b/sys/arch/alpha/alpha/dec_axppci_33.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dec_axppci_33.c,v 1.15 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: dec_axppci_33.c,v 1.16 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: dec_axppci_33.c,v 1.44 2000/05/22 20:13:32 thorpej Exp $ */ /* @@ -65,16 +65,16 @@ #endif static int comcnrate = CONSPEED; -void dec_axppci_33_init __P((void)); -static void dec_axppci_33_cons_init __P((void)); -static void dec_axppci_33_device_register __P((struct device *, void *)); +void dec_axppci_33_init(void); +static void dec_axppci_33_cons_init(void); +static void dec_axppci_33_device_register(struct device *, void *); const struct alpha_variation_table dec_axppci_33_variations[] = { { 0, "Alpha PC AXPpci33 (\"NoName\")" }, { 0, NULL }, }; -static struct lca_config *lca_preinit __P((void)); +static struct lca_config *lca_preinit(void); static struct lca_config * lca_preinit() diff --git a/sys/arch/alpha/alpha/dec_eb164.c b/sys/arch/alpha/alpha/dec_eb164.c index 35f2a937967..6220f4af8d7 100644 --- a/sys/arch/alpha/alpha/dec_eb164.c +++ b/sys/arch/alpha/alpha/dec_eb164.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dec_eb164.c,v 1.9 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: dec_eb164.c,v 1.10 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: dec_eb164.c,v 1.33 2000/05/22 20:13:32 thorpej Exp $ */ /* @@ -69,9 +69,9 @@ static int comcnrate = CONSPEED; #define DR_VERBOSE(f) while (0) -void dec_eb164_init __P((void)); -static void dec_eb164_cons_init __P((void)); -static void dec_eb164_device_register __P((struct device *, void *)); +void dec_eb164_init(void); +static void dec_eb164_cons_init(void); +static void dec_eb164_device_register(struct device *, void *); void dec_eb164_init() diff --git a/sys/arch/alpha/alpha/dec_eb64plus.c b/sys/arch/alpha/alpha/dec_eb64plus.c index 74597673351..d29f1d6f579 100644 --- a/sys/arch/alpha/alpha/dec_eb64plus.c +++ b/sys/arch/alpha/alpha/dec_eb64plus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dec_eb64plus.c,v 1.1 2002/01/23 03:20:41 ericj Exp $ */ +/* $OpenBSD: dec_eb64plus.c,v 1.2 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: dec_eb64plus.c,v 1.25 2001/06/05 04:53:11 thorpej Exp $ */ /* @@ -68,9 +68,9 @@ #endif static int comcnrate = CONSPEED; -void dec_eb64plus_init __P((void)); -static void dec_eb64plus_cons_init __P((void)); -static void dec_eb64plus_device_register __P((struct device *, void *)); +void dec_eb64plus_init(void); +static void dec_eb64plus_cons_init(void); +static void dec_eb64plus_device_register(struct device *, void *); const struct alpha_variation_table dec_eb64plus_variations[] = { { 0, "DEC EB64+" }, diff --git a/sys/arch/alpha/alpha/dec_kn20aa.c b/sys/arch/alpha/alpha/dec_kn20aa.c index f303babcce4..986790957f0 100644 --- a/sys/arch/alpha/alpha/dec_kn20aa.c +++ b/sys/arch/alpha/alpha/dec_kn20aa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dec_kn20aa.c,v 1.13 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: dec_kn20aa.c,v 1.14 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: dec_kn20aa.c,v 1.42 2000/05/22 20:13:32 thorpej Exp $ */ /* @@ -66,9 +66,9 @@ #endif static int comcnrate = CONSPEED; -void dec_kn20aa_init __P((void)); -static void dec_kn20aa_cons_init __P((void)); -static void dec_kn20aa_device_register __P((struct device *, void *)); +void dec_kn20aa_init(void); +static void dec_kn20aa_cons_init(void); +static void dec_kn20aa_device_register(struct device *, void *); const struct alpha_variation_table dec_kn20aa_variations[] = { { 0, "AlphaStation 500 or 600 (KN20AA)" }, diff --git a/sys/arch/alpha/alpha/disksubr.c b/sys/arch/alpha/alpha/disksubr.c index 18e3958058d..ff4d99210e3 100644 --- a/sys/arch/alpha/alpha/disksubr.c +++ b/sys/arch/alpha/alpha/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.33 2002/02/19 02:46:39 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.34 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -67,16 +67,16 @@ #endif #if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL) -void swapdisklabel __P((struct disklabel *d)); -char *readbsdlabel __P((struct buf *, void (*) __P((struct buf *)), int, int, +void swapdisklabel(struct disklabel *d); +char *readbsdlabel __P((struct buf *, void (*)(struct buf *), int, int, int, int, struct disklabel *, int)); #endif #if defined(DISKLABEL_I386) || defined(DISKLABEL_ALL) -char *readdoslabel __P((struct buf *, void (*) __P((struct buf *)), +char *readdoslabel __P((struct buf *, void (*)(struct buf *), struct disklabel *, struct cpu_disklabel *, int *, int *, int)); #endif #if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL) -char *readamigalabel __P((struct buf *, void (*) __P((struct buf *)), +char *readamigalabel __P((struct buf *, void (*)(struct buf *), struct disklabel *, struct cpu_disklabel *, int)); #endif @@ -144,7 +144,7 @@ swapdisklabel(dlp) char * readbsdlabel(bp, strat, cyl, sec, off, endian, lp, spoofonly) struct buf *bp; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); int cyl, sec, off, endian; struct disklabel *lp; int spoofonly; @@ -228,7 +228,7 @@ readbsdlabel(bp, strat, cyl, sec, off, endian, lp, spoofonly) char * readdisklabel(dev, strat, lp, osdep, spoofonly) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *osdep; int spoofonly; @@ -330,7 +330,7 @@ done: char * readdoslabel(bp, strat, lp, osdep, partoffp, cylp, spoofonly) struct buf *bp; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *osdep; int *partoffp; @@ -560,7 +560,7 @@ donot: char * readamigalabel(bp, strat, lp, osdep, spoofonly) struct buf *bp; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *osdep; int spoofonly; @@ -644,7 +644,7 @@ setdisklabel(olp, nlp, openmask, osdep) int writedisklabel(dev, strat, lp, osdep) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *osdep; { diff --git a/sys/arch/alpha/alpha/in_cksum.c b/sys/arch/alpha/alpha/in_cksum.c index 7faa6826301..c87f08f39af 100644 --- a/sys/arch/alpha/alpha/in_cksum.c +++ b/sys/arch/alpha/alpha/in_cksum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in_cksum.c,v 1.4 1997/01/24 19:56:33 niklas Exp $ */ +/* $OpenBSD: in_cksum.c,v 1.5 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: in_cksum.c,v 1.4 1996/11/13 21:13:06 cgd Exp $ */ /* @@ -43,7 +43,7 @@ #include <sys/systm.h> #include <netinet/in.h> -u_int64_t in_cksumdata __P((caddr_t, int)); +u_int64_t in_cksumdata(caddr_t, int); /* * Checksum routine for Internet Protocol family headers @@ -85,7 +85,7 @@ union q_util { u_int64_t q; }; -u_int64_t in_cksumdata __P((caddr_t buf, int len)); +u_int64_t in_cksumdata(caddr_t buf, int len); u_int64_t in_cksumdata(buf, len) diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c index bc4a3584e7e..fca42b84f94 100644 --- a/sys/arch/alpha/alpha/machdep.c +++ b/sys/arch/alpha/alpha/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.67 2002/02/17 23:38:16 jason Exp $ */ +/* $OpenBSD: machdep.c,v 1.68 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */ /*- @@ -125,14 +125,14 @@ #include "le_ioasic.h" /* for le_iomem creation */ -int cpu_dump __P((void)); -int cpu_dumpsize __P((void)); -u_long cpu_dump_mempagecnt __P((void)); -void dumpsys __P((void)); -caddr_t allocsys __P((caddr_t)); -void identifycpu __P((void)); -void regdump __P((struct trapframe *framep)); -void printregs __P((struct reg *)); +int cpu_dump(void); +int cpu_dumpsize(void); +u_long cpu_dump_mempagecnt(void); +void dumpsys(void); +caddr_t allocsys(caddr_t); +void identifycpu(void); +void regdump(struct trapframe *framep); +void printregs(struct reg *); /* * Declare these as initialized data so we can patch them. @@ -1201,7 +1201,7 @@ cpu_dump_mempagecnt() int cpu_dump() { - int (*dump) __P((dev_t, daddr_t, caddr_t, size_t)); + int (*dump)(dev_t, daddr_t, caddr_t, size_t); char buf[dbtob(1)]; kcore_seg_t *segp; cpu_kcore_hdr_t *cpuhdrp; @@ -1297,7 +1297,7 @@ dumpsys() u_long maddr; int psize; daddr_t blkno; - int (*dump) __P((dev_t, daddr_t, caddr_t, size_t)); + int (*dump)(dev_t, daddr_t, caddr_t, size_t); int error; extern int msgbufmapped; @@ -1951,8 +1951,8 @@ delay(n) } #if defined(COMPAT_OSF1) || 1 /* XXX */ -void cpu_exec_ecoff_setregs __P((struct proc *, struct exec_package *, - u_long, register_t *)); +void cpu_exec_ecoff_setregs(struct proc *, struct exec_package *, + u_long, register_t *); void cpu_exec_ecoff_setregs(p, epp, stack, retval) diff --git a/sys/arch/alpha/alpha/mainbus.c b/sys/arch/alpha/alpha/mainbus.c index 496cb5da06b..ed2715f4487 100644 --- a/sys/arch/alpha/alpha/mainbus.c +++ b/sys/arch/alpha/alpha/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.10 2000/11/08 19:16:59 ericj Exp $ */ +/* $OpenBSD: mainbus.c,v 1.11 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: mainbus.c,v 1.27 1998/06/24 01:10:35 ross Exp $ */ /* @@ -39,9 +39,9 @@ #include <machine/cpuconf.h> /* 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 device), mbmatch, mbattach diff --git a/sys/arch/alpha/alpha/mcclock.c b/sys/arch/alpha/alpha/mcclock.c index 01a90f48a87..96eaf3f0b74 100644 --- a/sys/arch/alpha/alpha/mcclock.c +++ b/sys/arch/alpha/alpha/mcclock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mcclock.c,v 1.4 2001/04/14 22:18:03 mjacob Exp $ */ +/* $OpenBSD: mcclock.c,v 1.5 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: mcclock.c,v 1.4 1996/10/13 02:59:41 christos Exp $ */ /* @@ -41,9 +41,9 @@ struct cfdriver mcclock_cd = { NULL, "mcclock", DV_DULL, }; -void mcclock_init __P((struct device *)); -void mcclock_get __P((struct device *, time_t, struct clocktime *)); -void mcclock_set __P((struct device *, struct clocktime *)); +void mcclock_init(struct device *); +void mcclock_get(struct device *, time_t, struct clocktime *); +void mcclock_set(struct device *, struct clocktime *); const struct clockfns mcclock_clockfns = { mcclock_init, mcclock_get, mcclock_set, diff --git a/sys/arch/alpha/alpha/mcclockvar.h b/sys/arch/alpha/alpha/mcclockvar.h index f1064251092..974d7cc8d49 100644 --- a/sys/arch/alpha/alpha/mcclockvar.h +++ b/sys/arch/alpha/alpha/mcclockvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mcclockvar.h,v 1.3 1996/10/30 22:38:17 niklas Exp $ */ +/* $OpenBSD: mcclockvar.h,v 1.4 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: mcclockvar.h,v 1.2 1996/04/17 22:22:38 cgd Exp $ */ /* @@ -34,9 +34,9 @@ struct mcclock_softc { }; struct mcclock_busfns { - void (*mc_bf_write) __P((struct mcclock_softc *, u_int, u_int)); - u_int (*mc_bf_read) __P((struct mcclock_softc *, u_int)); + void (*mc_bf_write)(struct mcclock_softc *, u_int, u_int); + u_int (*mc_bf_read)(struct mcclock_softc *, u_int); }; -void mcclock_attach __P((struct mcclock_softc *, - const struct mcclock_busfns *)); +void mcclock_attach(struct mcclock_softc *, + const struct mcclock_busfns *); diff --git a/sys/arch/alpha/alpha/netbsd_machdep.c b/sys/arch/alpha/alpha/netbsd_machdep.c index 116218bb1ec..13fee57ba65 100644 --- a/sys/arch/alpha/alpha/netbsd_machdep.c +++ b/sys/arch/alpha/alpha/netbsd_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netbsd_machdep.c,v 1.6 2001/11/06 19:53:13 miod Exp $ */ +/* $OpenBSD: netbsd_machdep.c,v 1.7 2002/03/14 01:26:26 millert Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -56,11 +56,11 @@ extern int sigpid; #define SDB_KSTACK 0x02 #endif -static void netbsd_to_openbsd_sigcontext __P ((struct netbsd_sigcontext *, - struct sigcontext *)); +static void netbsd_to_openbsd_sigcontext(struct netbsd_sigcontext *, + struct sigcontext *); -static void openbsd_to_netbsd_sigcontext __P ((struct sigcontext *, - struct netbsd_sigcontext *)); +static void openbsd_to_netbsd_sigcontext(struct sigcontext *, + struct netbsd_sigcontext *); static void netbsd_to_openbsd_sigcontext(nbsc, obsc) diff --git a/sys/arch/alpha/alpha/prom.c b/sys/arch/alpha/alpha/prom.c index 2df5ed675c4..32a7d8e4e6f 100644 --- a/sys/arch/alpha/alpha/prom.c +++ b/sys/arch/alpha/alpha/prom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: prom.c,v 1.12 2001/11/06 19:53:13 miod Exp $ */ +/* $OpenBSD: prom.c,v 1.13 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: prom.c,v 1.39 2000/03/06 21:36:05 thorpej Exp $ */ /* @@ -55,7 +55,7 @@ struct simplelock prom_slock; int prom_mapped = 1; /* Is PROM still mapped? */ pt_entry_t prom_pte, saved_pte[1]; /* XXX */ -static pt_entry_t *prom_lev1map __P((void)); +static pt_entry_t *prom_lev1map(void); static pt_entry_t * prom_lev1map() @@ -100,7 +100,7 @@ init_bootstrap_console() } #ifdef _PMAP_MAY_USE_PROM_CONSOLE -static void prom_cache_sync __P((void)); +static void prom_cache_sync(void); #endif int @@ -160,7 +160,7 @@ prom_leave(s) #ifdef _PMAP_MAY_USE_PROM_CONSOLE static void -prom_cache_sync __P((void)) +prom_cache_sync(void) { ALPHA_TBIA(); alpha_pal_imb(); diff --git a/sys/arch/alpha/alpha/promcons.c b/sys/arch/alpha/alpha/promcons.c index 4a0b09f1792..c787f39e92c 100644 --- a/sys/arch/alpha/alpha/promcons.c +++ b/sys/arch/alpha/alpha/promcons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: promcons.c,v 1.6 2001/02/03 12:10:40 art Exp $ */ +/* $OpenBSD: promcons.c,v 1.7 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: promcons.c,v 1.5 1996/11/13 22:20:55 cgd Exp $ */ /* @@ -52,9 +52,9 @@ static struct tty *prom_tty[1]; static struct timeout prom_to; -void promstart __P((struct tty *)); -void promtimeout __P((void *)); -int promparam __P((struct tty *, struct termios *)); +void promstart(struct tty *); +void promtimeout(void *); +int promparam(struct tty *, struct termios *); cdev_decl(prom); cons_decl(prom); diff --git a/sys/arch/alpha/alpha/swapgeneric.c b/sys/arch/alpha/alpha/swapgeneric.c index a3e20846ae6..cb7e58d54a2 100644 --- a/sys/arch/alpha/alpha/swapgeneric.c +++ b/sys/arch/alpha/alpha/swapgeneric.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapgeneric.c,v 1.5 1996/11/06 02:00:59 deraadt Exp $ */ +/* $OpenBSD: swapgeneric.c,v 1.6 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: swapgeneric.c,v 1.5 1996/06/12 01:26:37 cgd Exp $ */ /*- @@ -43,7 +43,7 @@ #include <sys/param.h> #include <sys/conf.h> -int (*mountroot) __P((void)) = NULL; /* tells autoconf.c that we are "generic" */ +int (*mountroot)(void) = NULL; /* tells autoconf.c that we are "generic" */ dev_t rootdev = NODEV; dev_t dumpdev = NODEV; diff --git a/sys/arch/alpha/alpha/trap.c b/sys/arch/alpha/alpha/trap.c index fdc15020ce5..9209869fccc 100644 --- a/sys/arch/alpha/alpha/trap.c +++ b/sys/arch/alpha/alpha/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.30 2002/03/12 11:58:14 art Exp $ */ +/* $OpenBSD: trap.c,v 1.31 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: trap.c,v 1.52 2000/05/24 16:48:33 thorpej Exp $ */ /*- @@ -120,23 +120,23 @@ #include <compat/osf1/osf1_syscall.h> #endif -void userret __P((struct proc *, u_int64_t, u_quad_t)); +void userret(struct proc *, u_int64_t, u_quad_t); -unsigned long Sfloat_to_reg __P((unsigned int)); -unsigned int reg_to_Sfloat __P((unsigned long)); -unsigned long Tfloat_reg_cvt __P((unsigned long)); +unsigned long Sfloat_to_reg(unsigned int); +unsigned int reg_to_Sfloat(unsigned long); +unsigned long Tfloat_reg_cvt(unsigned long); #ifdef FIX_UNALIGNED_VAX_FP -unsigned long Ffloat_to_reg __P((unsigned int)); -unsigned int reg_to_Ffloat __P((unsigned long)); -unsigned long Gfloat_reg_cvt __P((unsigned long)); +unsigned long Ffloat_to_reg(unsigned int); +unsigned int reg_to_Ffloat(unsigned long); +unsigned long Gfloat_reg_cvt(unsigned long); #endif -int unaligned_fixup __P((unsigned long, unsigned long, - unsigned long, struct proc *)); +int unaligned_fixup(unsigned long, unsigned long, + unsigned long, struct proc *); int handle_opdec(struct proc *p, u_int64_t *ucodep); -static void printtrap __P((const unsigned long, const unsigned long, - const unsigned long, const unsigned long, struct trapframe *, int, int)); +static void printtrap(const unsigned long, const unsigned long, + const unsigned long, const unsigned long, struct trapframe *, int, int); /* * Initialize the trap vectors for the current processor. diff --git a/sys/arch/alpha/dev/bus_dma.c b/sys/arch/alpha/dev/bus_dma.c index ad2ef1b2bff..37843f61be2 100644 --- a/sys/arch/alpha/dev/bus_dma.c +++ b/sys/arch/alpha/dev/bus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_dma.c,v 1.8 2001/12/08 02:24:05 art Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.9 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: bus_dma.c,v 1.40 2000/07/17 04:47:56 thorpej Exp $ */ /*- @@ -52,9 +52,9 @@ #include <machine/bus.h> #include <machine/intr.h> -int _bus_dmamap_load_buffer_direct_common __P((bus_dma_tag_t, +int _bus_dmamap_load_buffer_direct_common(bus_dma_tag_t, bus_dmamap_t, void *, bus_size_t, struct proc *, int, - paddr_t *, int *, int)); + paddr_t *, int *, int); extern paddr_t avail_start, avail_end; /* from pmap.c */ diff --git a/sys/arch/alpha/dev/sgmap_typedep.h b/sys/arch/alpha/dev/sgmap_typedep.h index 692ec524ff0..2368cc75c10 100644 --- a/sys/arch/alpha/dev/sgmap_typedep.h +++ b/sys/arch/alpha/dev/sgmap_typedep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sgmap_typedep.h,v 1.1 2001/03/21 17:26:38 art Exp $ */ +/* $OpenBSD: sgmap_typedep.h,v 1.2 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: sgmap_typedep.h,v 1.4 1998/06/04 01:22:52 thorpej Exp $ */ /*- @@ -46,14 +46,14 @@ extern SGMAP_PTE_TYPE __C(SGMAP_TYPE,_prefetch_spill_page_pte); -void __C(SGMAP_TYPE,_init_spill_page_pte) __P((void)); -int __C(SGMAP_TYPE,_load) __P((bus_dma_tag_t, bus_dmamap_t, - void *, bus_size_t, struct proc *, int, struct alpha_sgmap *)); -int __C(SGMAP_TYPE,_load_mbuf) __P((bus_dma_tag_t, bus_dmamap_t, - struct mbuf *, int, struct alpha_sgmap *)); -int __C(SGMAP_TYPE,_load_uio) __P((bus_dma_tag_t, bus_dmamap_t, - struct uio *, int, struct alpha_sgmap *)); -int __C(SGMAP_TYPE,_load_raw) __P((bus_dma_tag_t, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int, struct alpha_sgmap *)); -void __C(SGMAP_TYPE,_unload) __P((bus_dma_tag_t, bus_dmamap_t, - struct alpha_sgmap *)); +void __C(SGMAP_TYPE,_init_spill_page_pte)(void); +int __C(SGMAP_TYPE,_load)(bus_dma_tag_t, bus_dmamap_t, + void *, bus_size_t, struct proc *, int, struct alpha_sgmap *); +int __C(SGMAP_TYPE,_load_mbuf)(bus_dma_tag_t, bus_dmamap_t, + struct mbuf *, int, struct alpha_sgmap *); +int __C(SGMAP_TYPE,_load_uio)(bus_dma_tag_t, bus_dmamap_t, + struct uio *, int, struct alpha_sgmap *); +int __C(SGMAP_TYPE,_load_raw)(bus_dma_tag_t, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int, struct alpha_sgmap *); +void __C(SGMAP_TYPE,_unload)(bus_dma_tag_t, bus_dmamap_t, + struct alpha_sgmap *); diff --git a/sys/arch/alpha/dev/sgmapvar.h b/sys/arch/alpha/dev/sgmapvar.h index ebdc972a6ea..c8c150fd5ac 100644 --- a/sys/arch/alpha/dev/sgmapvar.h +++ b/sys/arch/alpha/dev/sgmapvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sgmapvar.h,v 1.1 2001/03/21 17:26:38 art Exp $ */ +/* $OpenBSD: sgmapvar.h,v 1.2 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: sgmapvar.h,v 1.10 1998/08/14 16:50:02 thorpej Exp $ */ /*- @@ -85,12 +85,12 @@ struct sgmap_log_entry { extern vaddr_t alpha_sgmap_prefetch_spill_page_va; extern bus_addr_t alpha_sgmap_prefetch_spill_page_pa; -void alpha_sgmap_init __P((bus_dma_tag_t, struct alpha_sgmap *, +void alpha_sgmap_init(bus_dma_tag_t, struct alpha_sgmap *, const char *, bus_addr_t, bus_addr_t, bus_size_t, size_t, void *, - bus_size_t)); + bus_size_t); -int alpha_sgmap_alloc __P((bus_dmamap_t, bus_size_t, - struct alpha_sgmap *, int)); -void alpha_sgmap_free __P((bus_dmamap_t, struct alpha_sgmap *)); +int alpha_sgmap_alloc(bus_dmamap_t, bus_size_t, + struct alpha_sgmap *, int); +void alpha_sgmap_free(bus_dmamap_t, struct alpha_sgmap *); #endif /* _ALPHA_COMMON_SGMAPVAR_H */ diff --git a/sys/arch/alpha/dev/shared_intr.c b/sys/arch/alpha/dev/shared_intr.c index d5348dbf9e0..90c0c6bb4e4 100644 --- a/sys/arch/alpha/dev/shared_intr.c +++ b/sys/arch/alpha/dev/shared_intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: shared_intr.c,v 1.10 2001/06/25 00:43:07 mickey Exp $ */ +/* $OpenBSD: shared_intr.c,v 1.11 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: shared_intr.c,v 1.13 2000/03/19 01:46:18 thorpej Exp $ */ /* @@ -41,7 +41,7 @@ #include <machine/intr.h> -static const char *intr_typename __P((int)); +static const char *intr_typename(int); static const char * intr_typename(type) @@ -120,7 +120,7 @@ alpha_shared_intr_establish(intr, num, type, level, fn, arg, basename) struct alpha_shared_intr *intr; unsigned int num; int type, level; - int (*fn) __P((void *)); + int (*fn)(void *); void *arg; const char *basename; { diff --git a/sys/arch/alpha/eisa/eisa_machdep.h b/sys/arch/alpha/eisa/eisa_machdep.h index 589f705592c..52ac240c6c5 100644 --- a/sys/arch/alpha/eisa/eisa_machdep.h +++ b/sys/arch/alpha/eisa/eisa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: eisa_machdep.h,v 1.3 1996/10/30 22:38:47 niklas Exp $ */ +/* $OpenBSD: eisa_machdep.h,v 1.4 2002/03/14 01:26:26 millert Exp $ */ /* $NetBSD: eisa_machdep.h,v 1.1 1996/04/12 05:39:51 cgd Exp $ */ /* @@ -37,15 +37,15 @@ typedef int eisa_intr_handle_t; struct alpha_eisa_chipset { void *ec_v; - void (*ec_attach_hook) __P((struct device *, struct device *, - struct eisabus_attach_args *)); - int (*ec_maxslots) __P((void *)); - int (*ec_intr_map) __P((void *, u_int, - eisa_intr_handle_t *)); - const char *(*ec_intr_string) __P((void *, eisa_intr_handle_t)); + void (*ec_attach_hook)(struct device *, struct device *, + struct eisabus_attach_args *); + int (*ec_maxslots)(void *); + int (*ec_intr_map)(void *, u_int, + eisa_intr_handle_t *); + const char *(*ec_intr_string)(void *, eisa_intr_handle_t); void *(*ec_intr_establish) __P((void *, eisa_intr_handle_t, int, int, int (*)(void *), void *, char *)); - void (*ec_intr_disestablish) __P((void *, void *)); + void (*ec_intr_disestablish)(void *, void *); }; /* diff --git a/sys/arch/alpha/include/bus.h b/sys/arch/alpha/include/bus.h index 3fd5bdc6724..a8fec105751 100644 --- a/sys/arch/alpha/include/bus.h +++ b/sys/arch/alpha/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.16 2002/03/07 18:08:08 jason Exp $ */ +/* $OpenBSD: bus.h,v 1.17 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: bus.h,v 1.10 1996/12/02 22:19:32 cgd Exp $ */ /* @@ -347,9 +347,9 @@ struct alpha_bus_space { /* - * void bus_space_write_raw_region_N __P((bus_space_tag_t tag, + * void bus_space_write_raw_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * const u_int8_t *addr, size_t count)); + * const u_int8_t *addr, size_t count); * * Write `count' bytes in 2, 4 or 8 byte wide quantities to bus space * described by tag/handle and starting at `offset' from the diff --git a/sys/arch/alpha/include/db_machdep.h b/sys/arch/alpha/include/db_machdep.h index 5c980173461..7d6941f3287 100644 --- a/sys/arch/alpha/include/db_machdep.h +++ b/sys/arch/alpha/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.12 2001/11/06 19:53:13 miod Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.13 2002/03/14 01:26:27 millert Exp $ */ /* * Copyright (c) 1997 Niklas Hallqvist. All rights reserverd. @@ -82,22 +82,22 @@ db_regs_t ddb_regs; #define inst_trap_return(ins) ((ins) & 0) /* XXX */ #define inst_return(ins) (((ins) & 0xfc000000) == 0x68000000) -int alpha_debug __P((unsigned long, unsigned long, unsigned long, - unsigned long, struct trapframe *)); -db_addr_t db_branch_taken __P((int, db_addr_t, db_regs_t *)); -boolean_t db_inst_branch __P((int)); -boolean_t db_inst_call __P((int)); -boolean_t db_inst_load __P((int)); -boolean_t db_inst_return __P((int)); -boolean_t db_inst_store __P((int)); -boolean_t db_inst_trap_return __P((int)); -boolean_t db_inst_unconditional_flow_transfer __P((int)); -u_long db_register_value __P((db_regs_t *, int)); -int db_valid_breakpoint __P((db_addr_t)); -int ddb_trap __P((unsigned long, unsigned long, unsigned long, - unsigned long, struct trapframe *)); -int kdb_trap __P((int, int, db_regs_t *)); -db_addr_t next_instr_address __P((db_addr_t, int)); +int alpha_debug(unsigned long, unsigned long, unsigned long, + unsigned long, struct trapframe *); +db_addr_t db_branch_taken(int, db_addr_t, db_regs_t *); +boolean_t db_inst_branch(int); +boolean_t db_inst_call(int); +boolean_t db_inst_load(int); +boolean_t db_inst_return(int); +boolean_t db_inst_store(int); +boolean_t db_inst_trap_return(int); +boolean_t db_inst_unconditional_flow_transfer(int); +u_long db_register_value(db_regs_t *, int); +int db_valid_breakpoint(db_addr_t); +int ddb_trap(unsigned long, unsigned long, unsigned long, + unsigned long, struct trapframe *); +int kdb_trap(int, int, db_regs_t *); +db_addr_t next_instr_address(db_addr_t, int); #if 1 /* Backwards compatibility until we switch all archs to use the db_ prefix */ diff --git a/sys/arch/alpha/include/ecoff_machdep.h b/sys/arch/alpha/include/ecoff_machdep.h index ccc5b080e29..3dc79a1e043 100644 --- a/sys/arch/alpha/include/ecoff_machdep.h +++ b/sys/arch/alpha/include/ecoff_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ecoff_machdep.h,v 1.2 2000/08/31 14:49:06 ericj Exp $ */ +/* $OpenBSD: ecoff_machdep.h,v 1.3 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: ecoff_machdep.h,v 1.3 1996/05/09 23:47:25 cgd Exp $ */ /* @@ -100,6 +100,5 @@ struct ecoff_extsym { }; #ifdef _KERNEL -void cpu_exec_ecoff_setregs - __P((struct proc *, struct exec_package *, u_long, register_t *)); +void cpu_exec_ecoff_setregs(struct proc *, struct exec_package *, u_long, register_t *); #endif diff --git a/sys/arch/alpha/include/float.h b/sys/arch/alpha/include/float.h index 8de58003b23..be1aa9d9b6c 100644 --- a/sys/arch/alpha/include/float.h +++ b/sys/arch/alpha/include/float.h @@ -1,4 +1,4 @@ -/* $OpenBSD: float.h,v 1.4 1997/08/01 21:35:25 deraadt Exp $ */ +/* $OpenBSD: float.h,v 1.5 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: float.h,v 1.4 1995/06/20 20:45:22 jtc Exp $ */ /* @@ -40,7 +40,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/alpha/include/intr.h b/sys/arch/alpha/include/intr.h index 9c8f150b151..2bc797a9b03 100644 --- a/sys/arch/alpha/include/intr.h +++ b/sys/arch/alpha/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.12 2001/09/30 13:08:45 art Exp $ */ +/* $OpenBSD: intr.h,v 1.13 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: intr.h,v 1.26 2000/06/03 20:47:41 thorpej Exp $ */ /*- @@ -113,7 +113,7 @@ #define spllowersoftclock() alpha_pal_swpipl(ALPHA_PSL_IPL_SOFT) /* IPL-raising functions/macros */ -static __inline int _splraise __P((int)); +static __inline int _splraise(int); static __inline int _splraise(s) int s; @@ -149,11 +149,11 @@ _splraise(s) #define ALPHA_NIPIS 6 /* must not exceed 64 */ -typedef void (*ipifunc_t) __P((void)); +typedef void (*ipifunc_t)(void); extern ipifunc_t ipifuncs[ALPHA_NIPIS]; -void alpha_send_ipi __P((unsigned long, unsigned long)); -void alpha_broadcast_ipi __P((unsigned long)); +void alpha_send_ipi(unsigned long, unsigned long); +void alpha_broadcast_ipi(unsigned long); /* * Alpha shared-interrupt-line common code. @@ -163,7 +163,7 @@ struct alpha_shared_intrhand { TAILQ_ENTRY(alpha_shared_intrhand) ih_q; struct alpha_shared_intr *ih_intrhead; - int (*ih_fn) __P((void *)); + int (*ih_fn)(void *); void *ih_arg; int ih_level; unsigned int ih_num; @@ -195,7 +195,7 @@ struct alpha_soft_intrhand { LIST_ENTRY(alpha_soft_intrhand) sih_q; struct alpha_soft_intr *sih_intrhead; - void (*sih_fn) __P((void *)); + void (*sih_fn)(void *); void *sih_arg; int sih_pending; }; @@ -208,9 +208,9 @@ struct alpha_soft_intr { }; void *softintr_establish __P((int, void (*)(void *), void *)); -void softintr_disestablish __P((void *)); -void softintr_init __P((void)); -void softintr_dispatch __P((void)); +void softintr_disestablish(void *); +void softintr_init(void); +void softintr_dispatch(void); #define softintr_schedule(arg) \ do { \ @@ -226,27 +226,27 @@ extern struct alpha_soft_intrhand *softclock_intrhand; #define setsoftnet() softintr_schedule(softnet_intrhand) #define setsoftclock() softintr_schedule(softclock_intrhand) -struct alpha_shared_intr *alpha_shared_intr_alloc __P((unsigned int)); -int alpha_shared_intr_dispatch __P((struct alpha_shared_intr *, - unsigned int)); +struct alpha_shared_intr *alpha_shared_intr_alloc(unsigned int); +int alpha_shared_intr_dispatch(struct alpha_shared_intr *, + unsigned int); void *alpha_shared_intr_establish __P((struct alpha_shared_intr *, unsigned int, int, int, int (*)(void *), void *, const char *)); -void alpha_shared_intr_disestablish __P((struct alpha_shared_intr *, - void *, const char *)); -int alpha_shared_intr_get_sharetype __P((struct alpha_shared_intr *, - unsigned int)); -int alpha_shared_intr_isactive __P((struct alpha_shared_intr *, - unsigned int)); -void alpha_shared_intr_set_dfltsharetype __P((struct alpha_shared_intr *, - unsigned int, int)); -void alpha_shared_intr_set_maxstrays __P((struct alpha_shared_intr *, - unsigned int, int)); -void alpha_shared_intr_stray __P((struct alpha_shared_intr *, unsigned int, - const char *)); -void alpha_shared_intr_set_private __P((struct alpha_shared_intr *, - unsigned int, void *)); -void *alpha_shared_intr_get_private __P((struct alpha_shared_intr *, - unsigned int)); +void alpha_shared_intr_disestablish(struct alpha_shared_intr *, + void *, const char *); +int alpha_shared_intr_get_sharetype(struct alpha_shared_intr *, + unsigned int); +int alpha_shared_intr_isactive(struct alpha_shared_intr *, + unsigned int); +void alpha_shared_intr_set_dfltsharetype(struct alpha_shared_intr *, + unsigned int, int); +void alpha_shared_intr_set_maxstrays(struct alpha_shared_intr *, + unsigned int, int); +void alpha_shared_intr_stray(struct alpha_shared_intr *, unsigned int, + const char *); +void alpha_shared_intr_set_private(struct alpha_shared_intr *, + unsigned int, void *); +void *alpha_shared_intr_get_private(struct alpha_shared_intr *, + unsigned int); void set_iointr(void (*)(void *, unsigned long)); diff --git a/sys/arch/alpha/include/netbsd_machdep.h b/sys/arch/alpha/include/netbsd_machdep.h index 9c053b01357..cccaa2f7310 100644 --- a/sys/arch/alpha/include/netbsd_machdep.h +++ b/sys/arch/alpha/include/netbsd_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: netbsd_machdep.h,v 1.3 2001/01/15 12:02:36 art Exp $ */ +/* $OpenBSD: netbsd_machdep.h,v 1.4 2002/03/14 01:26:27 millert Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -51,7 +51,7 @@ struct netbsd_sigcontext { }; #ifdef _KERNEL -void netbsd_sendsig __P((sig_t, int, int, u_long, int, union sigval)); +void netbsd_sendsig(sig_t, int, int, u_long, int, union sigval); #endif #endif /* _NETBSD_MACHDEP_H */ diff --git a/sys/arch/alpha/include/param.h b/sys/arch/alpha/include/param.h index d291e572cbb..a8a4fd7b901 100644 --- a/sys/arch/alpha/include/param.h +++ b/sys/arch/alpha/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.21 2001/12/05 01:57:14 provos Exp $ */ +/* $OpenBSD: param.h,v 1.22 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: param.h,v 1.30 2000/06/09 16:03:04 thorpej Exp $ */ /* @@ -165,7 +165,7 @@ void delay(unsigned long); #define DELAY(n) delay(n) /* XXX THE FOLLOWING PROTOTYPE BELONGS IN INTR.H */ -int spl0 __P((void)); /* drop ipl to zero */ +int spl0(void); /* drop ipl to zero */ /* XXX END INTR.H */ /* XXX THE FOLLOWING PROTOTYPE SHOULD BE A BUS.H INTERFACE */ diff --git a/sys/arch/alpha/include/pcb.h b/sys/arch/alpha/include/pcb.h index 13062ee998c..f7eb89491af 100644 --- a/sys/arch/alpha/include/pcb.h +++ b/sys/arch/alpha/include/pcb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcb.h,v 1.4 1997/01/24 19:57:15 niklas Exp $ */ +/* $OpenBSD: pcb.h,v 1.5 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: pcb.h,v 1.5 1996/11/13 22:21:00 cgd Exp $ */ /* @@ -65,5 +65,5 @@ struct md_coredump { }; #ifdef _KERNEL -void savectx __P((struct pcb *)); +void savectx(struct pcb *); #endif diff --git a/sys/arch/alpha/include/proc.h b/sys/arch/alpha/include/proc.h index 8caaad0c739..fd698f6f9e1 100644 --- a/sys/arch/alpha/include/proc.h +++ b/sys/arch/alpha/include/proc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.h,v 1.6 2002/03/12 11:58:14 art Exp $ */ +/* $OpenBSD: proc.h,v 1.7 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: proc.h,v 1.2 1995/03/24 15:01:36 cgd Exp $ */ /* @@ -50,5 +50,5 @@ struct mdproc { #define MDP_STEP2 0x0003 /* Single step branch */ #ifdef _KERNEL -void switch_exit __P((struct proc *)); +void switch_exit(struct proc *); #endif diff --git a/sys/arch/alpha/include/reg.h b/sys/arch/alpha/include/reg.h index 4f0896553c0..23d0902cca4 100644 --- a/sys/arch/alpha/include/reg.h +++ b/sys/arch/alpha/include/reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: reg.h,v 1.4 2001/07/09 18:55:22 millert Exp $ */ +/* $OpenBSD: reg.h,v 1.5 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: reg.h,v 1.2 1995/03/28 18:14:07 jtc Exp $ */ /* @@ -92,10 +92,10 @@ struct fpreg { }; #ifdef _KERNEL -void restorefpstate __P((struct fpreg *)); -void savefpstate __P((struct fpreg *)); -void frametoreg __P((struct trapframe *, struct reg *)); -void regtoframe __P((struct reg *, struct trapframe *)); +void restorefpstate(struct fpreg *); +void savefpstate(struct fpreg *); +void frametoreg(struct trapframe *, struct reg *); +void regtoframe(struct reg *, struct trapframe *); #endif #endif /* _ALPHA_REG_H_ */ diff --git a/sys/arch/alpha/isa/isa_machdep.c b/sys/arch/alpha/isa/isa_machdep.c index fd585354e7b..a522c2f12fb 100644 --- a/sys/arch/alpha/isa/isa_machdep.c +++ b/sys/arch/alpha/isa/isa_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.c,v 1.11 2002/01/24 19:52:48 miod Exp $ */ +/* $OpenBSD: isa_machdep.c,v 1.12 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: isa_machdep.c,v 1.12 1998/08/07 10:26:39 drochner Exp $ */ /* @@ -54,9 +54,9 @@ #if (NPCPPI > 0) #include <dev/isa/pcppivar.h> -int isabeepmatch __P((struct device *, void *, void *)); -void isabeepattach __P((struct device *, struct device *, void *)); -void isabeep __P((int, int)); +int isabeepmatch(struct device *, void *, void *); +void isabeepattach(struct device *, struct device *, void *); +void isabeep(int, int); struct cfattach isabeep_ca = { sizeof(struct device), isabeepmatch, isabeepattach diff --git a/sys/arch/alpha/isa/isa_machdep.h b/sys/arch/alpha/isa/isa_machdep.h index 2c9f75f5a07..a2921e45875 100644 --- a/sys/arch/alpha/isa/isa_machdep.h +++ b/sys/arch/alpha/isa/isa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.h,v 1.10 2001/11/05 17:25:57 art Exp $ */ +/* $OpenBSD: isa_machdep.h,v 1.11 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: isa_machdep.h,v 1.3 1996/11/19 04:53:07 cgd Exp $ */ /* @@ -36,12 +36,12 @@ typedef struct alpha_isa_chipset *isa_chipset_tag_t; struct alpha_isa_chipset { void *ic_v; - void (*ic_attach_hook) __P((struct device *, struct device *, - struct isabus_attach_args *)); + void (*ic_attach_hook)(struct device *, struct device *, + struct isabus_attach_args *); void *(*ic_intr_establish) __P((void *, int, int, int, int (*)(void *), void *, char *)); - void (*ic_intr_disestablish) __P((void *, void *)); - int (*ic_intr_alloc) __P((isa_chipset_tag_t *, int, int, int *)); + void (*ic_intr_disestablish)(void *, void *); + int (*ic_intr_alloc)(isa_chipset_tag_t *, int, int, int *); }; /* @@ -62,7 +62,7 @@ struct alpha_isa_chipset { * alpha-specific ISA functions. * NOT TO BE USED DIRECTLY BY MACHINE INDEPENDENT CODE. */ -int isa_display_console __P((bus_space_tag_t, bus_space_tag_t)); +int isa_display_console(bus_space_tag_t, bus_space_tag_t); #ifdef _ALPHA_BUS_DMA_PRIVATE int isadma_bounce_dmamap_create(bus_dma_tag_t, bus_size_t, int, diff --git a/sys/arch/alpha/isa/isadma_bounce.c b/sys/arch/alpha/isa/isadma_bounce.c index b6dd4e893f8..50da003a4bd 100644 --- a/sys/arch/alpha/isa/isadma_bounce.c +++ b/sys/arch/alpha/isa/isadma_bounce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isadma_bounce.c,v 1.3 2001/11/06 19:53:13 miod Exp $ */ +/* $OpenBSD: isadma_bounce.c,v 1.4 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: isadma_bounce.c,v 1.3 2000/06/29 09:02:57 mrg Exp $ */ /*- @@ -97,9 +97,9 @@ struct isadma_bounce_cookie { #define ID_BUFTYPE_UIO 3 #define ID_BUFTYPE_RAW 4 -int isadma_bounce_alloc_bouncebuf __P((bus_dma_tag_t, bus_dmamap_t, - bus_size_t, int)); -void isadma_bounce_free_bouncebuf __P((bus_dma_tag_t, bus_dmamap_t)); +int isadma_bounce_alloc_bouncebuf(bus_dma_tag_t, bus_dmamap_t, + bus_size_t, int); +void isadma_bounce_free_bouncebuf(bus_dma_tag_t, bus_dmamap_t); /* * Create an ISA DMA map. diff --git a/sys/arch/alpha/isa/isafcns_jensen.c b/sys/arch/alpha/isa/isafcns_jensen.c index 0588d41d7a1..58efaef8d86 100644 --- a/sys/arch/alpha/isa/isafcns_jensen.c +++ b/sys/arch/alpha/isa/isafcns_jensen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isafcns_jensen.c,v 1.5 1999/01/11 05:11:02 millert Exp $ */ +/* $OpenBSD: isafcns_jensen.c,v 1.6 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: isafcns_jensen.c,v 1.4 1996/10/13 02:59:54 christos Exp $ */ /* @@ -32,19 +32,19 @@ #include <machine/pio.h> #include <machine/pte.h> -static u_int8_t jensen_inb __P((int port)); -/* static void jensen_insb __P((int port, void *addr, int cnt)); */ -static u_int16_t jensen_inw __P((int port)); -/* static void jensen_insw __P((int port, void *addr, int cnt)); */ -u_int32_t jensen_inl __P((int port)); -/* static void jensen_insl __P((int port, void *addr, int cnt)); */ - -static void jensen_outb __P((int port, u_int8_t datum)); -/* static void jensen_outsb __P((int port, void *addr, int cnt)); */ -static void jensen_outw __P((int port, u_int16_t datum)); -/* static void jensen_outsw __P((int port, void *addr, int cnt)); */ -static void jensen_outl __P((int port, u_int32_t datum)); -/* static void jensen_outsl __P((int port, void *addr, int cnt)); */ +static u_int8_t jensen_inb(int port); +/* static void jensen_insb(int port, void *addr, int cnt); */ +static u_int16_t jensen_inw(int port); +/* static void jensen_insw(int port, void *addr, int cnt); */ +u_int32_t jensen_inl(int port); +/* static void jensen_insl(int port, void *addr, int cnt); */ + +static void jensen_outb(int port, u_int8_t datum); +/* static void jensen_outsb(int port, void *addr, int cnt); */ +static void jensen_outw(int port, u_int16_t datum); +/* static void jensen_outsw(int port, void *addr, int cnt); */ +static void jensen_outl(int port, u_int32_t datum); +/* static void jensen_outsl(int port, void *addr, int cnt); */ struct alpha_isafcndesc jensen_isafcns = { jensen_inb, 0 /* jensen_insb */, diff --git a/sys/arch/alpha/isa/mcclock_isa.c b/sys/arch/alpha/isa/mcclock_isa.c index 392a63842b6..5f6273a1856 100644 --- a/sys/arch/alpha/isa/mcclock_isa.c +++ b/sys/arch/alpha/isa/mcclock_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mcclock_isa.c,v 1.6 1997/01/24 19:57:24 niklas Exp $ */ +/* $OpenBSD: mcclock_isa.c,v 1.7 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: mcclock_isa.c,v 1.5 1996/12/05 01:39:29 cgd Exp $ */ /* @@ -48,19 +48,19 @@ struct mcclock_isa_softc { }; #ifdef __BROKEN_INDIRECT_CONFIG -int mcclock_isa_match __P((struct device *, void *, void *)); +int mcclock_isa_match(struct device *, void *, void *); #else -int mcclock_isa_match __P((struct device *, struct cfdata *, void *)); +int mcclock_isa_match(struct device *, struct cfdata *, void *); #endif -void mcclock_isa_attach __P((struct device *, struct device *, void *)); +void mcclock_isa_attach(struct device *, struct device *, void *); struct cfattach mcclock_isa_ca = { sizeof (struct mcclock_isa_softc), mcclock_isa_match, mcclock_isa_attach, }; -void mcclock_isa_write __P((struct mcclock_softc *, u_int, u_int)); -u_int mcclock_isa_read __P((struct mcclock_softc *, u_int)); +void mcclock_isa_write(struct mcclock_softc *, u_int, u_int); +u_int mcclock_isa_read(struct mcclock_softc *, u_int); const struct mcclock_busfns mcclock_isa_busfns = { mcclock_isa_write, mcclock_isa_read, diff --git a/sys/arch/alpha/pci/apecs.c b/sys/arch/alpha/pci/apecs.c index 5c94e3e01cd..f3d2966a7af 100644 --- a/sys/arch/alpha/pci/apecs.c +++ b/sys/arch/alpha/pci/apecs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apecs.c,v 1.16 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: apecs.c,v 1.17 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: apecs.c,v 1.16 1996/12/05 01:39:34 cgd Exp $ */ /*- @@ -94,8 +94,8 @@ #include <alpha/pci/pci_1000.h> #endif -int apecsmatch __P((struct device *, void *, void *)); -void apecsattach __P((struct device *, struct device *, void *)); +int apecsmatch(struct device *, void *, void *); +void apecsattach(struct device *, struct device *, void *); struct cfattach apecs_ca = { sizeof(struct apecs_softc), apecsmatch, apecsattach, @@ -105,7 +105,7 @@ struct cfdriver apecs_cd = { NULL, "apecs", DV_DULL, }; -int apecsprint __P((void *, const char *pnp)); +int apecsprint(void *, const char *pnp); /* There can be only one. */ int apecsfound; diff --git a/sys/arch/alpha/pci/apecs_dma.c b/sys/arch/alpha/pci/apecs_dma.c index 886e1c3b2c1..3442f194e73 100644 --- a/sys/arch/alpha/pci/apecs_dma.c +++ b/sys/arch/alpha/pci/apecs_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apecs_dma.c,v 1.2 2001/11/06 19:53:13 miod Exp $ */ +/* $OpenBSD: apecs_dma.c,v 1.3 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: apecs_dma.c,v 1.13 2000/06/29 08:58:45 mrg Exp $ */ /*- @@ -59,26 +59,26 @@ #include <alpha/pci/apecsreg.h> #include <alpha/pci/apecsvar.h> -bus_dma_tag_t apecs_dma_get_tag __P((bus_dma_tag_t, alpha_bus_t)); +bus_dma_tag_t apecs_dma_get_tag(bus_dma_tag_t, alpha_bus_t); -int apecs_bus_dmamap_create_sgmap __P((bus_dma_tag_t, bus_size_t, int, - bus_size_t, bus_size_t, int, bus_dmamap_t *)); +int apecs_bus_dmamap_create_sgmap(bus_dma_tag_t, bus_size_t, int, + bus_size_t, bus_size_t, int, bus_dmamap_t *); -void apecs_bus_dmamap_destroy_sgmap __P((bus_dma_tag_t, bus_dmamap_t)); +void apecs_bus_dmamap_destroy_sgmap(bus_dma_tag_t, bus_dmamap_t); -int apecs_bus_dmamap_load_sgmap __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); +int apecs_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int); -int apecs_bus_dmamap_load_mbuf_sgmap __P((bus_dma_tag_t, bus_dmamap_t, - struct mbuf *, int)); +int apecs_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t, + struct mbuf *, int); -int apecs_bus_dmamap_load_uio_sgmap __P((bus_dma_tag_t, bus_dmamap_t, - struct uio *, int)); +int apecs_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t, + struct uio *, int); -int apecs_bus_dmamap_load_raw_sgmap __P((bus_dma_tag_t, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int)); +int apecs_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int); -void apecs_bus_dmamap_unload_sgmap __P((bus_dma_tag_t, bus_dmamap_t)); +void apecs_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t); /* * Direct-mapped window: 1G at 1G diff --git a/sys/arch/alpha/pci/apecs_pci.c b/sys/arch/alpha/pci/apecs_pci.c index 802fea7e2f4..f943d899692 100644 --- a/sys/arch/alpha/pci/apecs_pci.c +++ b/sys/arch/alpha/pci/apecs_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apecs_pci.c,v 1.8 2001/11/06 19:53:13 miod Exp $ */ +/* $OpenBSD: apecs_pci.c,v 1.9 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: apecs_pci.c,v 1.10 1996/11/13 21:13:25 cgd Exp $ */ /* @@ -42,14 +42,14 @@ #include <alpha/pci/apecsreg.h> #include <alpha/pci/apecsvar.h> -void apecs_attach_hook __P((struct device *, struct device *, - struct pcibus_attach_args *)); -int apecs_bus_maxdevs __P((void *, int)); -pcitag_t apecs_make_tag __P((void *, int, int, int)); -void apecs_decompose_tag __P((void *, pcitag_t, int *, int *, - int *)); -pcireg_t apecs_conf_read __P((void *, pcitag_t, int)); -void apecs_conf_write __P((void *, pcitag_t, int, pcireg_t)); +void apecs_attach_hook(struct device *, struct device *, + struct pcibus_attach_args *); +int apecs_bus_maxdevs(void *, int); +pcitag_t apecs_make_tag(void *, int, int, int); +void apecs_decompose_tag(void *, pcitag_t, int *, int *, + int *); +pcireg_t apecs_conf_read(void *, pcitag_t, int); +void apecs_conf_write(void *, pcitag_t, int, pcireg_t); void apecs_pci_init(pc, v) diff --git a/sys/arch/alpha/pci/apecsvar.h b/sys/arch/alpha/pci/apecsvar.h index 1b37e90d354..ef512550fd4 100644 --- a/sys/arch/alpha/pci/apecsvar.h +++ b/sys/arch/alpha/pci/apecsvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: apecsvar.h,v 1.8 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: apecsvar.h,v 1.9 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: apecsvar.h,v 1.5 1996/11/25 03:49:36 cgd Exp $ */ /* @@ -65,9 +65,9 @@ struct apecs_softc { struct apecs_config *sc_acp; }; -void apecs_init __P((struct apecs_config *, int)); -void apecs_pci_init __P((pci_chipset_tag_t, void *)); -void apecs_dma_init __P((struct apecs_config *)); +void apecs_init(struct apecs_config *, int); +void apecs_pci_init(pci_chipset_tag_t, void *); +void apecs_dma_init(struct apecs_config *); -void apecs_bus_io_init __P((bus_space_tag_t, void *)); -void apecs_bus_mem_init __P((bus_space_tag_t, void *)); +void apecs_bus_io_init(bus_space_tag_t, void *); +void apecs_bus_mem_init(bus_space_tag_t, void *); diff --git a/sys/arch/alpha/pci/cia.c b/sys/arch/alpha/pci/cia.c index bff533f5d38..91faa80af0e 100644 --- a/sys/arch/alpha/pci/cia.c +++ b/sys/arch/alpha/pci/cia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cia.c,v 1.17 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: cia.c,v 1.18 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: cia.c,v 1.56 2000/06/29 08:58:45 mrg Exp $ */ /*- @@ -99,8 +99,8 @@ #include <alpha/pci/pci_1000.h> #endif -int ciamatch __P((struct device *, void *, void *)); -void ciaattach __P((struct device *, struct device *, void *)); +int ciamatch(struct device *, void *, void *); +void ciaattach(struct device *, struct device *, void *); struct cfattach cia_ca = { sizeof(struct cia_softc), ciamatch, ciaattach, @@ -110,7 +110,7 @@ struct cfdriver cia_cd = { NULL, "cia", DV_DULL, }; -static int ciaprint __P((void *, const char *pnp)); +static int ciaprint(void *, const char *pnp); /* There can be only one. */ int ciafound; diff --git a/sys/arch/alpha/pci/cia_dma.c b/sys/arch/alpha/pci/cia_dma.c index 534b4743714..77545551338 100644 --- a/sys/arch/alpha/pci/cia_dma.c +++ b/sys/arch/alpha/pci/cia_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cia_dma.c,v 1.3 2001/11/06 19:53:13 miod Exp $ */ +/* $OpenBSD: cia_dma.c,v 1.4 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: cia_dma.c,v 1.16 2000/06/29 08:58:46 mrg Exp $ */ /*- @@ -59,29 +59,29 @@ #include <alpha/pci/ciareg.h> #include <alpha/pci/ciavar.h> -bus_dma_tag_t cia_dma_get_tag __P((bus_dma_tag_t, alpha_bus_t)); +bus_dma_tag_t cia_dma_get_tag(bus_dma_tag_t, alpha_bus_t); -int cia_bus_dmamap_create_direct __P((bus_dma_tag_t, bus_size_t, int, - bus_size_t, bus_size_t, int, bus_dmamap_t *)); +int cia_bus_dmamap_create_direct(bus_dma_tag_t, bus_size_t, int, + bus_size_t, bus_size_t, int, bus_dmamap_t *); -int cia_bus_dmamap_create_sgmap __P((bus_dma_tag_t, bus_size_t, int, - bus_size_t, bus_size_t, int, bus_dmamap_t *)); +int cia_bus_dmamap_create_sgmap(bus_dma_tag_t, bus_size_t, int, + bus_size_t, bus_size_t, int, bus_dmamap_t *); -void cia_bus_dmamap_destroy_sgmap __P((bus_dma_tag_t, bus_dmamap_t)); +void cia_bus_dmamap_destroy_sgmap(bus_dma_tag_t, bus_dmamap_t); -int cia_bus_dmamap_load_sgmap __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); +int cia_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int); -int cia_bus_dmamap_load_mbuf_sgmap __P((bus_dma_tag_t, bus_dmamap_t, - struct mbuf *, int)); +int cia_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t, + struct mbuf *, int); -int cia_bus_dmamap_load_uio_sgmap __P((bus_dma_tag_t, bus_dmamap_t, - struct uio *, int)); +int cia_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t, + struct uio *, int); -int cia_bus_dmamap_load_raw_sgmap __P((bus_dma_tag_t, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int)); +int cia_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int); -void cia_bus_dmamap_unload_sgmap __P((bus_dma_tag_t, bus_dmamap_t)); +void cia_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t); /* * Direct-mapped window: 1G at 1G @@ -95,10 +95,10 @@ void cia_bus_dmamap_unload_sgmap __P((bus_dma_tag_t, bus_dmamap_t)); #define CIA_SGMAP_MAPPED_BASE (8*1024*1024) #define CIA_SGMAP_MAPPED_SIZE (8*1024*1024) -void cia_tlb_invalidate __P((void)); -void cia_broken_pyxis_tlb_invalidate __P((void)); +void cia_tlb_invalidate(void); +void cia_broken_pyxis_tlb_invalidate(void); -void (*cia_tlb_invalidate_fn) __P((void)); +void (*cia_tlb_invalidate_fn)(void); #define CIA_TLB_INVALIDATE() (*cia_tlb_invalidate_fn)() diff --git a/sys/arch/alpha/pci/cia_pci.c b/sys/arch/alpha/pci/cia_pci.c index e219e620297..67f41dd0d43 100644 --- a/sys/arch/alpha/pci/cia_pci.c +++ b/sys/arch/alpha/pci/cia_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cia_pci.c,v 1.8 2001/11/06 19:53:13 miod Exp $ */ +/* $OpenBSD: cia_pci.c,v 1.9 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: cia_pci.c,v 1.25 2000/06/29 08:58:46 mrg Exp $ */ /* @@ -40,14 +40,14 @@ #include <alpha/pci/ciareg.h> #include <alpha/pci/ciavar.h> -void cia_attach_hook __P((struct device *, struct device *, - struct pcibus_attach_args *)); -int cia_bus_maxdevs __P((void *, int)); -pcitag_t cia_make_tag __P((void *, int, int, int)); -void cia_decompose_tag __P((void *, pcitag_t, int *, int *, - int *)); -pcireg_t cia_conf_read __P((void *, pcitag_t, int)); -void cia_conf_write __P((void *, pcitag_t, int, pcireg_t)); +void cia_attach_hook(struct device *, struct device *, + struct pcibus_attach_args *); +int cia_bus_maxdevs(void *, int); +pcitag_t cia_make_tag(void *, int, int, int); +void cia_decompose_tag(void *, pcitag_t, int *, int *, + int *); +pcireg_t cia_conf_read(void *, pcitag_t, int); +void cia_conf_write(void *, pcitag_t, int, pcireg_t); void cia_pci_init(pc, v) diff --git a/sys/arch/alpha/pci/ciavar.h b/sys/arch/alpha/pci/ciavar.h index bc9c2861fba..419bc4d8d06 100644 --- a/sys/arch/alpha/pci/ciavar.h +++ b/sys/arch/alpha/pci/ciavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ciavar.h,v 1.11 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: ciavar.h,v 1.12 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: ciavar.h,v 1.17 2000/03/19 01:43:25 thorpej Exp $ */ /* @@ -72,14 +72,14 @@ struct cia_softc { struct cia_config *sc_ccp; }; -void cia_init __P((struct cia_config *, int)); -void cia_pci_init __P((pci_chipset_tag_t, void *)); -void cia_dma_init __P((struct cia_config *)); +void cia_init(struct cia_config *, int); +void cia_pci_init(pci_chipset_tag_t, void *); +void cia_dma_init(struct cia_config *); -void cia_bwx_bus_io_init __P((bus_space_tag_t, void *)); -void cia_bwx_bus_mem_init __P((bus_space_tag_t, void *)); +void cia_bwx_bus_io_init(bus_space_tag_t, void *); +void cia_bwx_bus_mem_init(bus_space_tag_t, void *); -void cia_bus_io_init __P((bus_space_tag_t, void *)); -void cia_bus_mem_init __P((bus_space_tag_t, void *)); +void cia_bus_io_init(bus_space_tag_t, void *); +void cia_bus_mem_init(bus_space_tag_t, void *); -void cia_pyxis_intr_enable __P((int, int)); +void cia_pyxis_intr_enable(int, int); diff --git a/sys/arch/alpha/pci/irongate_pci.c b/sys/arch/alpha/pci/irongate_pci.c index f75f2189a92..68447e008aa 100644 --- a/sys/arch/alpha/pci/irongate_pci.c +++ b/sys/arch/alpha/pci/irongate_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: irongate_pci.c,v 1.3 2001/11/06 19:53:13 miod Exp $ */ +/* $OpenBSD: irongate_pci.c,v 1.4 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: irongate_pci.c,v 1.2 2000/06/29 08:58:47 mrg Exp $ */ /*- @@ -54,14 +54,14 @@ #include <alpha/pci/irongatereg.h> #include <alpha/pci/irongatevar.h> -void irongate_attach_hook __P((struct device *, struct device *, - struct pcibus_attach_args *)); -int irongate_bus_maxdevs __P((void *, int)); -pcitag_t irongate_make_tag __P((void *, int, int, int)); -void irongate_decompose_tag __P((void *, pcitag_t, int *, int *, - int *)); -pcireg_t irongate_conf_read __P((void *, pcitag_t, int)); -void irongate_conf_write __P((void *, pcitag_t, int, pcireg_t)); +void irongate_attach_hook(struct device *, struct device *, + struct pcibus_attach_args *); +int irongate_bus_maxdevs(void *, int); +pcitag_t irongate_make_tag(void *, int, int, int); +void irongate_decompose_tag(void *, pcitag_t, int *, int *, + int *); +pcireg_t irongate_conf_read(void *, pcitag_t, int); +void irongate_conf_write(void *, pcitag_t, int, pcireg_t); /* AMD 751 systems are always single-processor, so this is easy. */ #define PCI_CONF_LOCK(s) (s) = splhigh() diff --git a/sys/arch/alpha/pci/lca.c b/sys/arch/alpha/pci/lca.c index 4f4cd66c92a..859e1f9e9d7 100644 --- a/sys/arch/alpha/pci/lca.c +++ b/sys/arch/alpha/pci/lca.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lca.c,v 1.15 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: lca.c,v 1.16 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: lca.c,v 1.14 1996/12/05 01:39:35 cgd Exp $ */ /*- @@ -92,8 +92,8 @@ #include <alpha/pci/pci_eb66.h> #endif -int lcamatch __P((struct device *, void *, void *)); -void lcaattach __P((struct device *, struct device *, void *)); +int lcamatch(struct device *, void *, void *); +void lcaattach(struct device *, struct device *, void *); struct cfattach lca_ca = { sizeof(struct lca_softc), lcamatch, lcaattach, @@ -103,11 +103,11 @@ struct cfdriver lca_cd = { NULL, "lca", DV_DULL, }; -int lcaprint __P((void *, const char *pnp)); +int lcaprint(void *, const char *pnp); #if 0 -int lca_bus_get_window __P((int, int, - struct alpha_bus_space_translation *)); +int lca_bus_get_window(int, int, + struct alpha_bus_space_translation *); #endif /* There can be only one. */ diff --git a/sys/arch/alpha/pci/lca_dma.c b/sys/arch/alpha/pci/lca_dma.c index a2ef7daa8ea..4909f10a0eb 100644 --- a/sys/arch/alpha/pci/lca_dma.c +++ b/sys/arch/alpha/pci/lca_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lca_dma.c,v 1.3 2001/11/06 19:53:13 miod Exp $ */ +/* $OpenBSD: lca_dma.c,v 1.4 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: lca_dma.c,v 1.13 2000/06/29 08:58:47 mrg Exp $ */ /*- @@ -59,26 +59,26 @@ #include <alpha/pci/lcareg.h> #include <alpha/pci/lcavar.h> -bus_dma_tag_t lca_dma_get_tag __P((bus_dma_tag_t, alpha_bus_t)); +bus_dma_tag_t lca_dma_get_tag(bus_dma_tag_t, alpha_bus_t); -int lca_bus_dmamap_create_sgmap __P((bus_dma_tag_t, bus_size_t, int, - bus_size_t, bus_size_t, int, bus_dmamap_t *)); +int lca_bus_dmamap_create_sgmap(bus_dma_tag_t, bus_size_t, int, + bus_size_t, bus_size_t, int, bus_dmamap_t *); -void lca_bus_dmamap_destroy_sgmap __P((bus_dma_tag_t, bus_dmamap_t)); +void lca_bus_dmamap_destroy_sgmap(bus_dma_tag_t, bus_dmamap_t); -int lca_bus_dmamap_load_sgmap __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); +int lca_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int); -int lca_bus_dmamap_load_mbuf_sgmap __P((bus_dma_tag_t, bus_dmamap_t, - struct mbuf *, int)); +int lca_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t, + struct mbuf *, int); -int lca_bus_dmamap_load_uio_sgmap __P((bus_dma_tag_t, bus_dmamap_t, - struct uio *, int)); +int lca_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t, + struct uio *, int); -int lca_bus_dmamap_load_raw_sgmap __P((bus_dma_tag_t, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int)); +int lca_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int); -void lca_bus_dmamap_unload_sgmap __P((bus_dma_tag_t, bus_dmamap_t)); +void lca_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t); /* * Direct-mapped window: 1G at 1G diff --git a/sys/arch/alpha/pci/lca_pci.c b/sys/arch/alpha/pci/lca_pci.c index 10e5fa3a8f7..697619e294f 100644 --- a/sys/arch/alpha/pci/lca_pci.c +++ b/sys/arch/alpha/pci/lca_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lca_pci.c,v 1.7 2001/11/06 19:53:13 miod Exp $ */ +/* $OpenBSD: lca_pci.c,v 1.8 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: lca_pci.c,v 1.13 1997/09/02 13:19:35 thorpej Exp $ */ /* @@ -42,14 +42,14 @@ #include <alpha/pci/lcareg.h> #include <alpha/pci/lcavar.h> -void lca_attach_hook __P((struct device *, struct device *, - struct pcibus_attach_args *)); -int lca_bus_maxdevs __P((void *, int)); -pcitag_t lca_make_tag __P((void *, int, int, int)); -void lca_decompose_tag __P((void *, pcitag_t, int *, int *, - int *)); -pcireg_t lca_conf_read __P((void *, pcitag_t, int)); -void lca_conf_write __P((void *, pcitag_t, int, pcireg_t)); +void lca_attach_hook(struct device *, struct device *, + struct pcibus_attach_args *); +int lca_bus_maxdevs(void *, int); +pcitag_t lca_make_tag(void *, int, int, int); +void lca_decompose_tag(void *, pcitag_t, int *, int *, + int *); +pcireg_t lca_conf_read(void *, pcitag_t, int); +void lca_conf_write(void *, pcitag_t, int, pcireg_t); void lca_pci_init(pc, v) diff --git a/sys/arch/alpha/pci/lcavar.h b/sys/arch/alpha/pci/lcavar.h index 001ba6314ae..8a25348d6b9 100644 --- a/sys/arch/alpha/pci/lcavar.h +++ b/sys/arch/alpha/pci/lcavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lcavar.h,v 1.9 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: lcavar.h,v 1.10 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: lcavar.h,v 1.7 1997/06/06 23:54:32 thorpej Exp $ */ /* @@ -61,9 +61,9 @@ struct lca_softc { struct lca_config *sc_lcp; }; -void lca_init __P((struct lca_config *, int)); -void lca_pci_init __P((pci_chipset_tag_t, void *)); -void lca_dma_init __P((struct lca_config *)); +void lca_init(struct lca_config *, int); +void lca_pci_init(pci_chipset_tag_t, void *); +void lca_dma_init(struct lca_config *); -void lca_bus_io_init __P((bus_space_tag_t, void *)); -void lca_bus_mem_init __P((bus_space_tag_t, void *)); +void lca_bus_io_init(bus_space_tag_t, void *); +void lca_bus_mem_init(bus_space_tag_t, void *); diff --git a/sys/arch/alpha/pci/pci_2100_a50.c b/sys/arch/alpha/pci/pci_2100_a50.c index 78645296abe..0da6944a7b1 100644 --- a/sys/arch/alpha/pci/pci_2100_a50.c +++ b/sys/arch/alpha/pci/pci_2100_a50.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_2100_a50.c,v 1.17 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: pci_2100_a50.c,v 1.18 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: pci_2100_a50.c,v 1.12 1996/11/13 21:13:29 cgd Exp $ */ /* @@ -52,13 +52,13 @@ #include "sio.h" -int dec_2100_a50_intr_map __P((void *, pcitag_t, int, int, - pci_intr_handle_t *)); -const char *dec_2100_a50_intr_string __P((void *, pci_intr_handle_t)); -int dec_2100_a50_intr_line __P((void *, pci_intr_handle_t)); +int dec_2100_a50_intr_map(void *, pcitag_t, int, int, + pci_intr_handle_t *); +const char *dec_2100_a50_intr_string(void *, pci_intr_handle_t); +int dec_2100_a50_intr_line(void *, pci_intr_handle_t); void *dec_2100_a50_intr_establish __P((void *, pci_intr_handle_t, int, int (*func)(void *), void *, char *)); -void dec_2100_a50_intr_disestablish __P((void *, void *)); +void dec_2100_a50_intr_disestablish(void *, void *); #define APECS_SIO_DEVICE 7 /* XXX */ @@ -235,7 +235,7 @@ dec_2100_a50_intr_establish(acv, ih, level, func, arg, name) void *acv, *arg; pci_intr_handle_t ih; int level; - int (*func) __P((void *)); + int (*func)(void *); char *name; { return sio_intr_establish(NULL /*XXX*/, ih, IST_LEVEL, level, func, diff --git a/sys/arch/alpha/pci/pci_2100_a50.h b/sys/arch/alpha/pci/pci_2100_a50.h index adee2d737cb..252ecf75f4a 100644 --- a/sys/arch/alpha/pci/pci_2100_a50.h +++ b/sys/arch/alpha/pci/pci_2100_a50.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_2100_a50.h,v 1.4 1996/10/30 22:40:04 niklas Exp $ */ +/* $OpenBSD: pci_2100_a50.h,v 1.5 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: pci_2100_a50.h,v 1.3 1996/04/12 06:08:42 cgd Exp $ */ /* @@ -28,4 +28,4 @@ * rights to redistribute these changes. */ -void pci_2100_a50_pickintr __P((struct apecs_config *)); +void pci_2100_a50_pickintr(struct apecs_config *); diff --git a/sys/arch/alpha/pci/pci_550.c b/sys/arch/alpha/pci/pci_550.c index c0dd63e23f0..c237901f380 100644 --- a/sys/arch/alpha/pci/pci_550.c +++ b/sys/arch/alpha/pci/pci_550.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_550.c,v 1.7 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: pci_550.c,v 1.8 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: pci_550.c,v 1.18 2000/06/29 08:58:48 mrg Exp $ */ /*- @@ -94,18 +94,18 @@ #include <alpha/pci/siovar.h> #endif -int dec_550_intr_map __P((void *, pcitag_t, int, int, - pci_intr_handle_t *)); -const char *dec_550_intr_string __P((void *, pci_intr_handle_t)); -int dec_550_intr_line __P((void *, pci_intr_handle_t)); -const struct evcnt *dec_550_intr_evcnt __P((void *, pci_intr_handle_t)); +int dec_550_intr_map(void *, pcitag_t, int, int, + pci_intr_handle_t *); +const char *dec_550_intr_string(void *, pci_intr_handle_t); +int dec_550_intr_line(void *, pci_intr_handle_t); +const struct evcnt *dec_550_intr_evcnt(void *, pci_intr_handle_t); void *dec_550_intr_establish __P((void *, pci_intr_handle_t, int, int (*func)(void *), void *, char *)); -void dec_550_intr_disestablish __P((void *, void *)); +void dec_550_intr_disestablish(void *, void *); void *dec_550_pciide_compat_intr_establish __P((void *, struct device *, struct pci_attach_args *, int, int (*)(void *), void *)); -void dec_550_pciide_compat_intr_disestablish __P((void *, void *)); +void dec_550_pciide_compat_intr_disestablish(void *, void *); #define DEC_550_PCI_IRQ_BEGIN 8 #define DEC_550_MAX_IRQ (64 - DEC_550_PCI_IRQ_BEGIN) @@ -128,9 +128,9 @@ void dec_550_pciide_compat_intr_disestablish __P((void *, void *)); struct alpha_shared_intr *dec_550_pci_intr; -void dec_550_iointr __P((void *framep, unsigned long vec)); -void dec_550_intr_enable __P((int irq)); -void dec_550_intr_disable __P((int irq)); +void dec_550_iointr(void *framep, unsigned long vec); +void dec_550_intr_enable(int irq); +void dec_550_intr_disable(int irq); void pci_550_pickintr(ccp) @@ -331,7 +331,7 @@ dec_550_intr_establish(ccv, ih, level, func, arg, name) void *ccv, *arg; pci_intr_handle_t ih; int level; - int (*func) __P((void *)); + int (*func)(void *); char *name; { #if 0 @@ -398,7 +398,7 @@ dec_550_pciide_compat_intr_establish(v, dev, pa, chan, func, arg) struct device *dev; struct pci_attach_args *pa; int chan; - int (*func) __P((void *)); + int (*func)(void *); void *arg; { pci_chipset_tag_t pc = pa->pa_pc; diff --git a/sys/arch/alpha/pci/pci_550.h b/sys/arch/alpha/pci/pci_550.h index f5b87a452c1..918a9f1a89d 100644 --- a/sys/arch/alpha/pci/pci_550.h +++ b/sys/arch/alpha/pci/pci_550.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_550.h,v 1.2 2000/11/08 20:59:25 ericj Exp $ */ +/* $OpenBSD: pci_550.h,v 1.3 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: pci_550.h,v 1.4 2000/06/05 21:47:23 thorpej Exp $ */ /* @@ -28,4 +28,4 @@ * rights to redistribute these changes. */ -void pci_550_pickintr __P((struct cia_config *)); +void pci_550_pickintr(struct cia_config *); diff --git a/sys/arch/alpha/pci/pci_6600.c b/sys/arch/alpha/pci/pci_6600.c index ad119bbb63d..1fe9051da1f 100644 --- a/sys/arch/alpha/pci/pci_6600.c +++ b/sys/arch/alpha/pci/pci_6600.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_6600.c,v 1.7 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: pci_6600.c,v 1.8 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: pci_6600.c,v 1.5 2000/06/06 00:50:15 thorpej Exp $ */ /*- @@ -76,22 +76,22 @@ static char *irqtype = "6600 irq"; static struct tsp_config *sioprimary; -void dec_6600_intr_disestablish __P((void *, void *)); +void dec_6600_intr_disestablish(void *, void *); void *dec_6600_intr_establish __P(( void *, pci_intr_handle_t, int, int (*func)(void *), void *, char *)); -const char *dec_6600_intr_string __P((void *, pci_intr_handle_t)); -int dec_6600_intr_line __P((void *, pci_intr_handle_t)); -const struct evcnt *dec_6600_intr_evcnt __P((void *, pci_intr_handle_t)); -int dec_6600_intr_map __P((void *, pcitag_t, int, int, pci_intr_handle_t *)); +const char *dec_6600_intr_string(void *, pci_intr_handle_t); +int dec_6600_intr_line(void *, pci_intr_handle_t); +const struct evcnt *dec_6600_intr_evcnt(void *, pci_intr_handle_t); +int dec_6600_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *); void *dec_6600_pciide_compat_intr_establish __P((void *, struct device *, struct pci_attach_args *, int, int (*)(void *), void *)); -void dec_6600_pciide_compat_intr_disestablish __P((void *, void *)); +void dec_6600_pciide_compat_intr_disestablish(void *, void *); struct alpha_shared_intr *dec_6600_pci_intr; -void dec_6600_iointr __P((void *framep, unsigned long vec)); -extern void dec_6600_intr_enable __P((int irq)); -extern void dec_6600_intr_disable __P((int irq)); +void dec_6600_iointr(void *framep, unsigned long vec); +extern void dec_6600_intr_enable(int irq); +extern void dec_6600_intr_disable(int irq); void pci_6600_pickintr(pcp) @@ -249,7 +249,7 @@ dec_6600_intr_establish(acv, ih, level, func, arg, name) void *acv, *arg; pci_intr_handle_t ih; int level; - int (*func) __P((void *)); + int (*func)(void *); char *name; { void *cookie; @@ -360,7 +360,7 @@ dec_6600_pciide_compat_intr_establish(v, dev, pa, chan, func, arg) struct device *dev; struct pci_attach_args *pa; int chan; - int (*func) __P((void *)); + int (*func)(void *); void *arg; { pci_chipset_tag_t pc = pa->pa_pc; diff --git a/sys/arch/alpha/pci/pci_6600.h b/sys/arch/alpha/pci/pci_6600.h index 756ba27accd..beed4401c23 100644 --- a/sys/arch/alpha/pci/pci_6600.h +++ b/sys/arch/alpha/pci/pci_6600.h @@ -1,6 +1,6 @@ -/* $OpenBSD: pci_6600.h,v 1.1 2000/11/16 04:50:18 ericj Exp $ */ +/* $OpenBSD: pci_6600.h,v 1.2 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD$ */ /* Public Domain */ -void pci_6600_pickintr __P((struct tsp_config *)); +void pci_6600_pickintr(struct tsp_config *); diff --git a/sys/arch/alpha/pci/pci_axppci_33.c b/sys/arch/alpha/pci/pci_axppci_33.c index 08c12249f27..a9886b4e497 100644 --- a/sys/arch/alpha/pci/pci_axppci_33.c +++ b/sys/arch/alpha/pci/pci_axppci_33.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_axppci_33.c,v 1.15 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: pci_axppci_33.c,v 1.16 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: pci_axppci_33.c,v 1.10 1996/11/13 21:13:29 cgd Exp $ */ /* @@ -52,13 +52,13 @@ #include "sio.h" -int dec_axppci_33_intr_map __P((void *, pcitag_t, int, int, - pci_intr_handle_t *)); -const char *dec_axppci_33_intr_string __P((void *, pci_intr_handle_t)); -int dec_axppci_33_intr_line __P((void *, pci_intr_handle_t)); +int dec_axppci_33_intr_map(void *, pcitag_t, int, int, + pci_intr_handle_t *); +const char *dec_axppci_33_intr_string(void *, pci_intr_handle_t); +int dec_axppci_33_intr_line(void *, pci_intr_handle_t); void *dec_axppci_33_intr_establish __P((void *, pci_intr_handle_t, int, int (*func)(void *), void *, char *)); -void dec_axppci_33_intr_disestablish __P((void *, void *)); +void dec_axppci_33_intr_disestablish(void *, void *); #define LCA_SIO_DEVICE 7 /* XXX */ @@ -234,7 +234,7 @@ dec_axppci_33_intr_establish(lcv, ih, level, func, arg, name) void *lcv, *arg; pci_intr_handle_t ih; int level; - int (*func) __P((void *)); + int (*func)(void *); char *name; { return sio_intr_establish(NULL /*XXX*/, ih, IST_LEVEL, level, func, diff --git a/sys/arch/alpha/pci/pci_axppci_33.h b/sys/arch/alpha/pci/pci_axppci_33.h index ef9a3856111..e7695b7ede2 100644 --- a/sys/arch/alpha/pci/pci_axppci_33.h +++ b/sys/arch/alpha/pci/pci_axppci_33.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_axppci_33.h,v 1.4 1996/10/30 22:40:05 niklas Exp $ */ +/* $OpenBSD: pci_axppci_33.h,v 1.5 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: pci_axppci_33.h,v 1.3 1996/04/12 06:08:47 cgd Exp $ */ /* @@ -28,4 +28,4 @@ * rights to redistribute these changes. */ -void pci_axppci_33_pickintr __P((struct lca_config *)); +void pci_axppci_33_pickintr(struct lca_config *); diff --git a/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c b/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c index d9d338d1e10..fb73a422d16 100644 --- a/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c +++ b/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_bwx_bus_io_chipdep.c,v 1.3 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: pci_bwx_bus_io_chipdep.c,v 1.4 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: pcs_bus_io_common.c,v 1.14 1996/12/02 22:19:35 cgd Exp $ */ /* @@ -45,132 +45,132 @@ #define __S(S) __STRING(S) /* mapping/unmapping */ -int __C(CHIP,_io_map) __P((void *, bus_addr_t, bus_size_t, int, - bus_space_handle_t *)); -void __C(CHIP,_io_unmap) __P((void *, bus_space_handle_t, - bus_size_t)); -int __C(CHIP,_io_subregion) __P((void *, bus_space_handle_t, - bus_size_t, bus_size_t, bus_space_handle_t *)); +int __C(CHIP,_io_map)(void *, bus_addr_t, bus_size_t, int, + bus_space_handle_t *); +void __C(CHIP,_io_unmap)(void *, bus_space_handle_t, + bus_size_t); +int __C(CHIP,_io_subregion)(void *, bus_space_handle_t, + bus_size_t, bus_size_t, bus_space_handle_t *); /* allocation/deallocation */ -int __C(CHIP,_io_alloc) __P((void *, bus_addr_t, bus_addr_t, +int __C(CHIP,_io_alloc)(void *, bus_addr_t, bus_addr_t, bus_size_t, bus_size_t, bus_addr_t, int, bus_addr_t *, - bus_space_handle_t *)); -void __C(CHIP,_io_free) __P((void *, bus_space_handle_t, - bus_size_t)); + bus_space_handle_t *); +void __C(CHIP,_io_free)(void *, bus_space_handle_t, + bus_size_t); /* barrier */ -inline void __C(CHIP,_io_barrier) __P((void *, bus_space_handle_t, - bus_size_t, bus_size_t, int)); +inline void __C(CHIP,_io_barrier)(void *, bus_space_handle_t, + bus_size_t, bus_size_t, int); /* read (single) */ -inline u_int8_t __C(CHIP,_io_read_1) __P((void *, bus_space_handle_t, - bus_size_t)); -inline u_int16_t __C(CHIP,_io_read_2) __P((void *, bus_space_handle_t, - bus_size_t)); -inline u_int32_t __C(CHIP,_io_read_4) __P((void *, bus_space_handle_t, - bus_size_t)); -inline u_int64_t __C(CHIP,_io_read_8) __P((void *, bus_space_handle_t, - bus_size_t)); +inline u_int8_t __C(CHIP,_io_read_1)(void *, bus_space_handle_t, + bus_size_t); +inline u_int16_t __C(CHIP,_io_read_2)(void *, bus_space_handle_t, + bus_size_t); +inline u_int32_t __C(CHIP,_io_read_4)(void *, bus_space_handle_t, + bus_size_t); +inline u_int64_t __C(CHIP,_io_read_8)(void *, bus_space_handle_t, + bus_size_t); /* read multiple */ -void __C(CHIP,_io_read_multi_1) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t *, bus_size_t)); -void __C(CHIP,_io_read_multi_2) __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t *, bus_size_t)); -void __C(CHIP,_io_read_multi_4) __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t *, bus_size_t)); -void __C(CHIP,_io_read_multi_8) __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t *, bus_size_t)); +void __C(CHIP,_io_read_multi_1)(void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); +void __C(CHIP,_io_read_multi_2)(void *, bus_space_handle_t, + bus_size_t, u_int16_t *, bus_size_t); +void __C(CHIP,_io_read_multi_4)(void *, bus_space_handle_t, + bus_size_t, u_int32_t *, bus_size_t); +void __C(CHIP,_io_read_multi_8)(void *, bus_space_handle_t, + bus_size_t, u_int64_t *, bus_size_t); /* read region */ -void __C(CHIP,_io_read_region_1) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t *, bus_size_t)); -void __C(CHIP,_io_read_region_2) __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t *, bus_size_t)); -void __C(CHIP,_io_read_region_4) __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t *, bus_size_t)); -void __C(CHIP,_io_read_region_8) __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t *, bus_size_t)); +void __C(CHIP,_io_read_region_1)(void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); +void __C(CHIP,_io_read_region_2)(void *, bus_space_handle_t, + bus_size_t, u_int16_t *, bus_size_t); +void __C(CHIP,_io_read_region_4)(void *, bus_space_handle_t, + bus_size_t, u_int32_t *, bus_size_t); +void __C(CHIP,_io_read_region_8)(void *, bus_space_handle_t, + bus_size_t, u_int64_t *, bus_size_t); /* write (single) */ -inline void __C(CHIP,_io_write_1) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t)); -inline void __C(CHIP,_io_write_2) __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t)); -inline void __C(CHIP,_io_write_4) __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t)); -inline void __C(CHIP,_io_write_8) __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t)); +inline void __C(CHIP,_io_write_1)(void *, bus_space_handle_t, + bus_size_t, u_int8_t); +inline void __C(CHIP,_io_write_2)(void *, bus_space_handle_t, + bus_size_t, u_int16_t); +inline void __C(CHIP,_io_write_4)(void *, bus_space_handle_t, + bus_size_t, u_int32_t); +inline void __C(CHIP,_io_write_8)(void *, bus_space_handle_t, + bus_size_t, u_int64_t); /* write multiple */ -void __C(CHIP,_io_write_multi_1) __P((void *, bus_space_handle_t, - bus_size_t, const u_int8_t *, bus_size_t)); -void __C(CHIP,_io_write_multi_2) __P((void *, bus_space_handle_t, - bus_size_t, const u_int16_t *, bus_size_t)); -void __C(CHIP,_io_write_multi_4) __P((void *, bus_space_handle_t, - bus_size_t, const u_int32_t *, bus_size_t)); -void __C(CHIP,_io_write_multi_8) __P((void *, bus_space_handle_t, - bus_size_t, const u_int64_t *, bus_size_t)); +void __C(CHIP,_io_write_multi_1)(void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); +void __C(CHIP,_io_write_multi_2)(void *, bus_space_handle_t, + bus_size_t, const u_int16_t *, bus_size_t); +void __C(CHIP,_io_write_multi_4)(void *, bus_space_handle_t, + bus_size_t, const u_int32_t *, bus_size_t); +void __C(CHIP,_io_write_multi_8)(void *, bus_space_handle_t, + bus_size_t, const u_int64_t *, bus_size_t); /* write region */ -void __C(CHIP,_io_write_region_1) __P((void *, bus_space_handle_t, - bus_size_t, const u_int8_t *, bus_size_t)); -void __C(CHIP,_io_write_region_2) __P((void *, bus_space_handle_t, - bus_size_t, const u_int16_t *, bus_size_t)); -void __C(CHIP,_io_write_region_4) __P((void *, bus_space_handle_t, - bus_size_t, const u_int32_t *, bus_size_t)); -void __C(CHIP,_io_write_region_8) __P((void *, bus_space_handle_t, - bus_size_t, const u_int64_t *, bus_size_t)); +void __C(CHIP,_io_write_region_1)(void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); +void __C(CHIP,_io_write_region_2)(void *, bus_space_handle_t, + bus_size_t, const u_int16_t *, bus_size_t); +void __C(CHIP,_io_write_region_4)(void *, bus_space_handle_t, + bus_size_t, const u_int32_t *, bus_size_t); +void __C(CHIP,_io_write_region_8)(void *, bus_space_handle_t, + bus_size_t, const u_int64_t *, bus_size_t); /* set multiple */ -void __C(CHIP,_io_set_multi_1) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t, bus_size_t)); -void __C(CHIP,_io_set_multi_2) __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t, bus_size_t)); -void __C(CHIP,_io_set_multi_4) __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t, bus_size_t)); -void __C(CHIP,_io_set_multi_8) __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t, bus_size_t)); +void __C(CHIP,_io_set_multi_1)(void *, bus_space_handle_t, + bus_size_t, u_int8_t, bus_size_t); +void __C(CHIP,_io_set_multi_2)(void *, bus_space_handle_t, + bus_size_t, u_int16_t, bus_size_t); +void __C(CHIP,_io_set_multi_4)(void *, bus_space_handle_t, + bus_size_t, u_int32_t, bus_size_t); +void __C(CHIP,_io_set_multi_8)(void *, bus_space_handle_t, + bus_size_t, u_int64_t, bus_size_t); /* set region */ -void __C(CHIP,_io_set_region_1) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t, bus_size_t)); -void __C(CHIP,_io_set_region_2) __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t, bus_size_t)); -void __C(CHIP,_io_set_region_4) __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t, bus_size_t)); -void __C(CHIP,_io_set_region_8) __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t, bus_size_t)); +void __C(CHIP,_io_set_region_1)(void *, bus_space_handle_t, + bus_size_t, u_int8_t, bus_size_t); +void __C(CHIP,_io_set_region_2)(void *, bus_space_handle_t, + bus_size_t, u_int16_t, bus_size_t); +void __C(CHIP,_io_set_region_4)(void *, bus_space_handle_t, + bus_size_t, u_int32_t, bus_size_t); +void __C(CHIP,_io_set_region_8)(void *, bus_space_handle_t, + bus_size_t, u_int64_t, bus_size_t); /* copy */ -void __C(CHIP,_io_copy_1) __P((void *, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t)); -void __C(CHIP,_io_copy_2) __P((void *, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t)); -void __C(CHIP,_io_copy_4) __P((void *, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t)); -void __C(CHIP,_io_copy_8) __P((void *, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t)); +void __C(CHIP,_io_copy_1)(void *, bus_space_handle_t, + bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); +void __C(CHIP,_io_copy_2)(void *, bus_space_handle_t, + bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); +void __C(CHIP,_io_copy_4)(void *, bus_space_handle_t, + bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); +void __C(CHIP,_io_copy_8)(void *, bus_space_handle_t, + bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); /* read multiple raw */ -void __C(CHIP,_io_read_raw_multi_2) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t *, bus_size_t)); -void __C(CHIP,_io_read_raw_multi_4) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t *, bus_size_t)); -void __C(CHIP,_io_read_raw_multi_8) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t *, bus_size_t)); +void __C(CHIP,_io_read_raw_multi_2)(void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); +void __C(CHIP,_io_read_raw_multi_4)(void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); +void __C(CHIP,_io_read_raw_multi_8)(void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); /* write multiple raw */ -void __C(CHIP,_io_write_raw_multi_2) __P((void *, +void __C(CHIP,_io_write_raw_multi_2)(void *, bus_space_handle_t, bus_size_t, const u_int8_t *, - bus_size_t)); -void __C(CHIP,_io_write_raw_multi_4) __P((void *, + bus_size_t); +void __C(CHIP,_io_write_raw_multi_4)(void *, bus_space_handle_t, bus_size_t, const u_int8_t *, - bus_size_t)); -void __C(CHIP,_io_write_raw_multi_8) __P((void *, + bus_size_t); +void __C(CHIP,_io_write_raw_multi_8)(void *, bus_space_handle_t, bus_size_t, const u_int8_t *, - bus_size_t)); + bus_size_t); static long __C(CHIP,_io_ex_storage)[EXTENT_FIXED_STORAGE_SIZE(8) / sizeof(long)]; diff --git a/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c b/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c index c4b5d2e5675..472c4be0a35 100644 --- a/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c +++ b/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_bwx_bus_mem_chipdep.c,v 1.4 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: pci_bwx_bus_mem_chipdep.c,v 1.5 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: pcs_bus_mem_common.c,v 1.15 1996/12/02 22:19:36 cgd Exp $ */ /* @@ -53,132 +53,132 @@ #define __S(S) __STRING(S) /* mapping/unmapping */ -int __C(CHIP,_mem_map) __P((void *, bus_addr_t, bus_size_t, int, - bus_space_handle_t *)); -void __C(CHIP,_mem_unmap) __P((void *, bus_space_handle_t, - bus_size_t)); -int __C(CHIP,_mem_subregion) __P((void *, bus_space_handle_t, - bus_size_t, bus_size_t, bus_space_handle_t *)); +int __C(CHIP,_mem_map)(void *, bus_addr_t, bus_size_t, int, + bus_space_handle_t *); +void __C(CHIP,_mem_unmap)(void *, bus_space_handle_t, + bus_size_t); +int __C(CHIP,_mem_subregion)(void *, bus_space_handle_t, + bus_size_t, bus_size_t, bus_space_handle_t *); /* allocation/deallocation */ -int __C(CHIP,_mem_alloc) __P((void *, bus_addr_t, bus_addr_t, +int __C(CHIP,_mem_alloc)(void *, bus_addr_t, bus_addr_t, bus_size_t, bus_size_t, bus_addr_t, int, bus_addr_t *, - bus_space_handle_t *)); -void __C(CHIP,_mem_free) __P((void *, bus_space_handle_t, - bus_size_t)); + bus_space_handle_t *); +void __C(CHIP,_mem_free)(void *, bus_space_handle_t, + bus_size_t); /* barrier */ -inline void __C(CHIP,_mem_barrier) __P((void *, bus_space_handle_t, - bus_size_t, bus_size_t, int)); +inline void __C(CHIP,_mem_barrier)(void *, bus_space_handle_t, + bus_size_t, bus_size_t, int); /* read (single) */ -inline u_int8_t __C(CHIP,_mem_read_1) __P((void *, bus_space_handle_t, - bus_size_t)); -inline u_int16_t __C(CHIP,_mem_read_2) __P((void *, bus_space_handle_t, - bus_size_t)); -inline u_int32_t __C(CHIP,_mem_read_4) __P((void *, bus_space_handle_t, - bus_size_t)); -inline u_int64_t __C(CHIP,_mem_read_8) __P((void *, bus_space_handle_t, - bus_size_t)); +inline u_int8_t __C(CHIP,_mem_read_1)(void *, bus_space_handle_t, + bus_size_t); +inline u_int16_t __C(CHIP,_mem_read_2)(void *, bus_space_handle_t, + bus_size_t); +inline u_int32_t __C(CHIP,_mem_read_4)(void *, bus_space_handle_t, + bus_size_t); +inline u_int64_t __C(CHIP,_mem_read_8)(void *, bus_space_handle_t, + bus_size_t); /* read multiple */ -void __C(CHIP,_mem_read_multi_1) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t *, bus_size_t)); -void __C(CHIP,_mem_read_multi_2) __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t *, bus_size_t)); -void __C(CHIP,_mem_read_multi_4) __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t *, bus_size_t)); -void __C(CHIP,_mem_read_multi_8) __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t *, bus_size_t)); +void __C(CHIP,_mem_read_multi_1)(void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); +void __C(CHIP,_mem_read_multi_2)(void *, bus_space_handle_t, + bus_size_t, u_int16_t *, bus_size_t); +void __C(CHIP,_mem_read_multi_4)(void *, bus_space_handle_t, + bus_size_t, u_int32_t *, bus_size_t); +void __C(CHIP,_mem_read_multi_8)(void *, bus_space_handle_t, + bus_size_t, u_int64_t *, bus_size_t); /* read region */ -void __C(CHIP,_mem_read_region_1) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t *, bus_size_t)); -void __C(CHIP,_mem_read_region_2) __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t *, bus_size_t)); -void __C(CHIP,_mem_read_region_4) __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t *, bus_size_t)); -void __C(CHIP,_mem_read_region_8) __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t *, bus_size_t)); +void __C(CHIP,_mem_read_region_1)(void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); +void __C(CHIP,_mem_read_region_2)(void *, bus_space_handle_t, + bus_size_t, u_int16_t *, bus_size_t); +void __C(CHIP,_mem_read_region_4)(void *, bus_space_handle_t, + bus_size_t, u_int32_t *, bus_size_t); +void __C(CHIP,_mem_read_region_8)(void *, bus_space_handle_t, + bus_size_t, u_int64_t *, bus_size_t); /* write (single) */ -inline void __C(CHIP,_mem_write_1) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t)); -inline void __C(CHIP,_mem_write_2) __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t)); -inline void __C(CHIP,_mem_write_4) __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t)); -inline void __C(CHIP,_mem_write_8) __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t)); +inline void __C(CHIP,_mem_write_1)(void *, bus_space_handle_t, + bus_size_t, u_int8_t); +inline void __C(CHIP,_mem_write_2)(void *, bus_space_handle_t, + bus_size_t, u_int16_t); +inline void __C(CHIP,_mem_write_4)(void *, bus_space_handle_t, + bus_size_t, u_int32_t); +inline void __C(CHIP,_mem_write_8)(void *, bus_space_handle_t, + bus_size_t, u_int64_t); /* write multiple */ -void __C(CHIP,_mem_write_multi_1) __P((void *, bus_space_handle_t, - bus_size_t, const u_int8_t *, bus_size_t)); -void __C(CHIP,_mem_write_multi_2) __P((void *, bus_space_handle_t, - bus_size_t, const u_int16_t *, bus_size_t)); -void __C(CHIP,_mem_write_multi_4) __P((void *, bus_space_handle_t, - bus_size_t, const u_int32_t *, bus_size_t)); -void __C(CHIP,_mem_write_multi_8) __P((void *, bus_space_handle_t, - bus_size_t, const u_int64_t *, bus_size_t)); +void __C(CHIP,_mem_write_multi_1)(void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); +void __C(CHIP,_mem_write_multi_2)(void *, bus_space_handle_t, + bus_size_t, const u_int16_t *, bus_size_t); +void __C(CHIP,_mem_write_multi_4)(void *, bus_space_handle_t, + bus_size_t, const u_int32_t *, bus_size_t); +void __C(CHIP,_mem_write_multi_8)(void *, bus_space_handle_t, + bus_size_t, const u_int64_t *, bus_size_t); /* write region */ -void __C(CHIP,_mem_write_region_1) __P((void *, bus_space_handle_t, - bus_size_t, const u_int8_t *, bus_size_t)); -void __C(CHIP,_mem_write_region_2) __P((void *, bus_space_handle_t, - bus_size_t, const u_int16_t *, bus_size_t)); -void __C(CHIP,_mem_write_region_4) __P((void *, bus_space_handle_t, - bus_size_t, const u_int32_t *, bus_size_t)); -void __C(CHIP,_mem_write_region_8) __P((void *, bus_space_handle_t, - bus_size_t, const u_int64_t *, bus_size_t)); +void __C(CHIP,_mem_write_region_1)(void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); +void __C(CHIP,_mem_write_region_2)(void *, bus_space_handle_t, + bus_size_t, const u_int16_t *, bus_size_t); +void __C(CHIP,_mem_write_region_4)(void *, bus_space_handle_t, + bus_size_t, const u_int32_t *, bus_size_t); +void __C(CHIP,_mem_write_region_8)(void *, bus_space_handle_t, + bus_size_t, const u_int64_t *, bus_size_t); /* set multiple */ -void __C(CHIP,_mem_set_multi_1) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t, bus_size_t)); -void __C(CHIP,_mem_set_multi_2) __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t, bus_size_t)); -void __C(CHIP,_mem_set_multi_4) __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t, bus_size_t)); -void __C(CHIP,_mem_set_multi_8) __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t, bus_size_t)); +void __C(CHIP,_mem_set_multi_1)(void *, bus_space_handle_t, + bus_size_t, u_int8_t, bus_size_t); +void __C(CHIP,_mem_set_multi_2)(void *, bus_space_handle_t, + bus_size_t, u_int16_t, bus_size_t); +void __C(CHIP,_mem_set_multi_4)(void *, bus_space_handle_t, + bus_size_t, u_int32_t, bus_size_t); +void __C(CHIP,_mem_set_multi_8)(void *, bus_space_handle_t, + bus_size_t, u_int64_t, bus_size_t); /* set region */ -void __C(CHIP,_mem_set_region_1) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t, bus_size_t)); -void __C(CHIP,_mem_set_region_2) __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t, bus_size_t)); -void __C(CHIP,_mem_set_region_4) __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t, bus_size_t)); -void __C(CHIP,_mem_set_region_8) __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t, bus_size_t)); +void __C(CHIP,_mem_set_region_1)(void *, bus_space_handle_t, + bus_size_t, u_int8_t, bus_size_t); +void __C(CHIP,_mem_set_region_2)(void *, bus_space_handle_t, + bus_size_t, u_int16_t, bus_size_t); +void __C(CHIP,_mem_set_region_4)(void *, bus_space_handle_t, + bus_size_t, u_int32_t, bus_size_t); +void __C(CHIP,_mem_set_region_8)(void *, bus_space_handle_t, + bus_size_t, u_int64_t, bus_size_t); /* copy */ -void __C(CHIP,_mem_copy_1) __P((void *, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t)); -void __C(CHIP,_mem_copy_2) __P((void *, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t)); -void __C(CHIP,_mem_copy_4) __P((void *, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t)); -void __C(CHIP,_mem_copy_8) __P((void *, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t)); +void __C(CHIP,_mem_copy_1)(void *, bus_space_handle_t, + bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); +void __C(CHIP,_mem_copy_2)(void *, bus_space_handle_t, + bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); +void __C(CHIP,_mem_copy_4)(void *, bus_space_handle_t, + bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); +void __C(CHIP,_mem_copy_8)(void *, bus_space_handle_t, + bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); /* read multiple raw */ -void __C(CHIP,_mem_read_raw_multi_2) __P((void *, - bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t)); -void __C(CHIP,_mem_read_raw_multi_4) __P((void *, - bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t)); -void __C(CHIP,_mem_read_raw_multi_8) __P((void *, - bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t)); +void __C(CHIP,_mem_read_raw_multi_2)(void *, + bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t); +void __C(CHIP,_mem_read_raw_multi_4)(void *, + bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t); +void __C(CHIP,_mem_read_raw_multi_8)(void *, + bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t); /* write multiple raw */ -void __C(CHIP,_mem_write_raw_multi_2) __P((void *, +void __C(CHIP,_mem_write_raw_multi_2)(void *, bus_space_handle_t, bus_size_t, const u_int8_t *, - bus_size_t)); -void __C(CHIP,_mem_write_raw_multi_4) __P((void *, + bus_size_t); +void __C(CHIP,_mem_write_raw_multi_4)(void *, bus_space_handle_t, bus_size_t, const u_int8_t *, - bus_size_t)); -void __C(CHIP,_mem_write_raw_multi_8) __P((void *, + bus_size_t); +void __C(CHIP,_mem_write_raw_multi_8)(void *, bus_space_handle_t, bus_size_t, const u_int8_t *, - bus_size_t)); + bus_size_t); static long __C(CHIP,_mem_ex_storage)[EXTENT_FIXED_STORAGE_SIZE(8) / sizeof(long)]; diff --git a/sys/arch/alpha/pci/pci_eb164.c b/sys/arch/alpha/pci/pci_eb164.c index f77641ac0ab..6b49fb3de66 100644 --- a/sys/arch/alpha/pci/pci_eb164.c +++ b/sys/arch/alpha/pci/pci_eb164.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_eb164.c,v 1.12 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: pci_eb164.c,v 1.13 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: pci_eb164.c,v 1.27 2000/06/06 00:50:15 thorpej Exp $ */ /*- @@ -94,18 +94,18 @@ #include <alpha/pci/siovar.h> #endif -int dec_eb164_intr_map __P((void *, pcitag_t, int, int, - pci_intr_handle_t *)); -const char *dec_eb164_intr_string __P((void *, pci_intr_handle_t)); -int dec_eb164_intr_line __P((void *, pci_intr_handle_t)); -const struct evcnt *dec_eb164_intr_evcnt __P((void *, pci_intr_handle_t)); +int dec_eb164_intr_map(void *, pcitag_t, int, int, + pci_intr_handle_t *); +const char *dec_eb164_intr_string(void *, pci_intr_handle_t); +int dec_eb164_intr_line(void *, pci_intr_handle_t); +const struct evcnt *dec_eb164_intr_evcnt(void *, pci_intr_handle_t); void *dec_eb164_intr_establish __P((void *, pci_intr_handle_t, int, int (*func)(void *), void *, char *)); -void dec_eb164_intr_disestablish __P((void *, void *)); +void dec_eb164_intr_disestablish(void *, void *); void *dec_eb164_pciide_compat_intr_establish __P((void *, struct device *, struct pci_attach_args *, int, int (*)(void *), void *)); -void dec_eb164_pciide_compat_intr_disestablish __P((void *, void *)); +void dec_eb164_pciide_compat_intr_disestablish(void *, void *); #define EB164_SIO_IRQ 4 #define EB164_MAX_IRQ 24 @@ -116,9 +116,9 @@ struct alpha_shared_intr *eb164_pci_intr; bus_space_tag_t eb164_intrgate_iot; bus_space_handle_t eb164_intrgate_ioh; -void eb164_iointr __P((void *framep, unsigned long vec)); -extern void eb164_intr_enable __P((int irq)); /* pci_eb164_intr.S */ -extern void eb164_intr_disable __P((int irq)); /* pci_eb164_intr.S */ +void eb164_iointr(void *framep, unsigned long vec); +extern void eb164_intr_enable(int irq); /* pci_eb164_intr.S */ +extern void eb164_intr_disable(int irq); /* pci_eb164_intr.S */ void pci_eb164_pickintr(ccp) @@ -270,7 +270,7 @@ dec_eb164_intr_establish(ccv, ih, level, func, arg, name) void *ccv, *arg; pci_intr_handle_t ih; int level; - int (*func) __P((void *)); + int (*func)(void *); char *name; { #if 0 @@ -319,7 +319,7 @@ dec_eb164_pciide_compat_intr_establish(v, dev, pa, chan, func, arg) struct device *dev; struct pci_attach_args *pa; int chan; - int (*func) __P((void *)); + int (*func)(void *); void *arg; { pci_chipset_tag_t pc = pa->pa_pc; diff --git a/sys/arch/alpha/pci/pci_eb164.h b/sys/arch/alpha/pci/pci_eb164.h index 3f75ae406b4..71521177906 100644 --- a/sys/arch/alpha/pci/pci_eb164.h +++ b/sys/arch/alpha/pci/pci_eb164.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_eb164.h,v 1.2 1997/11/10 15:53:12 niklas Exp $ */ +/* $OpenBSD: pci_eb164.h,v 1.3 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: pci_eb164.h,v 1.1 1996/11/11 21:08:13 cgd Exp $ */ /* @@ -28,7 +28,7 @@ * rights to redistribute these changes. */ -void pci_eb164_pickintr __P((struct cia_config *)); +void pci_eb164_pickintr(struct cia_config *); #ifdef EVCNT_COUNTERS extern struct evcnt eb164_intr_evcnt; diff --git a/sys/arch/alpha/pci/pci_eb64plus.c b/sys/arch/alpha/pci/pci_eb64plus.c index 54bac7181fa..fef0dcc99b8 100644 --- a/sys/arch/alpha/pci/pci_eb64plus.c +++ b/sys/arch/alpha/pci/pci_eb64plus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_eb64plus.c,v 1.1 2002/01/23 03:20:41 ericj Exp $ */ +/* $OpenBSD: pci_eb64plus.c,v 1.2 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: pci_eb64plus.c,v 1.10 2001/07/27 00:25:20 thorpej Exp $ */ /*- @@ -91,13 +91,13 @@ #include <alpha/pci/siovar.h> #endif -int dec_eb64plus_intr_map __P((void *, pcitag_t, int, int, - pci_intr_handle_t *)); -const char *dec_eb64plus_intr_string __P((void *, pci_intr_handle_t)); -const struct evcnt *dec_eb64plus_intr_evcnt __P((void *, pci_intr_handle_t)); +int dec_eb64plus_intr_map(void *, pcitag_t, int, int, + pci_intr_handle_t *); +const char *dec_eb64plus_intr_string(void *, pci_intr_handle_t); +const struct evcnt *dec_eb64plus_intr_evcnt(void *, pci_intr_handle_t); void *dec_eb64plus_intr_establish __P((void *, pci_intr_handle_t, int, int (*func)(void *), void *, char *)); -void dec_eb64plus_intr_disestablish __P((void *, void *)); +void dec_eb64plus_intr_disestablish(void *, void *); #define EB64PLUS_MAX_IRQ 32 #define PCI_STRAY_MAX 5 @@ -107,9 +107,9 @@ struct alpha_shared_intr *eb64plus_pci_intr; bus_space_tag_t eb64plus_intrgate_iot; bus_space_handle_t eb64plus_intrgate_ioh; -void eb64plus_iointr __P((void *arg, unsigned long vec)); -extern void eb64plus_intr_enable __P((int irq)); /* pci_eb64plus_intr.S */ -extern void eb64plus_intr_disable __P((int irq)); /* pci_eb64plus_intr.S */ +void eb64plus_iointr(void *arg, unsigned long vec); +extern void eb64plus_intr_enable(int irq); /* pci_eb64plus_intr.S */ +extern void eb64plus_intr_disable(int irq); /* pci_eb64plus_intr.S */ void pci_eb64plus_pickintr(acp) @@ -205,7 +205,7 @@ dec_eb64plus_intr_establish(acv, ih, level, func, arg, name) void *acv; pci_intr_handle_t ih; int level; - int (*func) __P((void *)); + int (*func)(void *); void *arg; char *name; { diff --git a/sys/arch/alpha/pci/pci_eb64plus.h b/sys/arch/alpha/pci/pci_eb64plus.h index d720089b8c2..84ebe2b62cc 100644 --- a/sys/arch/alpha/pci/pci_eb64plus.h +++ b/sys/arch/alpha/pci/pci_eb64plus.h @@ -28,4 +28,4 @@ * rights to redistribute these changes. */ -void pci_eb64plus_pickintr __P((struct apecs_config *)); +void pci_eb64plus_pickintr(struct apecs_config *); diff --git a/sys/arch/alpha/pci/pci_kn20aa.c b/sys/arch/alpha/pci/pci_kn20aa.c index 2df7083d2b0..de876552622 100644 --- a/sys/arch/alpha/pci/pci_kn20aa.c +++ b/sys/arch/alpha/pci/pci_kn20aa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_kn20aa.c,v 1.16 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: pci_kn20aa.c,v 1.17 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: pci_kn20aa.c,v 1.21 1996/11/17 02:05:27 cgd Exp $ */ /* @@ -58,13 +58,13 @@ #include <alpha/pci/siovar.h> #endif -int dec_kn20aa_intr_map __P((void *, pcitag_t, int, int, - pci_intr_handle_t *)); -const char *dec_kn20aa_intr_string __P((void *, pci_intr_handle_t)); -int dec_kn20aa_intr_line __P((void *, pci_intr_handle_t)); +int dec_kn20aa_intr_map(void *, pcitag_t, int, int, + pci_intr_handle_t *); +const char *dec_kn20aa_intr_string(void *, pci_intr_handle_t); +int dec_kn20aa_intr_line(void *, pci_intr_handle_t); void *dec_kn20aa_intr_establish __P((void *, pci_intr_handle_t, int, int (*func)(void *), void *, char *)); -void dec_kn20aa_intr_disestablish __P((void *, void *)); +void dec_kn20aa_intr_disestablish(void *, void *); #define KN20AA_PCEB_IRQ 31 #define KN20AA_MAX_IRQ 32 @@ -75,9 +75,9 @@ struct alpha_shared_intr *kn20aa_pci_intr; struct evcnt kn20aa_intr_evcnt; #endif -void kn20aa_iointr __P((void *framep, unsigned long vec)); -void kn20aa_enable_intr __P((int irq)); -void kn20aa_disable_intr __P((int irq)); +void kn20aa_iointr(void *framep, unsigned long vec); +void kn20aa_enable_intr(int irq); +void kn20aa_disable_intr(int irq); void pci_kn20aa_pickintr(ccp) @@ -204,7 +204,7 @@ dec_kn20aa_intr_establish(ccv, ih, level, func, arg, name) void *ccv, *arg; pci_intr_handle_t ih; int level; - int (*func) __P((void *)); + int (*func)(void *); char *name; { void *cookie; diff --git a/sys/arch/alpha/pci/pci_kn20aa.h b/sys/arch/alpha/pci/pci_kn20aa.h index f4abae0c91a..8f656d4406e 100644 --- a/sys/arch/alpha/pci/pci_kn20aa.h +++ b/sys/arch/alpha/pci/pci_kn20aa.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_kn20aa.h,v 1.4 1996/10/30 22:40:07 niklas Exp $ */ +/* $OpenBSD: pci_kn20aa.h,v 1.5 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: pci_kn20aa.h,v 1.2 1996/04/13 00:24:35 cgd Exp $ */ /* @@ -28,7 +28,7 @@ * rights to redistribute these changes. */ -void pci_kn20aa_pickintr __P((struct cia_config *)); +void pci_kn20aa_pickintr(struct cia_config *); #ifdef EVCNT_COUNTERS extern struct evcnt kn20aa_intr_evcnt; diff --git a/sys/arch/alpha/pci/pci_machdep.c b/sys/arch/alpha/pci/pci_machdep.c index 00e3d4868da..1ee73b71cab 100644 --- a/sys/arch/alpha/pci/pci_machdep.c +++ b/sys/arch/alpha/pci/pci_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.c,v 1.15 2001/11/06 19:53:13 miod Exp $ */ +/* $OpenBSD: pci_machdep.c,v 1.16 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: pci_machdep.c,v 1.7 1996/11/19 04:57:32 cgd Exp $ */ /* @@ -71,8 +71,8 @@ pci_display_console(iot, memt, pc, bus, device, function) #if NVGA_PCI || NTGA int nmatch; #endif - int (*fn) __P((bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t, - int, int, int)); + int (*fn)(bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t, + int, int, int); tag = pci_make_tag(pc, bus, device, function); id = pci_conf_read(pc, tag, PCI_ID_REG); diff --git a/sys/arch/alpha/pci/pci_machdep.h b/sys/arch/alpha/pci/pci_machdep.h index d5462235c0e..e2ac0b6ed45 100644 --- a/sys/arch/alpha/pci/pci_machdep.h +++ b/sys/arch/alpha/pci/pci_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.h,v 1.17 2001/11/04 23:12:46 art Exp $ */ +/* $OpenBSD: pci_machdep.h,v 1.18 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: pci_machdep.h,v 1.6 1996/11/19 04:49:21 cgd Exp $ */ /* @@ -50,30 +50,30 @@ struct pci_attach_args; */ struct alpha_pci_chipset { void *pc_conf_v; - void (*pc_attach_hook) __P((struct device *, - struct device *, struct pcibus_attach_args *)); - int (*pc_bus_maxdevs) __P((void *, int)); - pcitag_t (*pc_make_tag) __P((void *, int, int, int)); - void (*pc_decompose_tag) __P((void *, pcitag_t, int *, - int *, int *)); - pcireg_t (*pc_conf_read) __P((void *, pcitag_t, int)); - void (*pc_conf_write) __P((void *, pcitag_t, int, pcireg_t)); + void (*pc_attach_hook)(struct device *, + struct device *, struct pcibus_attach_args *); + int (*pc_bus_maxdevs)(void *, int); + pcitag_t (*pc_make_tag)(void *, int, int, int); + void (*pc_decompose_tag)(void *, pcitag_t, int *, + int *, int *); + pcireg_t (*pc_conf_read)(void *, pcitag_t, int); + void (*pc_conf_write)(void *, pcitag_t, int, pcireg_t); void *pc_intr_v; - int (*pc_intr_map) __P((void *, pcitag_t, int, int, - pci_intr_handle_t *)); - const char *(*pc_intr_string) __P((void *, pci_intr_handle_t)); - int (*pc_intr_line) __P((void *, pci_intr_handle_t)); + int (*pc_intr_map)(void *, pcitag_t, int, int, + pci_intr_handle_t *); + const char *(*pc_intr_string)(void *, pci_intr_handle_t); + int (*pc_intr_line)(void *, pci_intr_handle_t); void *(*pc_intr_establish) __P((void *, pci_intr_handle_t, int, int (*)(void *), void *, char *)); - void (*pc_intr_disestablish) __P((void *, void *)); + void (*pc_intr_disestablish)(void *, void *); /* alpha-specific */ void *(*pc_pciide_compat_intr_establish) __P((void *, struct device *, struct pci_attach_args *, int, int (*)(void *), void *)); - void (*pc_pciide_compat_intr_disestablish) __P((void *, - void *)); + void (*pc_pciide_compat_intr_disestablish)(void *, + void *); char *pc_name; /* PCI chipset name */ vaddr_t pc_mem; /* PCI memory address */ vaddr_t pc_dense; /* PCI dense memory address */ @@ -116,8 +116,8 @@ int alpha_sysctl_chipset(int *, u_int, char *, size_t *); * alpha-specific PCI functions. * NOT TO BE USED DIRECTLY BY MACHINE INDEPENDENT CODE. */ -void pci_display_console __P((bus_space_tag_t, bus_space_tag_t, - pci_chipset_tag_t, int, int, int)); +void pci_display_console(bus_space_tag_t, bus_space_tag_t, + pci_chipset_tag_t, int, int, int); #define alpha_pci_decompose_tag(c, t, bp, dp, fp) \ (*(c)->pc_decompose_tag)((c)->pc_conf_v, (t), (bp), (dp), (fp)) #define alpha_pciide_compat_intr_establish(c, d, p, ch, f, a) \ @@ -131,6 +131,5 @@ void pci_display_console __P((bus_space_tag_t, bus_space_tag_t, (cookie)); } while (0) #ifdef _KERNEL -void pci_display_console - __P((bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t, int, int, int)); +void pci_display_console(bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t, int, int, int); #endif /* _KERNEL */ diff --git a/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c b/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c index eb642b303dc..d5de92e3233 100644 --- a/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c +++ b/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_swiz_bus_io_chipdep.c,v 1.2 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: pci_swiz_bus_io_chipdep.c,v 1.3 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: pcs_bus_io_common.c,v 1.14 1996/12/02 22:19:35 cgd Exp $ */ /* @@ -43,132 +43,132 @@ #define __S(S) __STRING(S) /* mapping/unmapping */ -int __C(CHIP,_io_map) __P((void *, bus_addr_t, bus_size_t, int, - bus_space_handle_t *)); -void __C(CHIP,_io_unmap) __P((void *, bus_space_handle_t, - bus_size_t)); -int __C(CHIP,_io_subregion) __P((void *, bus_space_handle_t, - bus_size_t, bus_size_t, bus_space_handle_t *)); +int __C(CHIP,_io_map)(void *, bus_addr_t, bus_size_t, int, + bus_space_handle_t *); +void __C(CHIP,_io_unmap)(void *, bus_space_handle_t, + bus_size_t); +int __C(CHIP,_io_subregion)(void *, bus_space_handle_t, + bus_size_t, bus_size_t, bus_space_handle_t *); /* allocation/deallocation */ -int __C(CHIP,_io_alloc) __P((void *, bus_addr_t, bus_addr_t, +int __C(CHIP,_io_alloc)(void *, bus_addr_t, bus_addr_t, bus_size_t, bus_size_t, bus_addr_t, int, bus_addr_t *, - bus_space_handle_t *)); -void __C(CHIP,_io_free) __P((void *, bus_space_handle_t, - bus_size_t)); + bus_space_handle_t *); +void __C(CHIP,_io_free)(void *, bus_space_handle_t, + bus_size_t); /* barrier */ -inline void __C(CHIP,_io_barrier) __P((void *, bus_space_handle_t, - bus_size_t, bus_size_t, int)); +inline void __C(CHIP,_io_barrier)(void *, bus_space_handle_t, + bus_size_t, bus_size_t, int); /* read (single) */ -inline u_int8_t __C(CHIP,_io_read_1) __P((void *, bus_space_handle_t, - bus_size_t)); -inline u_int16_t __C(CHIP,_io_read_2) __P((void *, bus_space_handle_t, - bus_size_t)); -inline u_int32_t __C(CHIP,_io_read_4) __P((void *, bus_space_handle_t, - bus_size_t)); -inline u_int64_t __C(CHIP,_io_read_8) __P((void *, bus_space_handle_t, - bus_size_t)); +inline u_int8_t __C(CHIP,_io_read_1)(void *, bus_space_handle_t, + bus_size_t); +inline u_int16_t __C(CHIP,_io_read_2)(void *, bus_space_handle_t, + bus_size_t); +inline u_int32_t __C(CHIP,_io_read_4)(void *, bus_space_handle_t, + bus_size_t); +inline u_int64_t __C(CHIP,_io_read_8)(void *, bus_space_handle_t, + bus_size_t); /* read multiple */ -void __C(CHIP,_io_read_multi_1) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t *, bus_size_t)); -void __C(CHIP,_io_read_multi_2) __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t *, bus_size_t)); -void __C(CHIP,_io_read_multi_4) __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t *, bus_size_t)); -void __C(CHIP,_io_read_multi_8) __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t *, bus_size_t)); +void __C(CHIP,_io_read_multi_1)(void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); +void __C(CHIP,_io_read_multi_2)(void *, bus_space_handle_t, + bus_size_t, u_int16_t *, bus_size_t); +void __C(CHIP,_io_read_multi_4)(void *, bus_space_handle_t, + bus_size_t, u_int32_t *, bus_size_t); +void __C(CHIP,_io_read_multi_8)(void *, bus_space_handle_t, + bus_size_t, u_int64_t *, bus_size_t); /* read region */ -void __C(CHIP,_io_read_region_1) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t *, bus_size_t)); -void __C(CHIP,_io_read_region_2) __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t *, bus_size_t)); -void __C(CHIP,_io_read_region_4) __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t *, bus_size_t)); -void __C(CHIP,_io_read_region_8) __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t *, bus_size_t)); +void __C(CHIP,_io_read_region_1)(void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); +void __C(CHIP,_io_read_region_2)(void *, bus_space_handle_t, + bus_size_t, u_int16_t *, bus_size_t); +void __C(CHIP,_io_read_region_4)(void *, bus_space_handle_t, + bus_size_t, u_int32_t *, bus_size_t); +void __C(CHIP,_io_read_region_8)(void *, bus_space_handle_t, + bus_size_t, u_int64_t *, bus_size_t); /* write (single) */ -inline void __C(CHIP,_io_write_1) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t)); -inline void __C(CHIP,_io_write_2) __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t)); -inline void __C(CHIP,_io_write_4) __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t)); -inline void __C(CHIP,_io_write_8) __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t)); +inline void __C(CHIP,_io_write_1)(void *, bus_space_handle_t, + bus_size_t, u_int8_t); +inline void __C(CHIP,_io_write_2)(void *, bus_space_handle_t, + bus_size_t, u_int16_t); +inline void __C(CHIP,_io_write_4)(void *, bus_space_handle_t, + bus_size_t, u_int32_t); +inline void __C(CHIP,_io_write_8)(void *, bus_space_handle_t, + bus_size_t, u_int64_t); /* write multiple */ -void __C(CHIP,_io_write_multi_1) __P((void *, bus_space_handle_t, - bus_size_t, const u_int8_t *, bus_size_t)); -void __C(CHIP,_io_write_multi_2) __P((void *, bus_space_handle_t, - bus_size_t, const u_int16_t *, bus_size_t)); -void __C(CHIP,_io_write_multi_4) __P((void *, bus_space_handle_t, - bus_size_t, const u_int32_t *, bus_size_t)); -void __C(CHIP,_io_write_multi_8) __P((void *, bus_space_handle_t, - bus_size_t, const u_int64_t *, bus_size_t)); +void __C(CHIP,_io_write_multi_1)(void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); +void __C(CHIP,_io_write_multi_2)(void *, bus_space_handle_t, + bus_size_t, const u_int16_t *, bus_size_t); +void __C(CHIP,_io_write_multi_4)(void *, bus_space_handle_t, + bus_size_t, const u_int32_t *, bus_size_t); +void __C(CHIP,_io_write_multi_8)(void *, bus_space_handle_t, + bus_size_t, const u_int64_t *, bus_size_t); /* write region */ -void __C(CHIP,_io_write_region_1) __P((void *, bus_space_handle_t, - bus_size_t, const u_int8_t *, bus_size_t)); -void __C(CHIP,_io_write_region_2) __P((void *, bus_space_handle_t, - bus_size_t, const u_int16_t *, bus_size_t)); -void __C(CHIP,_io_write_region_4) __P((void *, bus_space_handle_t, - bus_size_t, const u_int32_t *, bus_size_t)); -void __C(CHIP,_io_write_region_8) __P((void *, bus_space_handle_t, - bus_size_t, const u_int64_t *, bus_size_t)); +void __C(CHIP,_io_write_region_1)(void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); +void __C(CHIP,_io_write_region_2)(void *, bus_space_handle_t, + bus_size_t, const u_int16_t *, bus_size_t); +void __C(CHIP,_io_write_region_4)(void *, bus_space_handle_t, + bus_size_t, const u_int32_t *, bus_size_t); +void __C(CHIP,_io_write_region_8)(void *, bus_space_handle_t, + bus_size_t, const u_int64_t *, bus_size_t); /* set multiple */ -void __C(CHIP,_io_set_multi_1) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t, bus_size_t)); -void __C(CHIP,_io_set_multi_2) __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t, bus_size_t)); -void __C(CHIP,_io_set_multi_4) __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t, bus_size_t)); -void __C(CHIP,_io_set_multi_8) __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t, bus_size_t)); +void __C(CHIP,_io_set_multi_1)(void *, bus_space_handle_t, + bus_size_t, u_int8_t, bus_size_t); +void __C(CHIP,_io_set_multi_2)(void *, bus_space_handle_t, + bus_size_t, u_int16_t, bus_size_t); +void __C(CHIP,_io_set_multi_4)(void *, bus_space_handle_t, + bus_size_t, u_int32_t, bus_size_t); +void __C(CHIP,_io_set_multi_8)(void *, bus_space_handle_t, + bus_size_t, u_int64_t, bus_size_t); /* set region */ -void __C(CHIP,_io_set_region_1) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t, bus_size_t)); -void __C(CHIP,_io_set_region_2) __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t, bus_size_t)); -void __C(CHIP,_io_set_region_4) __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t, bus_size_t)); -void __C(CHIP,_io_set_region_8) __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t, bus_size_t)); +void __C(CHIP,_io_set_region_1)(void *, bus_space_handle_t, + bus_size_t, u_int8_t, bus_size_t); +void __C(CHIP,_io_set_region_2)(void *, bus_space_handle_t, + bus_size_t, u_int16_t, bus_size_t); +void __C(CHIP,_io_set_region_4)(void *, bus_space_handle_t, + bus_size_t, u_int32_t, bus_size_t); +void __C(CHIP,_io_set_region_8)(void *, bus_space_handle_t, + bus_size_t, u_int64_t, bus_size_t); /* copy */ -void __C(CHIP,_io_copy_1) __P((void *, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t)); -void __C(CHIP,_io_copy_2) __P((void *, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t)); -void __C(CHIP,_io_copy_4) __P((void *, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t)); -void __C(CHIP,_io_copy_8) __P((void *, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t)); +void __C(CHIP,_io_copy_1)(void *, bus_space_handle_t, + bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); +void __C(CHIP,_io_copy_2)(void *, bus_space_handle_t, + bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); +void __C(CHIP,_io_copy_4)(void *, bus_space_handle_t, + bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); +void __C(CHIP,_io_copy_8)(void *, bus_space_handle_t, + bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); /* read multiple raw */ -void __C(CHIP,_io_read_raw_multi_2) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t *, bus_size_t)); -void __C(CHIP,_io_read_raw_multi_4) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t *, bus_size_t)); -void __C(CHIP,_io_read_raw_multi_8) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t *, bus_size_t)); +void __C(CHIP,_io_read_raw_multi_2)(void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); +void __C(CHIP,_io_read_raw_multi_4)(void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); +void __C(CHIP,_io_read_raw_multi_8)(void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); /* write multiple raw */ -void __C(CHIP,_io_write_raw_multi_2) __P((void *, +void __C(CHIP,_io_write_raw_multi_2)(void *, bus_space_handle_t, bus_size_t, const u_int8_t *, - bus_size_t)); -void __C(CHIP,_io_write_raw_multi_4) __P((void *, + bus_size_t); +void __C(CHIP,_io_write_raw_multi_4)(void *, bus_space_handle_t, bus_size_t, const u_int8_t *, - bus_size_t)); -void __C(CHIP,_io_write_raw_multi_8) __P((void *, + bus_size_t); +void __C(CHIP,_io_write_raw_multi_8)(void *, bus_space_handle_t, bus_size_t, const u_int8_t *, - bus_size_t)); + bus_size_t); static long __C(CHIP,_io_ex_storage)[EXTENT_FIXED_STORAGE_SIZE(8) / sizeof(long)]; diff --git a/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c b/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c index 0803038c973..2f7cd2376a3 100644 --- a/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c +++ b/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_swiz_bus_mem_chipdep.c,v 1.2 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: pci_swiz_bus_mem_chipdep.c,v 1.3 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: pcs_bus_mem_common.c,v 1.15 1996/12/02 22:19:36 cgd Exp $ */ /* @@ -44,132 +44,132 @@ #define __S(S) __STRING(S) /* mapping/unmapping */ -int __C(CHIP,_mem_map) __P((void *, bus_addr_t, bus_size_t, int, - bus_space_handle_t *)); -void __C(CHIP,_mem_unmap) __P((void *, bus_space_handle_t, - bus_size_t)); -int __C(CHIP,_mem_subregion) __P((void *, bus_space_handle_t, - bus_size_t, bus_size_t, bus_space_handle_t *)); +int __C(CHIP,_mem_map)(void *, bus_addr_t, bus_size_t, int, + bus_space_handle_t *); +void __C(CHIP,_mem_unmap)(void *, bus_space_handle_t, + bus_size_t); +int __C(CHIP,_mem_subregion)(void *, bus_space_handle_t, + bus_size_t, bus_size_t, bus_space_handle_t *); /* allocation/deallocation */ -int __C(CHIP,_mem_alloc) __P((void *, bus_addr_t, bus_addr_t, +int __C(CHIP,_mem_alloc)(void *, bus_addr_t, bus_addr_t, bus_size_t, bus_size_t, bus_addr_t, int, bus_addr_t *, - bus_space_handle_t *)); -void __C(CHIP,_mem_free) __P((void *, bus_space_handle_t, - bus_size_t)); + bus_space_handle_t *); +void __C(CHIP,_mem_free)(void *, bus_space_handle_t, + bus_size_t); /* barrier */ -inline void __C(CHIP,_mem_barrier) __P((void *, bus_space_handle_t, - bus_size_t, bus_size_t, int)); +inline void __C(CHIP,_mem_barrier)(void *, bus_space_handle_t, + bus_size_t, bus_size_t, int); /* read (single) */ -inline u_int8_t __C(CHIP,_mem_read_1) __P((void *, bus_space_handle_t, - bus_size_t)); -inline u_int16_t __C(CHIP,_mem_read_2) __P((void *, bus_space_handle_t, - bus_size_t)); -inline u_int32_t __C(CHIP,_mem_read_4) __P((void *, bus_space_handle_t, - bus_size_t)); -inline u_int64_t __C(CHIP,_mem_read_8) __P((void *, bus_space_handle_t, - bus_size_t)); +inline u_int8_t __C(CHIP,_mem_read_1)(void *, bus_space_handle_t, + bus_size_t); +inline u_int16_t __C(CHIP,_mem_read_2)(void *, bus_space_handle_t, + bus_size_t); +inline u_int32_t __C(CHIP,_mem_read_4)(void *, bus_space_handle_t, + bus_size_t); +inline u_int64_t __C(CHIP,_mem_read_8)(void *, bus_space_handle_t, + bus_size_t); /* read multiple */ -void __C(CHIP,_mem_read_multi_1) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t *, bus_size_t)); -void __C(CHIP,_mem_read_multi_2) __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t *, bus_size_t)); -void __C(CHIP,_mem_read_multi_4) __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t *, bus_size_t)); -void __C(CHIP,_mem_read_multi_8) __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t *, bus_size_t)); +void __C(CHIP,_mem_read_multi_1)(void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); +void __C(CHIP,_mem_read_multi_2)(void *, bus_space_handle_t, + bus_size_t, u_int16_t *, bus_size_t); +void __C(CHIP,_mem_read_multi_4)(void *, bus_space_handle_t, + bus_size_t, u_int32_t *, bus_size_t); +void __C(CHIP,_mem_read_multi_8)(void *, bus_space_handle_t, + bus_size_t, u_int64_t *, bus_size_t); /* read region */ -void __C(CHIP,_mem_read_region_1) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t *, bus_size_t)); -void __C(CHIP,_mem_read_region_2) __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t *, bus_size_t)); -void __C(CHIP,_mem_read_region_4) __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t *, bus_size_t)); -void __C(CHIP,_mem_read_region_8) __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t *, bus_size_t)); +void __C(CHIP,_mem_read_region_1)(void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); +void __C(CHIP,_mem_read_region_2)(void *, bus_space_handle_t, + bus_size_t, u_int16_t *, bus_size_t); +void __C(CHIP,_mem_read_region_4)(void *, bus_space_handle_t, + bus_size_t, u_int32_t *, bus_size_t); +void __C(CHIP,_mem_read_region_8)(void *, bus_space_handle_t, + bus_size_t, u_int64_t *, bus_size_t); /* write (single) */ -inline void __C(CHIP,_mem_write_1) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t)); -inline void __C(CHIP,_mem_write_2) __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t)); -inline void __C(CHIP,_mem_write_4) __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t)); -inline void __C(CHIP,_mem_write_8) __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t)); +inline void __C(CHIP,_mem_write_1)(void *, bus_space_handle_t, + bus_size_t, u_int8_t); +inline void __C(CHIP,_mem_write_2)(void *, bus_space_handle_t, + bus_size_t, u_int16_t); +inline void __C(CHIP,_mem_write_4)(void *, bus_space_handle_t, + bus_size_t, u_int32_t); +inline void __C(CHIP,_mem_write_8)(void *, bus_space_handle_t, + bus_size_t, u_int64_t); /* write multiple */ -void __C(CHIP,_mem_write_multi_1) __P((void *, bus_space_handle_t, - bus_size_t, const u_int8_t *, bus_size_t)); -void __C(CHIP,_mem_write_multi_2) __P((void *, bus_space_handle_t, - bus_size_t, const u_int16_t *, bus_size_t)); -void __C(CHIP,_mem_write_multi_4) __P((void *, bus_space_handle_t, - bus_size_t, const u_int32_t *, bus_size_t)); -void __C(CHIP,_mem_write_multi_8) __P((void *, bus_space_handle_t, - bus_size_t, const u_int64_t *, bus_size_t)); +void __C(CHIP,_mem_write_multi_1)(void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); +void __C(CHIP,_mem_write_multi_2)(void *, bus_space_handle_t, + bus_size_t, const u_int16_t *, bus_size_t); +void __C(CHIP,_mem_write_multi_4)(void *, bus_space_handle_t, + bus_size_t, const u_int32_t *, bus_size_t); +void __C(CHIP,_mem_write_multi_8)(void *, bus_space_handle_t, + bus_size_t, const u_int64_t *, bus_size_t); /* write region */ -void __C(CHIP,_mem_write_region_1) __P((void *, bus_space_handle_t, - bus_size_t, const u_int8_t *, bus_size_t)); -void __C(CHIP,_mem_write_region_2) __P((void *, bus_space_handle_t, - bus_size_t, const u_int16_t *, bus_size_t)); -void __C(CHIP,_mem_write_region_4) __P((void *, bus_space_handle_t, - bus_size_t, const u_int32_t *, bus_size_t)); -void __C(CHIP,_mem_write_region_8) __P((void *, bus_space_handle_t, - bus_size_t, const u_int64_t *, bus_size_t)); +void __C(CHIP,_mem_write_region_1)(void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); +void __C(CHIP,_mem_write_region_2)(void *, bus_space_handle_t, + bus_size_t, const u_int16_t *, bus_size_t); +void __C(CHIP,_mem_write_region_4)(void *, bus_space_handle_t, + bus_size_t, const u_int32_t *, bus_size_t); +void __C(CHIP,_mem_write_region_8)(void *, bus_space_handle_t, + bus_size_t, const u_int64_t *, bus_size_t); /* set multiple */ -void __C(CHIP,_mem_set_multi_1) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t, bus_size_t)); -void __C(CHIP,_mem_set_multi_2) __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t, bus_size_t)); -void __C(CHIP,_mem_set_multi_4) __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t, bus_size_t)); -void __C(CHIP,_mem_set_multi_8) __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t, bus_size_t)); +void __C(CHIP,_mem_set_multi_1)(void *, bus_space_handle_t, + bus_size_t, u_int8_t, bus_size_t); +void __C(CHIP,_mem_set_multi_2)(void *, bus_space_handle_t, + bus_size_t, u_int16_t, bus_size_t); +void __C(CHIP,_mem_set_multi_4)(void *, bus_space_handle_t, + bus_size_t, u_int32_t, bus_size_t); +void __C(CHIP,_mem_set_multi_8)(void *, bus_space_handle_t, + bus_size_t, u_int64_t, bus_size_t); /* set region */ -void __C(CHIP,_mem_set_region_1) __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t, bus_size_t)); -void __C(CHIP,_mem_set_region_2) __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t, bus_size_t)); -void __C(CHIP,_mem_set_region_4) __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t, bus_size_t)); -void __C(CHIP,_mem_set_region_8) __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t, bus_size_t)); +void __C(CHIP,_mem_set_region_1)(void *, bus_space_handle_t, + bus_size_t, u_int8_t, bus_size_t); +void __C(CHIP,_mem_set_region_2)(void *, bus_space_handle_t, + bus_size_t, u_int16_t, bus_size_t); +void __C(CHIP,_mem_set_region_4)(void *, bus_space_handle_t, + bus_size_t, u_int32_t, bus_size_t); +void __C(CHIP,_mem_set_region_8)(void *, bus_space_handle_t, + bus_size_t, u_int64_t, bus_size_t); /* copy */ -void __C(CHIP,_mem_copy_1) __P((void *, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t)); -void __C(CHIP,_mem_copy_2) __P((void *, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t)); -void __C(CHIP,_mem_copy_4) __P((void *, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t)); -void __C(CHIP,_mem_copy_8) __P((void *, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t)); +void __C(CHIP,_mem_copy_1)(void *, bus_space_handle_t, + bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); +void __C(CHIP,_mem_copy_2)(void *, bus_space_handle_t, + bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); +void __C(CHIP,_mem_copy_4)(void *, bus_space_handle_t, + bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); +void __C(CHIP,_mem_copy_8)(void *, bus_space_handle_t, + bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); /* read multiple raw */ -void __C(CHIP,_mem_read_raw_multi_2) __P((void *, - bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t)); -void __C(CHIP,_mem_read_raw_multi_4) __P((void *, - bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t)); -void __C(CHIP,_mem_read_raw_multi_8) __P((void *, - bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t)); +void __C(CHIP,_mem_read_raw_multi_2)(void *, + bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t); +void __C(CHIP,_mem_read_raw_multi_4)(void *, + bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t); +void __C(CHIP,_mem_read_raw_multi_8)(void *, + bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t); /* write multiple raw */ -void __C(CHIP,_mem_write_raw_multi_2) __P((void *, +void __C(CHIP,_mem_write_raw_multi_2)(void *, bus_space_handle_t, bus_size_t, const u_int8_t *, - bus_size_t)); -void __C(CHIP,_mem_write_raw_multi_4) __P((void *, + bus_size_t); +void __C(CHIP,_mem_write_raw_multi_4)(void *, bus_space_handle_t, bus_size_t, const u_int8_t *, - bus_size_t)); -void __C(CHIP,_mem_write_raw_multi_8) __P((void *, + bus_size_t); +void __C(CHIP,_mem_write_raw_multi_8)(void *, bus_space_handle_t, bus_size_t, const u_int8_t *, - bus_size_t)); + bus_size_t); static long __C(CHIP,_dmem_ex_storage)[EXTENT_FIXED_STORAGE_SIZE(8) / sizeof(long)]; @@ -344,14 +344,14 @@ __C(CHIP,_bus_mem_init)(t, v) CHIP_S_MEM_EXTENT(v) = sex; } -static int __C(CHIP,_xlate_addr_to_dense_handle) __P((void *, - bus_addr_t, bus_space_handle_t *)); -static int __C(CHIP,_xlate_dense_handle_to_addr) __P((void *, - bus_space_handle_t, bus_addr_t *)); -static int __C(CHIP,_xlate_addr_to_sparse_handle) __P((void *, - bus_addr_t, bus_space_handle_t *)); -static int __C(CHIP,_xlate_sparse_handle_to_addr) __P((void *, - bus_space_handle_t, bus_addr_t *)); +static int __C(CHIP,_xlate_addr_to_dense_handle)(void *, + bus_addr_t, bus_space_handle_t *); +static int __C(CHIP,_xlate_dense_handle_to_addr)(void *, + bus_space_handle_t, bus_addr_t *); +static int __C(CHIP,_xlate_addr_to_sparse_handle)(void *, + bus_addr_t, bus_space_handle_t *); +static int __C(CHIP,_xlate_sparse_handle_to_addr)(void *, + bus_space_handle_t, bus_addr_t *); static int __C(CHIP,_xlate_addr_to_dense_handle)(v, memaddr, memhp) diff --git a/sys/arch/alpha/pci/pci_up1000.h b/sys/arch/alpha/pci/pci_up1000.h index 189a8c65d0b..736c645a9b6 100644 --- a/sys/arch/alpha/pci/pci_up1000.h +++ b/sys/arch/alpha/pci/pci_up1000.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_up1000.h,v 1.2 2001/04/17 14:53:34 art Exp $ */ +/* $OpenBSD: pci_up1000.h,v 1.3 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: pci_up1000.h,v 1.1 2000/06/01 20:30:31 thorpej Exp $ */ /*- @@ -37,4 +37,4 @@ * POSSIBILITY OF SUCH DAMAGE. */ -void pci_up1000_pickintr __P((struct irongate_config *)); +void pci_up1000_pickintr(struct irongate_config *); diff --git a/sys/arch/alpha/pci/pciide_machdep.c b/sys/arch/alpha/pci/pciide_machdep.c index 030ef727c0b..9ab736eea7d 100644 --- a/sys/arch/alpha/pci/pciide_machdep.c +++ b/sys/arch/alpha/pci/pciide_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide_machdep.c,v 1.3 2001/06/25 22:53:19 art Exp $ */ +/* $OpenBSD: pciide_machdep.c,v 1.4 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: pciide_machdep.c,v 1.2 1998/04/18 01:09:20 thorpej Exp $ */ /* @@ -60,7 +60,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; { pci_chipset_tag_t pc = pa->pa_pc; diff --git a/sys/arch/alpha/pci/sio.c b/sys/arch/alpha/pci/sio.c index ad86481302c..dcacd7049ca 100644 --- a/sys/arch/alpha/pci/sio.c +++ b/sys/arch/alpha/pci/sio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sio.c,v 1.26 2001/10/26 11:14:09 art Exp $ */ +/* $OpenBSD: sio.c,v 1.27 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: sio.c,v 1.15 1996/12/05 01:39:36 cgd Exp $ */ /* @@ -56,13 +56,13 @@ struct sio_softc { }; #ifdef __BROKEN_INDIRECT_CONFIG -int siomatch __P((struct device *, void *, void *)); +int siomatch(struct device *, void *, void *); #else -int siomatch __P((struct device *, struct cfdata *, void *)); +int siomatch(struct device *, struct cfdata *, void *); #endif -void sioattach __P((struct device *, struct device *, void *)); +void sioattach(struct device *, struct device *, void *); -extern int sio_intr_alloc __P((isa_chipset_tag_t *, int, int, int *)); +extern int sio_intr_alloc(isa_chipset_tag_t *, int, int, int *); struct cfattach sio_ca = { @@ -74,9 +74,9 @@ struct cfdriver sio_cd = { }; #ifdef __BROKEN_INDIRECT_CONFIG -int pcebmatch __P((struct device *, void *, void *)); +int pcebmatch(struct device *, void *, void *); #else -int pcebmatch __P((struct device *, struct cfdata *, void *)); +int pcebmatch(struct device *, struct cfdata *, void *); #endif struct cfattach pceb_ca = { @@ -93,14 +93,14 @@ union sio_attach_args { struct eisabus_attach_args sa_eba; }; -int sioprint __P((void *, const char *pnp)); -void sio_isa_attach_hook __P((struct device *, struct device *, - struct isabus_attach_args *)); -void sio_eisa_attach_hook __P((struct device *, struct device *, - struct eisabus_attach_args *)); -int sio_eisa_maxslots __P((void *)); -int sio_eisa_intr_map __P((void *, u_int, eisa_intr_handle_t *)); -void sio_bridge_callback __P((void *)); +int sioprint(void *, const char *pnp); +void sio_isa_attach_hook(struct device *, struct device *, + struct isabus_attach_args *); +void sio_eisa_attach_hook(struct device *, struct device *, + struct eisabus_attach_args *); +int sio_eisa_maxslots(void *); +int sio_eisa_intr_map(void *, u_int, eisa_intr_handle_t *); +void sio_bridge_callback(void *); int siomatch(parent, match, aux) diff --git a/sys/arch/alpha/pci/sio_pic.c b/sys/arch/alpha/pci/sio_pic.c index 4fb58f64ddc..f62441381a7 100644 --- a/sys/arch/alpha/pci/sio_pic.c +++ b/sys/arch/alpha/pci/sio_pic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sio_pic.c,v 1.19 2001/10/26 01:28:06 nate Exp $ */ +/* $OpenBSD: sio_pic.c,v 1.20 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: sio_pic.c,v 1.28 2000/06/06 03:10:13 thorpej Exp $ */ /*- @@ -122,21 +122,21 @@ u_int8_t initial_ocw1[2]; u_int8_t initial_elcr[2]; #endif -void sio_setirqstat __P((int, int, int)); -int sio_intr_alloc __P((void *, int, int, int *)); +void sio_setirqstat(int, int, int); +int sio_intr_alloc(void *, int, int, int *); -u_int8_t (*sio_read_elcr) __P((int)); -void (*sio_write_elcr) __P((int, u_int8_t)); -static void specific_eoi __P((int)); +u_int8_t (*sio_read_elcr)(int); +void (*sio_write_elcr)(int, u_int8_t); +static void specific_eoi(int); #ifdef BROKEN_PROM_CONSOLE -void sio_intr_shutdown __P((void *)); +void sio_intr_shutdown(void *); #endif /******************** i82378 SIO ELCR functions ********************/ -int i82378_setup_elcr __P((void)); -u_int8_t i82378_read_elcr __P((int)); -void i82378_write_elcr __P((int, u_int8_t)); +int i82378_setup_elcr(void); +u_int8_t i82378_read_elcr(int); +void i82378_write_elcr(int, u_int8_t); bus_space_handle_t sio_ioh_elcr; @@ -180,9 +180,9 @@ i82378_write_elcr(elcr, val) /******************** Cypress CY82C693 ELCR functions ********************/ -int cy82c693_setup_elcr __P((void)); -u_int8_t cy82c693_read_elcr __P((int)); -void cy82c693_write_elcr __P((int, u_int8_t)); +int cy82c693_setup_elcr(void); +u_int8_t cy82c693_read_elcr(int); +void cy82c693_write_elcr(int, u_int8_t); const struct cy82c693_handle *sio_cy82c693_handle; @@ -270,7 +270,7 @@ cy82c693_write_elcr(elcr, val) * they should panic. */ -int (*sio_elcr_setup_funcs[]) __P((void)) = { +int (*sio_elcr_setup_funcs[])(void) = { cy82c693_setup_elcr, i82378_setup_elcr, NULL, diff --git a/sys/arch/alpha/pci/siovar.h b/sys/arch/alpha/pci/siovar.h index 30575c0c6db..4cd708d8111 100644 --- a/sys/arch/alpha/pci/siovar.h +++ b/sys/arch/alpha/pci/siovar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: siovar.h,v 1.9 2001/08/17 22:26:58 mickey Exp $ */ +/* $OpenBSD: siovar.h,v 1.10 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: siovar.h,v 1.5 1996/10/23 04:12:34 cgd Exp $ */ /* @@ -28,14 +28,14 @@ * rights to redistribute these changes. */ -void sio_intr_setup __P((pci_chipset_tag_t, bus_space_tag_t)); -void sio_iointr __P((void *framep, unsigned long vec)); +void sio_intr_setup(pci_chipset_tag_t, bus_space_tag_t); +void sio_iointr(void *framep, unsigned long vec); -const char *sio_intr_string __P((void *, int)); -int sio_intr_line __P((void *, int)); +const char *sio_intr_string(void *, int); +int sio_intr_line(void *, int); void *sio_intr_establish __P((void *, int, int, int, int (*)(void *), void *, char *)); -void sio_intr_disestablish __P((void *, void *)); +void sio_intr_disestablish(void *, void *); #ifdef EVCNT_COUNTERS extern struct evcnt sio_intr_evcnt; diff --git a/sys/arch/alpha/pci/tsc.c b/sys/arch/alpha/pci/tsc.c index f2f9dd14335..1c7d2cfe6f4 100644 --- a/sys/arch/alpha/pci/tsc.c +++ b/sys/arch/alpha/pci/tsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tsc.c,v 1.6 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: tsc.c,v 1.7 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: tsc.c,v 1.3 2000/06/25 19:17:40 thorpej Exp $ */ /*- @@ -53,8 +53,8 @@ #define tsc() { Generate ctags(1) key. } -int tscmatch __P((struct device *, void *, void *)); -void tscattach __P((struct device *, struct device *, void *)); +int tscmatch(struct device *, void *, void *); +void tscattach(struct device *, struct device *, void *); struct cfattach tsc_ca = { sizeof(struct tsc_softc), tscmatch, tscattach, @@ -66,10 +66,10 @@ struct cfdriver tsc_cd = { struct tsp_config tsp_configuration[2]; -static int tscprint __P((void *, const char *pnp)); +static int tscprint(void *, const char *pnp); -int tspmatch __P((struct device *, void *, void *)); -void tspattach __P((struct device *, struct device *, void *)); +int tspmatch(struct device *, void *, void *); +void tspattach(struct device *, struct device *, void *); struct cfattach tsp_ca = { sizeof(struct tsp_softc), tspmatch, tspattach, @@ -80,11 +80,11 @@ struct cfdriver tsp_cd = { }; -static int tspprint __P((void *, const char *pnp)); +static int tspprint(void *, const char *pnp); #if 0 -static int tsp_bus_get_window __P((int, int, - struct alpha_bus_space_translation *)); +static int tsp_bus_get_window(int, int, + struct alpha_bus_space_translation *); #endif /* There can be only one */ diff --git a/sys/arch/alpha/pci/tsp_dma.c b/sys/arch/alpha/pci/tsp_dma.c index 6935e16b905..5dcab88356f 100644 --- a/sys/arch/alpha/pci/tsp_dma.c +++ b/sys/arch/alpha/pci/tsp_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tsp_dma.c,v 1.2 2001/11/06 19:53:13 miod Exp $ */ +/* $OpenBSD: tsp_dma.c,v 1.3 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: tsp_dma.c,v 1.1 1999/06/29 06:46:47 ross Exp $ */ /*- @@ -93,28 +93,28 @@ #define EDIFF(a, b) (((a) | WSBA_ENA | WSBA_SG) != ((b) | WSBA_ENA | WSBA_SG)) -bus_dma_tag_t tsp_dma_get_tag __P((bus_dma_tag_t, alpha_bus_t)); +bus_dma_tag_t tsp_dma_get_tag(bus_dma_tag_t, alpha_bus_t); -int tsp_bus_dmamap_create_sgmap __P((bus_dma_tag_t, bus_size_t, int, - bus_size_t, bus_size_t, int, bus_dmamap_t *)); +int tsp_bus_dmamap_create_sgmap(bus_dma_tag_t, bus_size_t, int, + bus_size_t, bus_size_t, int, bus_dmamap_t *); -void tsp_bus_dmamap_destroy_sgmap __P((bus_dma_tag_t, bus_dmamap_t)); +void tsp_bus_dmamap_destroy_sgmap(bus_dma_tag_t, bus_dmamap_t); -int tsp_bus_dmamap_load_sgmap __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); +int tsp_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int); -int tsp_bus_dmamap_load_mbuf_sgmap __P((bus_dma_tag_t, bus_dmamap_t, - struct mbuf *, int)); +int tsp_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t, + struct mbuf *, int); -int tsp_bus_dmamap_load_uio_sgmap __P((bus_dma_tag_t, bus_dmamap_t, - struct uio *, int)); +int tsp_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t, + struct uio *, int); -int tsp_bus_dmamap_load_raw_sgmap __P((bus_dma_tag_t, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int)); +int tsp_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int); -void tsp_bus_dmamap_unload_sgmap __P((bus_dma_tag_t, bus_dmamap_t)); +void tsp_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t); -void tsp_tlb_invalidate __P((struct tsp_config *)); +void tsp_tlb_invalidate(struct tsp_config *); void tsp_dma_init(pcp) diff --git a/sys/arch/alpha/pci/tsp_pci.c b/sys/arch/alpha/pci/tsp_pci.c index 1c785a58df4..6abcbc7936f 100644 --- a/sys/arch/alpha/pci/tsp_pci.c +++ b/sys/arch/alpha/pci/tsp_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tsp_pci.c,v 1.2 2001/11/06 19:53:13 miod Exp $ */ +/* $OpenBSD: tsp_pci.c,v 1.3 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: tsp_pci.c,v 1.1 1999/06/29 06:46:47 ross Exp $ */ /*- @@ -50,14 +50,14 @@ #define tsp_pci() { Generate ctags(1) key. } -void tsp_attach_hook __P((struct device *, struct device *, - struct pcibus_attach_args *)); -int tsp_bus_maxdevs __P((void *, int)); -pcitag_t tsp_make_tag __P((void *, int, int, int)); -void tsp_decompose_tag __P((void *, pcitag_t, int *, int *, - int *)); -pcireg_t tsp_conf_read __P((void *, pcitag_t, int)); -void tsp_conf_write __P((void *, pcitag_t, int, pcireg_t)); +void tsp_attach_hook(struct device *, struct device *, + struct pcibus_attach_args *); +int tsp_bus_maxdevs(void *, int); +pcitag_t tsp_make_tag(void *, int, int, int); +void tsp_decompose_tag(void *, pcitag_t, int *, int *, + int *); +pcireg_t tsp_conf_read(void *, pcitag_t, int); +void tsp_conf_write(void *, pcitag_t, int, pcireg_t); void tsp_pci_init(pc, v) diff --git a/sys/arch/alpha/pci/tsvar.h b/sys/arch/alpha/pci/tsvar.h index 30046cc6720..de3d3ee8603 100644 --- a/sys/arch/alpha/pci/tsvar.h +++ b/sys/arch/alpha/pci/tsvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tsvar.h,v 1.3 2001/12/14 00:44:59 nate Exp $ */ +/* $OpenBSD: tsvar.h,v 1.4 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: tsvar.h,v 1.1 1999/06/29 06:46:47 ross Exp $ */ /*- @@ -75,11 +75,11 @@ struct tsp_attach_args { extern int tsp_console_hose; -struct tsp_config *tsp_init __P((int, int)); -void tsp_pci_init __P((pci_chipset_tag_t, void *)); -void tsp_dma_init __P((struct tsp_config *)); +struct tsp_config *tsp_init(int, int); +void tsp_pci_init(pci_chipset_tag_t, void *); +void tsp_dma_init(struct tsp_config *); -void tsp_bus_io_init __P((bus_space_tag_t, void *)); -void tsp_bus_mem_init __P((bus_space_tag_t, void *)); +void tsp_bus_io_init(bus_space_tag_t, void *); +void tsp_bus_mem_init(bus_space_tag_t, void *); -void tsp_bus_mem_init2 __P((void *)); +void tsp_bus_mem_init2(void *); diff --git a/sys/arch/alpha/stand/boot/boot.c b/sys/arch/alpha/stand/boot/boot.c index 5210fadcd7b..612d2ce60e4 100644 --- a/sys/arch/alpha/stand/boot/boot.c +++ b/sys/arch/alpha/stand/boot/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.13 2001/05/16 00:38:16 deraadt Exp $ */ +/* $OpenBSD: boot.c,v 1.14 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: boot.c,v 1.10 1997/01/18 01:58:33 cgd Exp $ */ /* @@ -53,7 +53,7 @@ #define _KERNEL #include "include/pte.h" -int loadfile __P((char *, u_int64_t *)); +int loadfile(char *, u_int64_t *); char boot_file[128]; char boot_flags[128]; diff --git a/sys/arch/alpha/stand/boot/conf.c b/sys/arch/alpha/stand/boot/conf.c index 3883551a738..84063c8dfc0 100644 --- a/sys/arch/alpha/stand/boot/conf.c +++ b/sys/arch/alpha/stand/boot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.4 1996/10/30 22:40:40 niklas Exp $ */ +/* $OpenBSD: conf.c,v 1.5 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: conf.c,v 1.3 1995/11/23 02:39:31 cgd Exp $ */ /* @@ -44,7 +44,7 @@ #include "disk.h" -int diskopen __P((struct open_file *, ...)); /* XXX */ +int diskopen(struct open_file *, ...); /* XXX */ int errno; diff --git a/sys/arch/alpha/stand/boot/disk.h b/sys/arch/alpha/stand/boot/disk.h index 264c773ceea..68ff7bda459 100644 --- a/sys/arch/alpha/stand/boot/disk.h +++ b/sys/arch/alpha/stand/boot/disk.h @@ -1,8 +1,8 @@ -/* $OpenBSD: disk.h,v 1.3 1996/10/30 22:40:42 niklas Exp $ */ +/* $OpenBSD: disk.h,v 1.4 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: disk.h,v 1.1 1995/11/23 02:39:42 cgd Exp $ */ -int diskstrategy __P((void *, int, daddr_t, size_t, void *, size_t *)); -/* int diskopen __P((struct open_file *, int, int, int)); */ -int diskclose __P((struct open_file *)); +int diskstrategy(void *, int, daddr_t, size_t, void *, size_t *); +/* int diskopen(struct open_file *, int, int, int); */ +int diskclose(struct open_file *); #define diskioctl noioctl diff --git a/sys/arch/alpha/stand/bootxx.c b/sys/arch/alpha/stand/bootxx.c index 34ee4ef9e1e..0dcf15ee611 100644 --- a/sys/arch/alpha/stand/bootxx.c +++ b/sys/arch/alpha/stand/bootxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bootxx.c,v 1.8 1998/03/06 05:17:19 millert Exp $ */ +/* $OpenBSD: bootxx.c,v 1.9 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: bootxx.c,v 1.4 1997/01/18 00:28:59 cgd Exp $ */ /* @@ -133,7 +133,7 @@ main() { struct bbinfo *bbinfop; char *loadaddr; - void (*entry) __P((void)); + void (*entry)(void); /* Init prom callback vector. */ init_prom_calls(); diff --git a/sys/arch/alpha/stand/installboot.c b/sys/arch/alpha/stand/installboot.c index 13ab38bda97..b154692528e 100644 --- a/sys/arch/alpha/stand/installboot.c +++ b/sys/arch/alpha/stand/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.10 1997/10/27 16:52:03 millert Exp $ */ +/* $OpenBSD: installboot.c,v 1.11 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: installboot.c,v 1.2 1997/04/06 08:41:12 cgd Exp $ */ /* @@ -66,11 +66,11 @@ struct bbinfo *bbinfop; int max_block_count; -char *loadprotoblocks __P((char *, long *)); -int loadblocknums __P((char *, int, unsigned long)); -static void devread __P((int, void *, daddr_t, size_t, char *)); -static void usage __P((void)); -int main __P((int, char *[])); +char *loadprotoblocks(char *, long *); +int loadblocknums(char *, int, unsigned long); +static void devread(int, void *, daddr_t, size_t, char *); +static void usage(void); +int main(int, char *[]); int isofsblk = 0; int isofseblk = 0; diff --git a/sys/arch/alpha/stand/loadfile.c b/sys/arch/alpha/stand/loadfile.c index 4e46eb872a4..661d8e6dd78 100644 --- a/sys/arch/alpha/stand/loadfile.c +++ b/sys/arch/alpha/stand/loadfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: loadfile.c,v 1.11 2001/05/16 00:38:15 deraadt Exp $ */ +/* $OpenBSD: loadfile.c,v 1.12 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: loadfile.c,v 1.3 1997/04/06 08:40:59 cgd Exp $ */ /* @@ -58,12 +58,12 @@ #include "include/pte.h" #ifdef ALPHA_BOOT_ECOFF -static int coff_exec __P((int, struct ecoff_exechdr *, u_int64_t *)); +static int coff_exec(int, struct ecoff_exechdr *, u_int64_t *); #endif #ifdef ALPHA_BOOT_ELF -static int elf_exec __P((int, Elf64_Ehdr *, u_int64_t *)); +static int elf_exec(int, Elf64_Ehdr *, u_int64_t *); #endif -int loadfile __P((char *, u_int64_t *)); +int loadfile(char *, u_int64_t *); paddr_t ffp_save, ptbr_save; vaddr_t ssym, esym; diff --git a/sys/arch/alpha/stand/netboot/dev_net.h b/sys/arch/alpha/stand/netboot/dev_net.h index 3e3d4b091d6..447c71b34b6 100644 --- a/sys/arch/alpha/stand/netboot/dev_net.h +++ b/sys/arch/alpha/stand/netboot/dev_net.h @@ -1,8 +1,8 @@ -/* $OpenBSD: dev_net.h,v 1.1 1996/10/30 22:40:53 niklas Exp $ */ +/* $OpenBSD: dev_net.h,v 1.2 2002/03/14 01:26:27 millert Exp $ */ -int net_open __P((struct open_file *, ...)); -int net_close __P((struct open_file *)); +int net_open(struct open_file *, ...); +int net_close(struct open_file *); int net_ioctl(); int net_strategy(); diff --git a/sys/arch/alpha/stand/netboot/netboot.c b/sys/arch/alpha/stand/netboot/netboot.c index 9f240bda3ca..164212c36bb 100644 --- a/sys/arch/alpha/stand/netboot/netboot.c +++ b/sys/arch/alpha/stand/netboot/netboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netboot.c,v 1.3 1996/11/27 19:54:56 niklas Exp $ */ +/* $OpenBSD: netboot.c,v 1.4 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: netboot.c,v 1.1 1996/09/18 20:03:12 cgd Exp $ */ /* @@ -52,7 +52,7 @@ #define _KERNEL #include "include/pte.h" -int loadfile __P((char *, u_int64_t *)); +int loadfile(char *, u_int64_t *); char boot_file[128]; char boot_flags[128]; diff --git a/sys/arch/alpha/tc/asc.c b/sys/arch/alpha/tc/asc.c index 3a5df7269c0..5b8b4418d8c 100644 --- a/sys/arch/alpha/tc/asc.c +++ b/sys/arch/alpha/tc/asc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc.c,v 1.2 2001/02/03 19:40:41 art Exp $ */ +/* $OpenBSD: asc.c,v 1.3 2002/03/14 01:26:27 millert Exp $ */ /* $NetBSD: esp.c,v 1.26 1996/12/05 01:39:40 cgd Exp $ */ #ifdef __sparc__ @@ -108,39 +108,39 @@ int esp_debug = 0; /*ESP_SHOWPHASE|ESP_SHOWMISC|ESP_SHOWTRAC|ESP_SHOWCMDS;*/ -/*static*/ void espattach __P((struct device *, struct device *, - void *)); -/*static*/ int espprint __P((void *, const char *)); +/*static*/ void espattach(struct device *, struct device *, + void *); +/*static*/ int espprint(void *, const char *); #ifdef __BROKEN_INDIRECT_CONFIG -/*static*/ int espmatch __P((struct device *, void *, void *)); +/*static*/ int espmatch(struct device *, void *, void *); #else -/*static*/ int espmatch __P((struct device *, struct cfdata *, - void *)); +/*static*/ int espmatch(struct device *, struct cfdata *, + void *); #endif -/*static*/ u_int esp_adapter_info __P((struct esp_softc *)); -/*static*/ void espreadregs __P((struct esp_softc *)); -/*static*/ void esp_select __P((struct esp_softc *, struct esp_ecb *)); -/*static*/ int esp_reselect __P((struct esp_softc *, int)); -/*static*/ void esp_scsi_reset __P((struct esp_softc *)); -/*static*/ void esp_reset __P((struct esp_softc *)); -/*static*/ void espinit __P((struct esp_softc *, int)); -/*static*/ int esp_scsi_cmd __P((struct scsi_xfer *)); -/*static*/ int esp_poll __P((struct esp_softc *, struct scsi_xfer *, - int)); -/*static*/ void esp_sched __P((struct esp_softc *)); -/*static*/ void esp_done __P((struct esp_softc *, struct esp_ecb *)); -/*static*/ void esp_msgin __P((struct esp_softc *)); -/*static*/ void esp_msgout __P((struct esp_softc *)); -/*static*/ int espintr __P((struct esp_softc *)); -/*static*/ void esp_timeout __P((void *arg)); -/*static*/ void esp_abort __P((struct esp_softc *, struct esp_ecb *)); -/*static*/ void esp_dequeue __P((struct esp_softc *, struct esp_ecb *)); -void esp_sense __P((struct esp_softc *, struct esp_ecb *)); -void esp_free_ecb __P((struct esp_softc *, struct esp_ecb *, int)); -struct esp_ecb *esp_get_ecb __P((struct esp_softc *, int)); -static inline int esp_stp2cpb __P((struct esp_softc *, int)); -static inline int esp_cpb2stp __P((struct esp_softc *, int)); -static inline void esp_setsync __P((struct esp_softc *, struct esp_tinfo *)); +/*static*/ u_int esp_adapter_info(struct esp_softc *); +/*static*/ void espreadregs(struct esp_softc *); +/*static*/ void esp_select(struct esp_softc *, struct esp_ecb *); +/*static*/ int esp_reselect(struct esp_softc *, int); +/*static*/ void esp_scsi_reset(struct esp_softc *); +/*static*/ void esp_reset(struct esp_softc *); +/*static*/ void espinit(struct esp_softc *, int); +/*static*/ int esp_scsi_cmd(struct scsi_xfer *); +/*static*/ int esp_poll(struct esp_softc *, struct scsi_xfer *, + int); +/*static*/ void esp_sched(struct esp_softc *); +/*static*/ void esp_done(struct esp_softc *, struct esp_ecb *); +/*static*/ void esp_msgin(struct esp_softc *); +/*static*/ void esp_msgout(struct esp_softc *); +/*static*/ int espintr(struct esp_softc *); +/*static*/ void esp_timeout(void *arg); +/*static*/ void esp_abort(struct esp_softc *, struct esp_ecb *); +/*static*/ void esp_dequeue(struct esp_softc *, struct esp_ecb *); +void esp_sense(struct esp_softc *, struct esp_ecb *); +void esp_free_ecb(struct esp_softc *, struct esp_ecb *, int); +struct esp_ecb *esp_get_ecb(struct esp_softc *, int); +static inline int esp_stp2cpb(struct esp_softc *, int); +static inline int esp_cpb2stp(struct esp_softc *, int); +static inline void esp_setsync(struct esp_softc *, struct esp_tinfo *); /* Linkup to the rest of the kernel */ struct cfattach asc_ca = { diff --git a/sys/arch/alpha/tc/ascvar.h b/sys/arch/alpha/tc/ascvar.h index c5499bc7880..7d6b140f7a4 100644 --- a/sys/arch/alpha/tc/ascvar.h +++ b/sys/arch/alpha/tc/ascvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ascvar.h,v 1.1 2000/07/05 21:50:38 ericj Exp $ */ +/* $OpenBSD: ascvar.h,v 1.2 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: espvar.h,v 1.12 1996/11/24 04:21:30 cgd Exp $ */ #if defined(__sparc__) && !defined(SPARC_DRIVER) @@ -287,7 +287,7 @@ struct esp_softc { } while (0) #else /* ! SPARC_DRIVER */ #if 1 -static __inline u_char ESP_READ_REG __P((struct esp_softc *, int)); +static __inline u_char ESP_READ_REG(struct esp_softc *, int); static __inline u_char ESP_READ_REG(sc, reg) diff --git a/sys/arch/alpha/tc/cfb.c b/sys/arch/alpha/tc/cfb.c index f2d978ed6a2..54e90367a86 100644 --- a/sys/arch/alpha/tc/cfb.c +++ b/sys/arch/alpha/tc/cfb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cfb.c,v 1.12 2001/02/01 18:05:30 art Exp $ */ +/* $OpenBSD: cfb.c,v 1.13 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: cfb.c,v 1.7 1996/12/05 01:39:39 cgd Exp $ */ /* @@ -53,11 +53,11 @@ #include <machine/pte.h> #ifdef __BROKEN_INDIRECT_CONFIG -int cfbmatch __P((struct device *, void *, void *)); +int cfbmatch(struct device *, void *, void *); #else -int cfbmatch __P((struct device *, struct cfdata *, void *)); +int cfbmatch(struct device *, struct cfdata *, void *); #endif -void cfbattach __P((struct device *, struct device *, void *)); +void cfbattach(struct device *, struct device *, void *); struct cfattach cfb_ca = { sizeof(struct cfb_softc), cfbmatch, cfbattach, @@ -67,7 +67,7 @@ struct cfdriver cfb_cd = { NULL, "cfb", DV_DULL, }; -void cfb_getdevconfig __P((tc_addr_t dense_addr, struct cfb_devconfig *dc)); +void cfb_getdevconfig(tc_addr_t dense_addr, struct cfb_devconfig *dc); struct cfb_devconfig cfb_console_dc; tc_addr_t cfb_consaddr; @@ -98,13 +98,13 @@ struct wsscreen_list cfb_screenlist = { sizeof(_cfb_scrlist) / sizeof(struct wsscreen_descr *), _cfb_scrlist }; -int cfbioctl __P((void *, u_long, caddr_t, int, struct proc *)); -paddr_t cfbmmap __P((void *, off_t, int)); +int cfbioctl(void *, u_long, caddr_t, int, struct proc *); +paddr_t cfbmmap(void *, off_t, int); -int cfbintr __P((void *)); -static int cfb_alloc_screen __P((void *, const struct wsscreen_descr *, - void **, int *, int *, long *)); -static void cfb_free_screen __P((void *, void *)); +int cfbintr(void *); +static int cfb_alloc_screen(void *, const struct wsscreen_descr *, + void **, int *, int *, long *); +static void cfb_free_screen(void *, void *); static int cfb_show_screen __P((void *, void *, int, void (*) (void *, int, int), void *)); @@ -369,7 +369,7 @@ cfb_show_screen(v, cookie, waitok, cb, cbarg) void *v; void *cookie; int waitok; - void (*cb) __P((void *, int, int)); + void (*cb)(void *, int, int); void *cbarg; { return (0); diff --git a/sys/arch/alpha/tc/cfbvar.h b/sys/arch/alpha/tc/cfbvar.h index 1eada4d768e..05081b2f8be 100644 --- a/sys/arch/alpha/tc/cfbvar.h +++ b/sys/arch/alpha/tc/cfbvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cfbvar.h,v 1.5 2000/08/04 16:45:47 ericj Exp $ */ +/* $OpenBSD: cfbvar.h,v 1.6 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: cfbvar.h,v 1.1 1996/05/01 23:25:04 cgd Exp $ */ /* @@ -64,5 +64,5 @@ struct cfb_softc { }; #if 0 -int cfb_cnattach __P((tc_addr_t)); +int cfb_cnattach(tc_addr_t); #endif diff --git a/sys/arch/alpha/tc/ioasic.c b/sys/arch/alpha/tc/ioasic.c index b8eb6dff7f2..d95660442b6 100644 --- a/sys/arch/alpha/tc/ioasic.c +++ b/sys/arch/alpha/tc/ioasic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ioasic.c,v 1.7 1999/01/11 05:11:04 millert Exp $ */ +/* $OpenBSD: ioasic.c,v 1.8 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: ioasic.c,v 1.10 1996/12/05 01:39:41 cgd Exp $ */ /* @@ -53,11 +53,11 @@ struct ioasic_softc { /* Definition of the driver for autoconfig. */ #ifdef __BROKEN_INDIRECT_CONFIG -int ioasicmatch __P((struct device *, void *, void *)); +int ioasicmatch(struct device *, void *, void *); #else -int ioasicmatch __P((struct device *, struct cfdata *, void *)); +int ioasicmatch(struct device *, struct cfdata *, void *); #endif -void ioasicattach __P((struct device *, struct device *, void *)); +void ioasicattach(struct device *, struct device *, void *); int ioasicprint(void *, const char *); struct cfattach ioasic_ca = { @@ -68,8 +68,8 @@ struct cfdriver ioasic_cd = { NULL, "ioasic", DV_DULL, }; -int ioasic_intr __P((void *)); -int ioasic_intrnull __P((void *)); +int ioasic_intr(void *); +int ioasic_intrnull(void *); #define C(x) ((void *)(x)) @@ -98,7 +98,7 @@ struct ioasic_dev { int ioasic_ndevs = sizeof(ioasic_devs) / sizeof(ioasic_devs[0]); struct ioasicintr { - int (*iai_func) __P((void *)); + int (*iai_func)(void *); void *iai_arg; } ioasicintrs[IOASIC_NCOOKIES]; @@ -223,7 +223,7 @@ ioasic_intr_establish(ioa, cookie, level, func, arg) struct device *ioa; void *cookie, *arg; tc_intrlevel_t level; - int (*func) __P((void *)); + int (*func)(void *); { u_long dev, i; diff --git a/sys/arch/alpha/tc/mcclock_ioasic.c b/sys/arch/alpha/tc/mcclock_ioasic.c index 2a5582895fb..2709092949d 100644 --- a/sys/arch/alpha/tc/mcclock_ioasic.c +++ b/sys/arch/alpha/tc/mcclock_ioasic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mcclock_ioasic.c,v 1.4 1997/01/24 19:58:14 niklas Exp $ */ +/* $OpenBSD: mcclock_ioasic.c,v 1.5 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: mcclock_ioasic.c,v 1.3 1996/12/05 01:39:42 cgd Exp $ */ /* @@ -52,19 +52,19 @@ struct mcclock_ioasic_softc { }; #ifdef __BROKEN_INDIRECT_CONFIG -int mcclock_ioasic_match __P((struct device *, void *, void *)); +int mcclock_ioasic_match(struct device *, void *, void *); #else -int mcclock_ioasic_match __P((struct device *, struct cfdata *, void *)); +int mcclock_ioasic_match(struct device *, struct cfdata *, void *); #endif -void mcclock_ioasic_attach __P((struct device *, struct device *, void *)); +void mcclock_ioasic_attach(struct device *, struct device *, void *); struct cfattach mcclock_ioasic_ca = { sizeof (struct mcclock_ioasic_softc), mcclock_ioasic_match, mcclock_ioasic_attach, }; -void mcclock_ioasic_write __P((struct mcclock_softc *, u_int, u_int)); -u_int mcclock_ioasic_read __P((struct mcclock_softc *, u_int)); +void mcclock_ioasic_write(struct mcclock_softc *, u_int, u_int); +u_int mcclock_ioasic_read(struct mcclock_softc *, u_int); const struct mcclock_busfns mcclock_ioasic_busfns = { mcclock_ioasic_write, mcclock_ioasic_read, diff --git a/sys/arch/alpha/tc/scc.c b/sys/arch/alpha/tc/scc.c index 6ff87cdddd3..b458a76d0ac 100644 --- a/sys/arch/alpha/tc/scc.c +++ b/sys/arch/alpha/tc/scc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scc.c,v 1.12 2002/02/15 20:45:29 nordin Exp $ */ +/* $OpenBSD: scc.c,v 1.13 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: scc.c,v 1.28 1996/12/05 01:39:43 cgd Exp $ */ /* @@ -115,9 +115,9 @@ #define SCCLINE(dev) (minor(dev) & 0x1) /* QVSS-compatible in-kernel X input event parser, pointer tracker */ -void (*sccDivertXInput) __P((int cc)); /* X windows keyboard input routine */ -void (*sccMouseEvent) __P((int)); /* X windows mouse motion event routine */ -void (*sccMouseButtons) __P((int)); /* X windows mouse buttons event routine */ +void (*sccDivertXInput)(int cc); /* X windows keyboard input routine */ +void (*sccMouseEvent)(int); /* X windows mouse motion event routine */ +void (*sccMouseButtons)(int); /* X windows mouse buttons event routine */ #ifdef DEBUG int debugChar; #endif @@ -127,7 +127,7 @@ struct pdma { char *p_mem; char *p_end; int p_arg; - void (*p_fcn) __P((struct tty *tp)); + void (*p_fcn)(struct tty *tp); }; struct scc_softc { @@ -193,11 +193,11 @@ struct speedtab sccspeedtab[] = { /* Definition of the driver for autoconfig. */ #ifdef __BROKEN_INDIRECT_CONFIG -int sccmatch __P((struct device *, void *, void *)); +int sccmatch(struct device *, void *, void *); #else -int sccmatch __P((struct device *, struct cfdata *, void *)); +int sccmatch(struct device *, struct cfdata *, void *); #endif -void sccattach __P((struct device *, struct device *, void *)); +void sccattach(struct device *, struct device *, void *); struct cfattach scc_ca = { sizeof (struct scc_softc), sccmatch, sccattach, @@ -209,20 +209,20 @@ struct cfdriver scc_cd = { cdev_decl(scc); -int cold_sccparam __P((struct tty *, struct termios *, - struct scc_softc *sc)); -int sccGetc __P((dev_t)); -void sccPollc __P((dev_t, int)); -void sccPutc __P((dev_t, int)); -int sccintr __P((void *)); -int sccmctl __P((dev_t, int, int)); -int sccparam __P((struct tty *, struct termios *)); -void sccreset __P((struct scc_softc *)); -void sccstart __P((struct tty *)); -void scc_alphaintr __P((int)); -void scc_modem_intr __P((dev_t)); +int cold_sccparam(struct tty *, struct termios *, + struct scc_softc *sc); +int sccGetc(dev_t); +void sccPollc(dev_t, int); +void sccPutc(dev_t, int); +int sccintr(void *); +int sccmctl(dev_t, int, int); +int sccparam(struct tty *, struct termios *); +void sccreset(struct scc_softc *); +void sccstart(struct tty *); +void scc_alphaintr(int); +void scc_modem_intr(dev_t); #ifdef SCC_DEBUG -void scc_rr __P((char *, scc_regmap_t *)); +void scc_rr(char *, scc_regmap_t *); #endif /* @@ -234,8 +234,8 @@ static struct scc_softc coldcons_softc; static struct consdev scccons = { NULL, NULL, sccGetc, sccPutc, sccPollc, NULL, NODEV, 0 }; -void scc_consinit __P((dev_t dev, scc_regmap_t *sccaddr)); -void scc_oconsinit __P((struct scc_softc *, dev_t)); +void scc_consinit(dev_t dev, scc_regmap_t *sccaddr); +void scc_oconsinit(struct scc_softc *, dev_t); /* @@ -413,7 +413,7 @@ sccattach(parent, self, aux) if (cntr == 0) tty_attach(tp); pdp->p_arg = (long)tp; - pdp->p_fcn = (void (*)__P((struct tty*)))0; + pdp->p_fcn = (void (*)(struct tty*))0; tp->t_dev = (dev_t)((sc->sc_dv.dv_unit << 1) | cntr); pdp++; } diff --git a/sys/arch/alpha/tc/sfb.c b/sys/arch/alpha/tc/sfb.c index 3d06f9165ff..e4498562ff2 100644 --- a/sys/arch/alpha/tc/sfb.c +++ b/sys/arch/alpha/tc/sfb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sfb.c,v 1.12 2001/02/01 18:05:30 art Exp $ */ +/* $OpenBSD: sfb.c,v 1.13 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: sfb.c,v 1.7 1996/12/05 01:39:44 cgd Exp $ */ /* @@ -53,11 +53,11 @@ #include <machine/pte.h> #ifdef __BROKEN_INDIRECT_CONFIG -int sfbmatch __P((struct device *, void *, void *)); +int sfbmatch(struct device *, void *, void *); #else -int sfbmatch __P((struct device *, struct cfdata *, void *)); +int sfbmatch(struct device *, struct cfdata *, void *); #endif -void sfbattach __P((struct device *, struct device *, void *)); +void sfbattach(struct device *, struct device *, void *); struct cfattach sfb_ca = { sizeof(struct sfb_softc), sfbmatch, sfbattach, @@ -67,7 +67,7 @@ struct cfdriver sfb_cd = { NULL, "sfb", DV_DULL, }; -void sfb_getdevconfig __P((tc_addr_t dense_addr, struct sfb_devconfig *dc)); +void sfb_getdevconfig(tc_addr_t dense_addr, struct sfb_devconfig *dc); struct sfb_devconfig sfb_console_dc; tc_addr_t sfb_consaddr; @@ -97,18 +97,18 @@ struct wsscreen_list sfb_screenlist = { sizeof(_sfb_scrlist) / sizeof(struct wsscreen_descr *), _sfb_scrlist }; -int sfbioctl __P((void *, u_long, caddr_t, int, struct proc *)); -paddr_t sfbmmap __P((void *, off_t, int)); +int sfbioctl(void *, u_long, caddr_t, int, struct proc *); +paddr_t sfbmmap(void *, off_t, int); -static int sfb_alloc_screen __P((void *, const struct wsscreen_descr *, - void **, int *, int *, long *)); -static void sfb_free_screen __P((void *, void *)); +static int sfb_alloc_screen(void *, const struct wsscreen_descr *, + void **, int *, int *, long *); +static void sfb_free_screen(void *, void *); static int sfb_show_screen __P((void *, void *, int, void (*) (void *, int, int), void *)); #if 0 -void sfb_blank __P((struct sfb_devconfig *)); -void sfb_unblank __P((struct sfb_devconfig *)); +void sfb_blank(struct sfb_devconfig *); +void sfb_unblank(struct sfb_devconfig *); #endif struct wsdisplay_accessops sfb_accessops = { @@ -403,7 +403,7 @@ sfb_show_screen(v, cookie, waitok, cb, cbarg) void *v; void *cookie; int waitok; - void (*cb) __P((void *, int, int)); + void (*cb)(void *, int, int); void *cbarg; { diff --git a/sys/arch/alpha/tc/sfbvar.h b/sys/arch/alpha/tc/sfbvar.h index 1eaefccb89e..f30a3da9b00 100644 --- a/sys/arch/alpha/tc/sfbvar.h +++ b/sys/arch/alpha/tc/sfbvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sfbvar.h,v 1.5 2000/08/04 16:45:47 ericj Exp $ */ +/* $OpenBSD: sfbvar.h,v 1.6 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: sfbvar.h,v 1.1 1996/05/01 21:15:51 cgd Exp $ */ /* @@ -64,5 +64,5 @@ struct sfb_softc { }; #if 0 -int sfb_cnattach __P((tc_addr_t)); +int sfb_cnattach(tc_addr_t); #endif diff --git a/sys/arch/alpha/tc/tc_3000_300.c b/sys/arch/alpha/tc/tc_3000_300.c index e5eaf6be79b..abf79b63b3f 100644 --- a/sys/arch/alpha/tc/tc_3000_300.c +++ b/sys/arch/alpha/tc/tc_3000_300.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tc_3000_300.c,v 1.6 1999/01/11 05:11:04 millert Exp $ */ +/* $OpenBSD: tc_3000_300.c,v 1.7 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: tc_3000_300.c,v 1.12 1996/10/13 03:00:37 christos Exp $ */ /* @@ -43,13 +43,13 @@ #include <alpha/tc/tc_3000_300.h> #include <alpha/tc/ioasicreg.h> -void tc_3000_300_intr_setup __P((void)); +void tc_3000_300_intr_setup(void); void tc_3000_300_intr_establish __P((struct device *, void *, tc_intrlevel_t, int (*)(void *), void *)); -void tc_3000_300_intr_disestablish __P((struct device *, void *)); -void tc_3000_300_iointr __P((void *, unsigned long)); +void tc_3000_300_intr_disestablish(struct device *, void *); +void tc_3000_300_iointr(void *, unsigned long); -int tc_3000_300_intrnull __P((void *)); +int tc_3000_300_intrnull(void *); #define C(x) ((void *)(u_long)x) #define KV(x) (ALPHA_PHYS_TO_K0SEG(x)) @@ -81,7 +81,7 @@ int tc_3000_300_nbuiltins = sizeof(tc_3000_300_builtins) / sizeof(tc_3000_300_builtins[0]); struct tcintr { - int (*tci_func) __P((void *)); + int (*tci_func)(void *); void *tci_arg; } tc_3000_300_intr[TC_3000_300_NCOOKIES]; @@ -111,7 +111,7 @@ tc_3000_300_intr_establish(tcadev, cookie, level, func, arg) struct device *tcadev; void *cookie, *arg; tc_intrlevel_t level; - int (*func) __P((void *)); + int (*func)(void *); { volatile u_int32_t *imskp; u_long dev = (u_long)cookie; diff --git a/sys/arch/alpha/tc/tc_3000_500.c b/sys/arch/alpha/tc/tc_3000_500.c index 68a38f6a848..7e1dce6116f 100644 --- a/sys/arch/alpha/tc/tc_3000_500.c +++ b/sys/arch/alpha/tc/tc_3000_500.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tc_3000_500.c,v 1.7 1999/01/11 05:11:04 millert Exp $ */ +/* $OpenBSD: tc_3000_500.c,v 1.8 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: tc_3000_500.c,v 1.12 1996/11/15 23:59:00 cgd Exp $ */ /* @@ -42,13 +42,13 @@ #include <alpha/tc/tc_conf.h> #include <alpha/tc/tc_3000_500.h> -void tc_3000_500_intr_setup __P((void)); +void tc_3000_500_intr_setup(void); void tc_3000_500_intr_establish __P((struct device *, void *, tc_intrlevel_t, int (*)(void *), void *)); -void tc_3000_500_intr_disestablish __P((struct device *, void *)); -void tc_3000_500_iointr __P((void *, unsigned long)); +void tc_3000_500_intr_disestablish(struct device *, void *); +void tc_3000_500_iointr(void *, unsigned long); -int tc_3000_500_intrnull __P((void *)); +int tc_3000_500_intrnull(void *); #define C(x) ((void *)(u_long)x) #define KV(x) (ALPHA_PHYS_TO_K0SEG(x)) @@ -94,7 +94,7 @@ u_int32_t tc_3000_500_intrbits[TC_3000_500_NCOOKIES] = { }; struct tcintr { - int (*tci_func) __P((void *)); + int (*tci_func)(void *); void *tci_arg; } tc_3000_500_intr[TC_3000_500_NCOOKIES]; @@ -129,7 +129,7 @@ tc_3000_500_intr_establish(tcadev, cookie, level, func, arg) struct device *tcadev; void *cookie, *arg; tc_intrlevel_t level; - int (*func) __P((void *)); + int (*func)(void *); { u_long dev = (u_long)cookie; diff --git a/sys/arch/alpha/tc/tc_bus_mem.c b/sys/arch/alpha/tc/tc_bus_mem.c index 43a765b273c..951990eaf44 100644 --- a/sys/arch/alpha/tc/tc_bus_mem.c +++ b/sys/arch/alpha/tc/tc_bus_mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tc_bus_mem.c,v 1.11 2001/11/06 19:53:13 miod Exp $ */ +/* $OpenBSD: tc_bus_mem.c,v 1.12 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: tc_bus_mem.c,v 1.13 1996/12/02 22:19:34 cgd Exp $ */ /* @@ -43,123 +43,123 @@ #include <dev/tc/tcvar.h> /* mapping/unmapping */ -int tc_mem_map __P((void *, bus_addr_t, bus_size_t, int, - bus_space_handle_t *)); -void tc_mem_unmap __P((void *, bus_space_handle_t, bus_size_t)); -int tc_mem_subregion __P((void *, bus_space_handle_t, bus_size_t, - bus_size_t, bus_space_handle_t *)); +int tc_mem_map(void *, bus_addr_t, bus_size_t, int, + bus_space_handle_t *); +void tc_mem_unmap(void *, bus_space_handle_t, bus_size_t); +int tc_mem_subregion(void *, bus_space_handle_t, bus_size_t, + bus_size_t, bus_space_handle_t *); /* allocation/deallocation */ -int tc_mem_alloc __P((void *, bus_addr_t, bus_addr_t, bus_size_t, +int tc_mem_alloc(void *, bus_addr_t, bus_addr_t, bus_size_t, bus_size_t, bus_addr_t, int, bus_addr_t *, - bus_space_handle_t *)); -void tc_mem_free __P((void *, bus_space_handle_t, bus_size_t)); + bus_space_handle_t *); +void tc_mem_free(void *, bus_space_handle_t, bus_size_t); /* barrier */ -inline void tc_mem_barrier __P((void *, bus_space_handle_t, - bus_size_t, bus_size_t, int)); +inline void tc_mem_barrier(void *, bus_space_handle_t, + bus_size_t, bus_size_t, int); /* read (single) */ -inline u_int8_t tc_mem_read_1 __P((void *, bus_space_handle_t, bus_size_t)); -inline u_int16_t tc_mem_read_2 __P((void *, bus_space_handle_t, bus_size_t)); -inline u_int32_t tc_mem_read_4 __P((void *, bus_space_handle_t, bus_size_t)); -inline u_int64_t tc_mem_read_8 __P((void *, bus_space_handle_t, bus_size_t)); +inline u_int8_t tc_mem_read_1(void *, bus_space_handle_t, bus_size_t); +inline u_int16_t tc_mem_read_2(void *, bus_space_handle_t, bus_size_t); +inline u_int32_t tc_mem_read_4(void *, bus_space_handle_t, bus_size_t); +inline u_int64_t tc_mem_read_8(void *, bus_space_handle_t, bus_size_t); /* read multiple */ -void tc_mem_read_multi_1 __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t *, bus_size_t)); -void tc_mem_read_multi_2 __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t *, bus_size_t)); -void tc_mem_read_multi_4 __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t *, bus_size_t)); -void tc_mem_read_multi_8 __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t *, bus_size_t)); +void tc_mem_read_multi_1(void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); +void tc_mem_read_multi_2(void *, bus_space_handle_t, + bus_size_t, u_int16_t *, bus_size_t); +void tc_mem_read_multi_4(void *, bus_space_handle_t, + bus_size_t, u_int32_t *, bus_size_t); +void tc_mem_read_multi_8(void *, bus_space_handle_t, + bus_size_t, u_int64_t *, bus_size_t); /* read region */ -void tc_mem_read_region_1 __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t *, bus_size_t)); -void tc_mem_read_region_2 __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t *, bus_size_t)); -void tc_mem_read_region_4 __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t *, bus_size_t)); -void tc_mem_read_region_8 __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t *, bus_size_t)); +void tc_mem_read_region_1(void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); +void tc_mem_read_region_2(void *, bus_space_handle_t, + bus_size_t, u_int16_t *, bus_size_t); +void tc_mem_read_region_4(void *, bus_space_handle_t, + bus_size_t, u_int32_t *, bus_size_t); +void tc_mem_read_region_8(void *, bus_space_handle_t, + bus_size_t, u_int64_t *, bus_size_t); /* write (single) */ -inline void tc_mem_write_1 __P((void *, bus_space_handle_t, bus_size_t, - u_int8_t)); -inline void tc_mem_write_2 __P((void *, bus_space_handle_t, bus_size_t, - u_int16_t)); -inline void tc_mem_write_4 __P((void *, bus_space_handle_t, bus_size_t, - u_int32_t)); -inline void tc_mem_write_8 __P((void *, bus_space_handle_t, bus_size_t, - u_int64_t)); +inline void tc_mem_write_1(void *, bus_space_handle_t, bus_size_t, + u_int8_t); +inline void tc_mem_write_2(void *, bus_space_handle_t, bus_size_t, + u_int16_t); +inline void tc_mem_write_4(void *, bus_space_handle_t, bus_size_t, + u_int32_t); +inline void tc_mem_write_8(void *, bus_space_handle_t, bus_size_t, + u_int64_t); /* write multiple */ -void tc_mem_write_multi_1 __P((void *, bus_space_handle_t, - bus_size_t, const u_int8_t *, bus_size_t)); -void tc_mem_write_multi_2 __P((void *, bus_space_handle_t, - bus_size_t, const u_int16_t *, bus_size_t)); -void tc_mem_write_multi_4 __P((void *, bus_space_handle_t, - bus_size_t, const u_int32_t *, bus_size_t)); -void tc_mem_write_multi_8 __P((void *, bus_space_handle_t, - bus_size_t, const u_int64_t *, bus_size_t)); +void tc_mem_write_multi_1(void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); +void tc_mem_write_multi_2(void *, bus_space_handle_t, + bus_size_t, const u_int16_t *, bus_size_t); +void tc_mem_write_multi_4(void *, bus_space_handle_t, + bus_size_t, const u_int32_t *, bus_size_t); +void tc_mem_write_multi_8(void *, bus_space_handle_t, + bus_size_t, const u_int64_t *, bus_size_t); /* write region */ -void tc_mem_write_region_1 __P((void *, bus_space_handle_t, - bus_size_t, const u_int8_t *, bus_size_t)); -void tc_mem_write_region_2 __P((void *, bus_space_handle_t, - bus_size_t, const u_int16_t *, bus_size_t)); -void tc_mem_write_region_4 __P((void *, bus_space_handle_t, - bus_size_t, const u_int32_t *, bus_size_t)); -void tc_mem_write_region_8 __P((void *, bus_space_handle_t, - bus_size_t, const u_int64_t *, bus_size_t)); +void tc_mem_write_region_1(void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); +void tc_mem_write_region_2(void *, bus_space_handle_t, + bus_size_t, const u_int16_t *, bus_size_t); +void tc_mem_write_region_4(void *, bus_space_handle_t, + bus_size_t, const u_int32_t *, bus_size_t); +void tc_mem_write_region_8(void *, bus_space_handle_t, + bus_size_t, const u_int64_t *, bus_size_t); /* set multiple */ -void tc_mem_set_multi_1 __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t, bus_size_t)); -void tc_mem_set_multi_2 __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t, bus_size_t)); -void tc_mem_set_multi_4 __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t, bus_size_t)); -void tc_mem_set_multi_8 __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t, bus_size_t)); +void tc_mem_set_multi_1(void *, bus_space_handle_t, + bus_size_t, u_int8_t, bus_size_t); +void tc_mem_set_multi_2(void *, bus_space_handle_t, + bus_size_t, u_int16_t, bus_size_t); +void tc_mem_set_multi_4(void *, bus_space_handle_t, + bus_size_t, u_int32_t, bus_size_t); +void tc_mem_set_multi_8(void *, bus_space_handle_t, + bus_size_t, u_int64_t, bus_size_t); /* set region */ -void tc_mem_set_region_1 __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t, bus_size_t)); -void tc_mem_set_region_2 __P((void *, bus_space_handle_t, - bus_size_t, u_int16_t, bus_size_t)); -void tc_mem_set_region_4 __P((void *, bus_space_handle_t, - bus_size_t, u_int32_t, bus_size_t)); -void tc_mem_set_region_8 __P((void *, bus_space_handle_t, - bus_size_t, u_int64_t, bus_size_t)); +void tc_mem_set_region_1(void *, bus_space_handle_t, + bus_size_t, u_int8_t, bus_size_t); +void tc_mem_set_region_2(void *, bus_space_handle_t, + bus_size_t, u_int16_t, bus_size_t); +void tc_mem_set_region_4(void *, bus_space_handle_t, + bus_size_t, u_int32_t, bus_size_t); +void tc_mem_set_region_8(void *, bus_space_handle_t, + bus_size_t, u_int64_t, bus_size_t); /* copy */ -void tc_mem_copy_1 __P((void *, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t)); -void tc_mem_copy_2 __P((void *, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t)); -void tc_mem_copy_4 __P((void *, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t)); -void tc_mem_copy_8 __P((void *, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t)); +void tc_mem_copy_1(void *, bus_space_handle_t, + bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); +void tc_mem_copy_2(void *, bus_space_handle_t, + bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); +void tc_mem_copy_4(void *, bus_space_handle_t, + bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); +void tc_mem_copy_8(void *, bus_space_handle_t, + bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); /* read multiple raw */ -void tc_mem_read_raw_multi_2 __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t *, bus_size_t)); -void tc_mem_read_raw_multi_4 __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t *, bus_size_t)); -void tc_mem_read_raw_multi_8 __P((void *, bus_space_handle_t, - bus_size_t, u_int8_t *, bus_size_t)); +void tc_mem_read_raw_multi_2(void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); +void tc_mem_read_raw_multi_4(void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); +void tc_mem_read_raw_multi_8(void *, bus_space_handle_t, + bus_size_t, u_int8_t *, bus_size_t); /* write multiple raw */ -void tc_mem_write_raw_multi_2 __P((void *, bus_space_handle_t, - bus_size_t, const u_int8_t *, bus_size_t)); -void tc_mem_write_raw_multi_4 __P((void *, bus_space_handle_t, - bus_size_t, const u_int8_t *, bus_size_t)); -void tc_mem_write_raw_multi_8 __P((void *, bus_space_handle_t, - bus_size_t, const u_int8_t *, bus_size_t)); +void tc_mem_write_raw_multi_2(void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); +void tc_mem_write_raw_multi_4(void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); +void tc_mem_write_raw_multi_8(void *, bus_space_handle_t, + bus_size_t, const u_int8_t *, bus_size_t); static struct alpha_bus_space tc_mem_space = { /* cookie */ diff --git a/sys/arch/alpha/tc/tc_conf.h b/sys/arch/alpha/tc/tc_conf.h index 28f7a11c045..cb5eb0a89dd 100644 --- a/sys/arch/alpha/tc/tc_conf.h +++ b/sys/arch/alpha/tc/tc_conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tc_conf.h,v 1.4 1997/01/24 19:58:20 niklas Exp $ */ +/* $OpenBSD: tc_conf.h,v 1.5 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: tc_conf.h,v 1.3 1996/11/15 23:59:01 cgd Exp $ */ /* @@ -33,12 +33,12 @@ */ #ifdef DEC_3000_500 -extern void tc_3000_500_intr_setup __P((void)); -extern void tc_3000_500_iointr __P((void *, unsigned long)); +extern void tc_3000_500_intr_setup(void); +extern void tc_3000_500_iointr(void *, unsigned long); extern void tc_3000_500_intr_establish __P((struct device *, void *, tc_intrlevel_t, int (*)(void *), void *)); -extern void tc_3000_500_intr_disestablish __P((struct device *, void *)); +extern void tc_3000_500_intr_disestablish(struct device *, void *); extern int tc_3000_500_nslots; extern struct tc_slotdesc tc_3000_500_slots[]; @@ -49,12 +49,12 @@ extern struct tc_builtin tc_3000_500_nographics_builtins[]; #endif /* DEC_3000_500 */ #ifdef DEC_3000_300 -extern void tc_3000_300_intr_setup __P((void)); -extern void tc_3000_300_iointr __P((void *, unsigned long)); +extern void tc_3000_300_intr_setup(void); +extern void tc_3000_300_iointr(void *, unsigned long); extern void tc_3000_300_intr_establish __P((struct device *, void *, tc_intrlevel_t, int (*)(void *), void *)); -extern void tc_3000_300_intr_disestablish __P((struct device *, void *)); +extern void tc_3000_300_intr_disestablish(struct device *, void *); extern int tc_3000_300_nslots; extern struct tc_slotdesc tc_3000_300_slots[]; diff --git a/sys/arch/alpha/tc/tc_machdep.h b/sys/arch/alpha/tc/tc_machdep.h index 529d5ec2567..3c26c5c8f85 100644 --- a/sys/arch/alpha/tc/tc_machdep.h +++ b/sys/arch/alpha/tc/tc_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tc_machdep.h,v 1.4 1996/12/08 00:20:59 niklas Exp $ */ +/* $OpenBSD: tc_machdep.h,v 1.5 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: tc_machdep.h,v 1.3 1996/10/22 21:34:22 cgd Exp $ */ /* @@ -92,4 +92,4 @@ typedef int32_t tc_offset_t; #define TC_PHYS_TO_UNCACHED(addr) \ (addr) -bus_space_tag_t tc_bus_mem_init __P((void *memv));; +bus_space_tag_t tc_bus_mem_init(void *memv);; diff --git a/sys/arch/alpha/tc/tcasic.c b/sys/arch/alpha/tc/tcasic.c index 90106977613..fe63afca03f 100644 --- a/sys/arch/alpha/tc/tcasic.c +++ b/sys/arch/alpha/tc/tcasic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcasic.c,v 1.8 2000/11/08 16:01:26 art Exp $ */ +/* $OpenBSD: tcasic.c,v 1.9 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: tcasic.c,v 1.14 1996/12/05 01:39:45 cgd Exp $ */ /* @@ -54,7 +54,7 @@ struct cfdriver tcasic_cd = { NULL, "tcasic", DV_DULL, }; -int tcasicprint __P((void *, const char *)); +int tcasicprint(void *, const char *); extern int cputype; @@ -94,8 +94,8 @@ tcasicattach(parent, self, aux) void *aux; { struct tcbus_attach_args tba; - void (*intr_setup) __P((void)); - void (*iointr) __P((void *, unsigned long)); + void (*intr_setup)(void); + void (*iointr)(void *, unsigned long); printf("\n"); tcasicfound = 1; diff --git a/sys/arch/alpha/tc/tcds.c b/sys/arch/alpha/tc/tcds.c index 015d82da5c7..1f3f2f815cd 100644 --- a/sys/arch/alpha/tc/tcds.c +++ b/sys/arch/alpha/tc/tcds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcds.c,v 1.8 1999/01/11 05:11:05 millert Exp $ */ +/* $OpenBSD: tcds.c,v 1.9 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: tcds.c,v 1.16 1996/12/05 01:39:45 cgd Exp $ */ /* @@ -57,12 +57,12 @@ struct tcds_softc { /* Definition of the driver for autoconfig. */ #ifdef __BROKEN_INDIRECT_CONFIG -int tcdsmatch __P((struct device *, void *, void *)); +int tcdsmatch(struct device *, void *, void *); #else -int tcdsmatch __P((struct device *, struct cfdata *, void *)); +int tcdsmatch(struct device *, struct cfdata *, void *); #endif -void tcdsattach __P((struct device *, struct device *, void *)); -int tcdsprint __P((void *, const char *)); +void tcdsattach(struct device *, struct device *, void *); +int tcdsprint(void *, const char *); struct cfattach tcds_ca = { sizeof(struct tcds_softc), tcdsmatch, tcdsattach, @@ -72,8 +72,8 @@ struct cfdriver tcds_cd = { NULL, "tcds", DV_DULL, }; -/*static*/ int tcds_intr __P((void *)); -/*static*/ int tcds_intrnull __P((void *)); +/*static*/ int tcds_intr(void *); +/*static*/ int tcds_intrnull(void *); int tcdsmatch(parent, cfdata, aux) @@ -227,7 +227,7 @@ tcds_intr_establish(tcds, cookie, level, func, arg) struct device *tcds; void *cookie, *arg; tc_intrlevel_t level; - int (*func) __P((void *)); + int (*func)(void *); { struct tcds_softc *sc = (struct tcds_softc *)tcds; u_long slot; diff --git a/sys/arch/alpha/tc/tcdsreg.h b/sys/arch/alpha/tc/tcdsreg.h index c8839b8cf7c..02cfdba2102 100644 --- a/sys/arch/alpha/tc/tcdsreg.h +++ b/sys/arch/alpha/tc/tcdsreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tcdsreg.h,v 1.3 1996/10/30 22:41:29 niklas Exp $ */ +/* $OpenBSD: tcdsreg.h,v 1.4 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: tcdsreg.h,v 1.2 1996/07/09 00:55:42 cgd Exp $ */ /* @@ -121,14 +121,14 @@ #define TCDS_DUD_BYTE11 0xff000000 /* byte 11 mask */ #if 0 -int tcds_scsi_iserr __P((struct dma_softc *)); -int tcds_scsi_isintr __P((int, int)); -void tcds_dma_disable __P((int)); -void tcds_dma_enable __P((int)); -void tcds_dma_init __P((struct dma_softc *, int)); -void tcds_scsi_disable __P((int)); -void tcds_scsi_enable __P((int)); -void tcds_scsi_reset __P((int)); +int tcds_scsi_iserr(struct dma_softc *); +int tcds_scsi_isintr(int, int); +void tcds_dma_disable(int); +void tcds_dma_enable(int); +void tcds_dma_init(struct dma_softc *, int); +void tcds_scsi_disable(int); +void tcds_scsi_enable(int); +void tcds_scsi_reset(int); /* * XXX diff --git a/sys/arch/alpha/tc/tcdsvar.h b/sys/arch/alpha/tc/tcdsvar.h index 13d2b9c8378..e22a50099ea 100644 --- a/sys/arch/alpha/tc/tcdsvar.h +++ b/sys/arch/alpha/tc/tcdsvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tcdsvar.h,v 1.5 1997/01/24 19:58:24 niklas Exp $ */ +/* $OpenBSD: tcdsvar.h,v 1.6 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: tcdsvar.h,v 1.5 1996/11/13 21:13:38 cgd Exp $ */ /* @@ -35,7 +35,7 @@ struct tcds_slotconfig { int sc_slot; struct tcds_softc *sc_tcds; /* to frob TCDS regs */ struct esp_softc *sc_esp; /* to frob child's regs */ - int (*sc_intrhand) __P((void *)); /* intr. handler */ + int (*sc_intrhand)(void *); /* intr. handler */ void *sc_intrarg; /* intr. handler arg. */ /* @@ -86,24 +86,24 @@ struct tcdsdev_attach_args { */ void tcds_intr_establish __P((struct device *, void *, tc_intrlevel_t, int (*)(void *), void *)); -void tcds_intr_disestablish __P((struct device *, void *)); -void tcds_dma_enable __P((struct tcds_slotconfig *, int)); -void tcds_scsi_enable __P((struct tcds_slotconfig *, int)); -int tcds_scsi_iserr __P((struct tcds_slotconfig *)); -int tcds_scsi_isintr __P((struct tcds_slotconfig *, int)); -void tcds_scsi_reset __P((struct tcds_slotconfig *)); -int tcds_scsi_iserr __P((struct tcds_slotconfig *)); +void tcds_intr_disestablish(struct device *, void *); +void tcds_dma_enable(struct tcds_slotconfig *, int); +void tcds_scsi_enable(struct tcds_slotconfig *, int); +int tcds_scsi_iserr(struct tcds_slotconfig *); +int tcds_scsi_isintr(struct tcds_slotconfig *, int); +void tcds_scsi_reset(struct tcds_slotconfig *); +int tcds_scsi_iserr(struct tcds_slotconfig *); /* * TCDS DMA functions (used the the 53c94 driver) */ -int tcds_dma_isintr __P((struct tcds_slotconfig *)); -void tcds_dma_reset __P((struct tcds_slotconfig *)); -int tcds_dma_intr __P((struct tcds_slotconfig *)); -int tcds_dma_setup __P((struct tcds_slotconfig *, caddr_t *, size_t *, - int, size_t *)); -void tcds_dma_go __P((struct tcds_slotconfig *)); -int tcds_dma_isactive __P((struct tcds_slotconfig *)); +int tcds_dma_isintr(struct tcds_slotconfig *); +void tcds_dma_reset(struct tcds_slotconfig *); +int tcds_dma_intr(struct tcds_slotconfig *); +int tcds_dma_setup(struct tcds_slotconfig *, caddr_t *, size_t *, + int, size_t *); +void tcds_dma_go(struct tcds_slotconfig *); +int tcds_dma_isactive(struct tcds_slotconfig *); /* * The TCDS (bus) cfdriver, so that subdevices can more diff --git a/sys/arch/amiga/amiga/amiga_init.c b/sys/arch/amiga/amiga/amiga_init.c index 6e261e9aaf9..8253bb6c75d 100644 --- a/sys/arch/amiga/amiga/amiga_init.c +++ b/sys/arch/amiga/amiga/amiga_init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amiga_init.c,v 1.25 2002/02/23 00:31:09 miod Exp $ */ +/* $OpenBSD: amiga_init.c,v 1.26 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: amiga_init.c,v 1.56 1997/06/10 18:22:24 veego Exp $ */ /* @@ -108,15 +108,15 @@ static u_long boot_flags; u_long scsi_nosync; int shift_nosync; -void start_c __P((int, u_int, u_int, u_int, char *, u_int, u_long)); -void rollcolor __P((int)); -static int kernel_image_magic_size __P((void)); -static void kernel_image_magic_copy __P((u_char *)); -int kernel_reload_write __P((struct uio *)); -extern void kernel_reload __P((char *, u_long, u_long, u_long, u_long, - u_long, u_long, u_long, u_long, u_long)); -extern void etext __P((void)); -void start_c_cleanup __P((void)); +void start_c(int, u_int, u_int, u_int, char *, u_int, u_long); +void rollcolor(int); +static int kernel_image_magic_size(void); +static void kernel_image_magic_copy(u_char *); +int kernel_reload_write(struct uio *); +extern void kernel_reload(char *, u_long, u_long, u_long, u_long, + u_long, u_long, u_long, u_long, u_long); +extern void etext(void); +void start_c_cleanup(void); void * chipmem_steal(amount) diff --git a/sys/arch/amiga/amiga/autoconf.c b/sys/arch/amiga/amiga/autoconf.c index 2a39b81fb8f..b578b61c1f6 100644 --- a/sys/arch/amiga/amiga/autoconf.c +++ b/sys/arch/amiga/amiga/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.14 2001/05/05 22:33:28 art Exp $ */ +/* $OpenBSD: autoconf.c,v 1.15 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: autoconf.c,v 1.59 1998/01/15 21:55:51 is Exp $ */ /* @@ -41,11 +41,11 @@ #include <amiga/amiga/device.h> #include <amiga/amiga/custom.h> -void setroot __P((void)); -void swapconf __P((void)); -void mbattach __P((struct device *, struct device *, void *)); -int mbprint __P((void *, const char *)); -int mbmatch __P((struct device *, void *, void *)); +void setroot(void); +void swapconf(void); +void mbattach(struct device *, struct device *, void *); +int mbprint(void *, const char *); +int mbmatch(struct device *, void *, void *); int cold; /* 1 if still booting */ #include <sys/kernel.h> diff --git a/sys/arch/amiga/amiga/cc.c b/sys/arch/amiga/amiga/cc.c index 77b11e26bb6..4f9891d7f83 100644 --- a/sys/arch/amiga/amiga/cc.c +++ b/sys/arch/amiga/amiga/cc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cc.c,v 1.7 1998/03/01 16:06:00 niklas Exp $ */ +/* $OpenBSD: cc.c,v 1.8 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: cc.c,v 1.11 1997/06/23 23:46:23 is Exp $ */ /* @@ -45,7 +45,7 @@ #define INLINE #endif -void defchannel_handler __P((int)); +void defchannel_handler(int); /* init all the "custom chips" */ void diff --git a/sys/arch/amiga/amiga/cc.h b/sys/arch/amiga/amiga/cc.h index 98a77c8f7ed..1cf84a5c244 100644 --- a/sys/arch/amiga/amiga/cc.h +++ b/sys/arch/amiga/amiga/cc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cc.h,v 1.5 1997/09/18 13:39:33 niklas Exp $ */ +/* $OpenBSD: cc.h,v 1.6 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: cc.h,v 1.9 1997/06/23 23:46:24 is Exp $ */ /* @@ -47,7 +47,7 @@ /* * Audio stuff */ -typedef void (*handler_func_t) __P((int)); +typedef void (*handler_func_t)(int); struct audio_channel { u_short play_count; @@ -175,43 +175,43 @@ vm_offset_t chipmem_end; /* * Prototypes. */ -void custom_chips_init __P((void)); +void custom_chips_init(void); /* vertical blank server chain */ -void cc_init_vbl __P((void)); -void add_vbl_function __P((struct vbl_node *, short, void *)); -void remove_vbl_function __P((struct vbl_node *)); -void turn_vbl_function_off __P((struct vbl_node *)); -void turn_vbl_function_on __P((struct vbl_node *)); +void cc_init_vbl(void); +void add_vbl_function(struct vbl_node *, short, void *); +void remove_vbl_function(struct vbl_node *); +void turn_vbl_function_off(struct vbl_node *); +void turn_vbl_function_on(struct vbl_node *); /* blitter */ -void cc_init_blitter __P((void)); -int is_blitter_busy __P((void)); -void wait_blit __P((void)); -void blitter_handler __P((void)); -void do_blit __P((u_short)); -void set_blitter_control __P((u_short, u_short)); -void set_blitter_mods __P((u_short, u_short, u_short, u_short)); -void set_blitter_masks __P((u_short, u_short)); -void set_blitter_data __P((u_short, u_short, u_short)); -void set_blitter_pointers __P((void *, void *, void *, void *)); +void cc_init_blitter(void); +int is_blitter_busy(void); +void wait_blit(void); +void blitter_handler(void); +void do_blit(u_short); +void set_blitter_control(u_short, u_short); +void set_blitter_mods(u_short, u_short, u_short, u_short); +void set_blitter_masks(u_short, u_short); +void set_blitter_data(u_short, u_short, u_short); +void set_blitter_pointers(void *, void *, void *, void *); /* copper */ -void install_copper_list __P((cop_t *)); -cop_t *find_copper_inst __P((cop_t *, u_short)); -void cc_init_copper __P((void)); -void copper_handler __P((void)); +void install_copper_list(cop_t *); +cop_t *find_copper_inst(cop_t *, u_short); +void cc_init_copper(void); +void copper_handler(void); /* audio */ -void cc_init_audio __P((void)); -void play_sample __P((u_short, u_short *, u_short, u_short, u_short, u_long)); -void audio_handler __P((void)); +void cc_init_audio(void); +void play_sample(u_short, u_short *, u_short, u_short, u_short, u_long); +void audio_handler(void); /* chipmem */ -void cc_init_chipmem __P((void)); -void * alloc_chipmem __P((u_long)); -void free_chipmem __P((void *)); -u_long avail_chipmem __P((int)); -u_long sizeof_chipmem __P((void *)); - -void wait_tof __P((void)); -void vbl_handler __P((void)); -void *chipmem_steal __P((long)); +void cc_init_chipmem(void); +void * alloc_chipmem(u_long); +void free_chipmem(void *); +u_long avail_chipmem(int); +u_long sizeof_chipmem(void *); + +void wait_tof(void); +void vbl_handler(void); +void *chipmem_steal(long); #endif /* _CC_H */ diff --git a/sys/arch/amiga/amiga/cia.c b/sys/arch/amiga/amiga/cia.c index ed9242fae92..60cd05c0c03 100644 --- a/sys/arch/amiga/amiga/cia.c +++ b/sys/arch/amiga/amiga/cia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cia.c,v 1.2 1996/06/04 12:49:12 niklas Exp $ */ +/* $OpenBSD: cia.c,v 1.3 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: cia.c,v 1.6 1995/02/12 19:34:17 chopps Exp $ */ /* @@ -52,12 +52,12 @@ struct cia_intr_dispatch { u_char mask; - void (*handler) __P ((int)); + void (*handler)(int); }; -static void not_used __P((int)); -void kbdintr __P((int)); -void parintr __P((int)); +static void not_used(int); +void kbdintr(int); +void parintr(int); /* handlers for CIA-A (IPL-2) */ static struct cia_intr_dispatch ciaa_ints[] = { diff --git a/sys/arch/amiga/amiga/cia.h b/sys/arch/amiga/amiga/cia.h index 5873f08e170..695c0bcd86c 100644 --- a/sys/arch/amiga/amiga/cia.h +++ b/sys/arch/amiga/amiga/cia.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cia.h,v 1.4 2001/08/12 12:03:02 heko Exp $ */ +/* $OpenBSD: cia.h,v 1.5 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: cia.h,v 1.9 1996/02/01 22:29:06 mycroft Exp $ */ /* @@ -139,8 +139,8 @@ vm_offset_t CIAAbase, CIABbase, CIAADDR; #define CLRDSR(c) (c |= CIAB_PRA_DSR) #define ISDSR(c) (!(c & CIAB_PRA_DSR)) -void dispatch_cia_ints __P((int, int)); -void ciaa_intr __P((void)); -void ciab_intr __P((void)); +void dispatch_cia_ints(int, int); +void ciaa_intr(void); +void ciab_intr(void); #endif /* _AMIGA_CIA_ */ diff --git a/sys/arch/amiga/amiga/color.h b/sys/arch/amiga/amiga/color.h index cf948e60d57..2c979009f79 100644 --- a/sys/arch/amiga/amiga/color.h +++ b/sys/arch/amiga/amiga/color.h @@ -1,4 +1,4 @@ -/* $OpenBSD: color.h,v 1.2 1996/06/04 12:49:13 niklas Exp $ */ +/* $OpenBSD: color.h,v 1.3 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: color.h,v 1.8 1995/02/12 19:34:17 chopps Exp $ */ /* @@ -57,5 +57,5 @@ #define COL24_LGREY 0x0880 #define COL24_WHITE 0xffff -void rollcolor __P((int)); +void rollcolor(int); #endif diff --git a/sys/arch/amiga/amiga/conf.c b/sys/arch/amiga/amiga/conf.c index aa3a0f99c4d..b22c4875688 100644 --- a/sys/arch/amiga/amiga/conf.c +++ b/sys/arch/amiga/amiga/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.33 2001/12/11 23:19:02 miod Exp $ */ +/* $OpenBSD: conf.c,v 1.34 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: conf.c,v 1.42 1997/01/07 11:35:03 mrg Exp $ */ /*- @@ -182,9 +182,9 @@ struct cdevsw cdevsw[] = int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); #ifdef BANKEDDEVPAGER -extern int grfbanked_get __P((int, int, int)); -extern int grfbanked_set __P((int, int)); -extern int grfbanked_cur __P((int)); +extern int grfbanked_get(int, int, int); +extern int grfbanked_set(int, int); +extern int grfbanked_cur(int); struct bankeddevsw bankeddevsw[sizeof (cdevsw) / sizeof (cdevsw[0])] = { { 0, 0, 0 }, /* 0 */ diff --git a/sys/arch/amiga/amiga/db_memrw.c b/sys/arch/amiga/amiga/db_memrw.c index c2e0fe85db7..4ad98bccf7e 100644 --- a/sys/arch/amiga/amiga/db_memrw.c +++ b/sys/arch/amiga/amiga/db_memrw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_memrw.c,v 1.7 2001/11/06 19:53:13 miod Exp $ */ +/* $OpenBSD: db_memrw.c,v 1.8 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: db_memrw.c,v 1.7 1997/06/10 18:24:34 veego Exp $ */ /*- @@ -57,9 +57,9 @@ #include <machine/cpu.h> #include <machine/pte.h> -char db_read_data __P((char *src)); -void db_write_text __P((char *dst, int ch)); -void db_write_data __P((char *dst, int ch)); +char db_read_data(char *src); +void db_write_text(char *dst, int ch); +void db_write_data(char *dst, int ch); /* * Read one byte somewhere in the kernel. diff --git a/sys/arch/amiga/amiga/device.h b/sys/arch/amiga/amiga/device.h index 31ea76c81e9..1f09d274ac2 100644 --- a/sys/arch/amiga/amiga/device.h +++ b/sys/arch/amiga/amiga/device.h @@ -1,4 +1,4 @@ -/* $OpenBSD: device.h,v 1.4 1997/01/16 09:23:17 niklas Exp $ */ +/* $OpenBSD: device.h,v 1.5 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: device.h,v 1.6 1996/08/27 21:54:26 cgd Exp $ */ /* @@ -38,11 +38,11 @@ * *and know it* (i.e. everything is really tight certain params won't be * passed in some cases and the devices will deal with it) */ -void config_console __P((void)); -int amiga_config_found __P((struct cfdata *, struct device *, - void *, cfprint_t )); -int simple_devprint __P((void *, const char *)); -int matchname __P((char *, char *)); +void config_console(void); +int amiga_config_found(struct cfdata *, struct device *, + void *, cfprint_t ); +int simple_devprint(void *, const char *); +int matchname(char *, char *); /* * false when initing for the console. */ diff --git a/sys/arch/amiga/amiga/disksubr.c b/sys/arch/amiga/amiga/disksubr.c index a1c5ec5b8be..218a7a8fbf9 100644 --- a/sys/arch/amiga/amiga/disksubr.c +++ b/sys/arch/amiga/amiga/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.20 2000/10/18 21:00:33 mickey Exp $ */ +/* $OpenBSD: disksubr.c,v 1.21 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: disksubr.c,v 1.27 1996/10/13 03:06:34 christos Exp $ */ /* @@ -69,8 +69,8 @@ struct rdbmap { #define b_cylin b_resid #define baddr(bp) (void *)((bp)->b_un.b_addr) -u_long rdbchksum __P((void *)); -struct adostype getadostype __P((u_long)); +u_long rdbchksum(void *); +struct adostype getadostype(u_long); struct rdbmap *getrdbmap __P((dev_t, void (*)(struct buf *), struct disklabel *, struct cpu_disklabel *)); diff --git a/sys/arch/amiga/amiga/dkbad.c b/sys/arch/amiga/amiga/dkbad.c index 41df81b57c8..68efb04021c 100644 --- a/sys/arch/amiga/amiga/dkbad.c +++ b/sys/arch/amiga/amiga/dkbad.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dkbad.c,v 1.3 1999/07/20 03:23:05 csapuntz Exp $ */ +/* $OpenBSD: dkbad.c,v 1.4 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: dkbad.c,v 1.7 1996/04/21 21:07:00 veego Exp $ */ /* @@ -41,7 +41,7 @@ #include <sys/buf.h> #include <sys/dkbad.h> -int isbad __P((struct dkbad *, int, int, int)); +int isbad(struct dkbad *, int, int, int); /* * Search the bad sector table looking for diff --git a/sys/arch/amiga/amiga/isr.h b/sys/arch/amiga/amiga/isr.h index b6369d54bc2..563b6dab336 100644 --- a/sys/arch/amiga/amiga/isr.h +++ b/sys/arch/amiga/amiga/isr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isr.h,v 1.3 1996/05/02 06:43:18 niklas Exp $ */ +/* $OpenBSD: isr.h,v 1.4 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: isr.h,v 1.8 1996/04/21 21:07:02 veego Exp $ */ /* @@ -39,7 +39,7 @@ struct isr { struct isr *isr_forw; struct isr *isr_back; - int (*isr_intr) __P((void *)); + int (*isr_intr)(void *); void *isr_arg; int isr_ipl; #if defined(IPL_REMAP_1) || defined(IPL_REMAP_2) @@ -55,12 +55,12 @@ struct isr { #define ISRIPL(x) ((x) - 3) #ifdef _KERNEL -void add_isr __P((struct isr *)); -void remove_isr __P((struct isr *)); -typedef void (*sifunc_t) __P((void *, void *)); -void alloc_sicallback __P((void)); -void add_sicallback __P((sifunc_t, void *, void *)); -void rem_sicallback __P((sifunc_t)); +void add_isr(struct isr *); +void remove_isr(struct isr *); +typedef void (*sifunc_t)(void *, void *); +void alloc_sicallback(void); +void add_sicallback(sifunc_t, void *, void *); +void rem_sicallback(sifunc_t); #endif #ifdef IPL_REMAP2 diff --git a/sys/arch/amiga/amiga/machdep.c b/sys/arch/amiga/amiga/machdep.c index b681c26e67d..3f26e871dbc 100644 --- a/sys/arch/amiga/amiga/machdep.c +++ b/sys/arch/amiga/amiga/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.66 2002/02/04 23:54:33 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.67 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: machdep.c,v 1.95 1997/08/27 18:31:17 is Exp $ */ /* @@ -107,20 +107,20 @@ #include <net/if.h> /* prototypes */ -void identifycpu __P((void)); -vm_offset_t reserve_dumppages __P((vm_offset_t)); -void dumpsys __P((void)); -void initcpu __P((void)); -void straytrap __P((int, u_short)); -void netintr __P((void)); -void call_sicallbacks __P((void)); -void _softintr_callit __P((void *, void *)); -void intrhand __P((int)); +void identifycpu(void); +vm_offset_t reserve_dumppages(vm_offset_t); +void dumpsys(void); +void initcpu(void); +void straytrap(int, u_short); +void netintr(void); +void call_sicallbacks(void); +void _softintr_callit(void *, void *); +void intrhand(int); #if NSER > 0 -void ser_outintr __P((void)); +void ser_outintr(void); #endif #if NFD > 0 -void fdintr __P((int)); +void fdintr(int); #endif /* @@ -851,7 +851,7 @@ dumpsys() unsigned bytes, i, n, seg; int maddr, psize; daddr_t blkno; - int (*dump) __P((dev_t, daddr_t, caddr_t, size_t)); + int (*dump)(dev_t, daddr_t, caddr_t, size_t); int error = 0; kcore_seg_t *kseg_p; cpu_kcore_hdr_t *chdr_p; @@ -992,7 +992,7 @@ microtime(tvp) void initcpu() { - typedef void trapfun __P((void)); + typedef void trapfun(void); /* XXX should init '40 vecs here, too */ #if defined(M68060) || defined(M68040) || defined(DRACO) || defined(FPU_EMULATE) @@ -1235,7 +1235,7 @@ netintr() struct si_callback { struct si_callback *next; - void (*function) __P((void *rock1, void *rock2)); + void (*function)(void *rock1, void *rock2); void *rock1, *rock2; }; static struct si_callback *si_callbacks; @@ -1265,7 +1265,7 @@ _softintr_callit(rock1, rock2) void * softintr_establish(ipl, func, arg) int ipl; - void func __P((void *)); + void func(void *); void *arg; { struct si_callback *si; @@ -1314,7 +1314,7 @@ softintr_schedule(vsi) void add_sicallback (function, rock1, rock2) - void (*function) __P((void *rock1, void *rock2)); + void (*function)(void *rock1, void *rock2); void *rock1, *rock2; { struct si_callback *si; @@ -1365,7 +1365,7 @@ add_sicallback (function, rock1, rock2) void rem_sicallback(function) - void (*function) __P((void *rock1, void *rock2)); + void (*function)(void *rock1, void *rock2); { struct si_callback *si, *psi, *nsi; int s; @@ -1398,7 +1398,7 @@ call_sicallbacks() struct si_callback *si; int s; void *rock1, *rock2; - void (*function) __P((void *, void *)); + void (*function)(void *, void *); do { s = splhigh (); @@ -1719,7 +1719,7 @@ intrhand(sr) int panicbutton = 1; /* non-zero if panic buttons are enabled */ int crashandburn = 0; int candbdelay = 50; /* give em half a second */ -void candbtimer __P((void)); +void candbtimer(void); void candbtimer() @@ -1790,8 +1790,7 @@ cpu_exec_aout_makecmds(p, epp) #endif #ifdef COMPAT_SUNOS { - extern int sunos_exec_aout_makecmds - __P((struct proc *, struct exec_package *)); + extern int sunos_exec_aout_makecmds(struct proc *, struct exec_package *); if ((error = sunos_exec_aout_makecmds(p, epp)) == 0) return(0); } diff --git a/sys/arch/amiga/amiga/mem.c b/sys/arch/amiga/amiga/mem.c index b3b398b4549..152d6ce4452 100644 --- a/sys/arch/amiga/amiga/mem.c +++ b/sys/arch/amiga/amiga/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.17 2001/12/08 02:24:06 art Exp $ */ +/* $OpenBSD: mem.c,v 1.18 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: mem.c,v 1.18 1997/02/02 07:17:14 thorpej Exp $ */ /* @@ -61,11 +61,11 @@ extern int kernel_reload_write(struct uio *uio); extern u_int lowram; caddr_t devzeropage; -int mmopen __P((dev_t, int, int, struct proc *)); -int mmclose __P((dev_t, int, int, struct proc *)); -int mmrw __P((dev_t, struct uio *, int)); -paddr_t mmmmap __P((dev_t, off_t, int)); -int mmioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); +int mmopen(dev_t, int, int, struct proc *); +int mmclose(dev_t, int, int, struct proc *); +int mmrw(dev_t, struct uio *, int); +paddr_t mmmmap(dev_t, off_t, int); +int mmioctl(dev_t, u_long, caddr_t, int, struct proc *); /*ARGSUSED*/ int diff --git a/sys/arch/amiga/amiga/pmap_bootstrap.c b/sys/arch/amiga/amiga/pmap_bootstrap.c index da0a76f3dfd..c976bd95f61 100644 --- a/sys/arch/amiga/amiga/pmap_bootstrap.c +++ b/sys/arch/amiga/amiga/pmap_bootstrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_bootstrap.c,v 1.4 2002/02/23 00:31:10 miod Exp $ */ +/* $OpenBSD: pmap_bootstrap.c,v 1.5 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: pmap.c,v 1.68 1999/06/19 19:44:09 is Exp $ */ /*- @@ -104,7 +104,7 @@ extern st_entry_t *Sysseg; extern int protostfree; #endif -extern vaddr_t reserve_dumppages __P((vaddr_t)); +extern vaddr_t reserve_dumppages(vaddr_t); /* * Bootstrap the system enough to run with virtual memory. diff --git a/sys/arch/amiga/amiga/swapgeneric.c b/sys/arch/amiga/amiga/swapgeneric.c index 5fca640b54f..6a49c7fbae6 100644 --- a/sys/arch/amiga/amiga/swapgeneric.c +++ b/sys/arch/amiga/amiga/swapgeneric.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapgeneric.c,v 1.13 2001/09/29 18:40:29 miod Exp $ */ +/* $OpenBSD: swapgeneric.c,v 1.14 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: swapgeneric.c,v 1.27 1997/01/26 22:58:32 rat Exp $ */ /* @@ -54,9 +54,9 @@ #include "wd.h" #include "cd.h" -int (*mountroot) __P((void)) = dk_mountroot; +int (*mountroot)(void) = dk_mountroot; -void gets __P((char *)); +void gets(char *); /* * Generic configuration; all in one @@ -110,7 +110,7 @@ struct genericconf genericconf[] = { { 0 }, }; -struct genericconf * getgenconf __P((char *)); +struct genericconf * getgenconf(char *); struct genericconf * getgenconf(bp) diff --git a/sys/arch/amiga/amiga/trap.c b/sys/arch/amiga/amiga/trap.c index ad1054eea11..d45137738f3 100644 --- a/sys/arch/amiga/amiga/trap.c +++ b/sys/arch/amiga/amiga/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.30 2001/12/22 21:25:59 miod Exp $ */ +/* $OpenBSD: trap.c,v 1.31 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: trap.c,v 1.56 1997/07/16 00:01:47 is Exp $ */ /* @@ -178,20 +178,20 @@ extern struct pcb *curpcb; extern char fubail[], subail[]; /* XXX until we get it from m68k/cpu.h */ -extern void regdump __P((struct trapframe *, int)); - -int _write_back __P((u_int, u_int, u_int, u_int, struct vm_map *)); -void panictrap __P((int, u_int, u_int, struct frame *)); -void trapcpfault __P((struct proc *, struct frame *)); -void trapmmufault __P((int, u_int, u_int, struct frame *, struct proc *, - u_quad_t)); -void trap __P((int, u_int, u_int, struct frame)); +extern void regdump(struct trapframe *, int); + +int _write_back(u_int, u_int, u_int, u_int, struct vm_map *); +void panictrap(int, u_int, u_int, struct frame *); +void trapcpfault(struct proc *, struct frame *); +void trapmmufault(int, u_int, u_int, struct frame *, struct proc *, + u_quad_t); +void trap(int, u_int, u_int, struct frame); #ifdef DDB #include <m68k/db_machdep.h> -int db_trap __P((int, db_regs_t *)); +int db_trap(int, db_regs_t *); #endif -void syscall __P((register_t, struct frame)); -void _wb_fault __P((void)); +void syscall(register_t, struct frame); +void _wb_fault(void); /*ARGSUSED*/ void diff --git a/sys/arch/amiga/dev/a2kbbc.c b/sys/arch/amiga/dev/a2kbbc.c index a8968db91b5..626a1efa78e 100644 --- a/sys/arch/amiga/dev/a2kbbc.c +++ b/sys/arch/amiga/dev/a2kbbc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: a2kbbc.c,v 1.2 2000/01/24 16:02:04 espie Exp $ */ +/* $OpenBSD: a2kbbc.c,v 1.3 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: a2kbbc.c,v 1.3 1997/07/23 10:19:44 is Exp $ */ /* @@ -57,8 +57,8 @@ #include <dev/clock_subr.h> -int a2kbbc_match __P((struct device *, void *, void *)); -void a2kbbc_attach __P((struct device *, struct device *, void *)); +int a2kbbc_match(struct device *, void *, void *); +void a2kbbc_attach(struct device *, struct device *, void *); struct cfattach a2kbbc_ca = { sizeof(struct device), a2kbbc_match, a2kbbc_attach @@ -69,8 +69,8 @@ struct cfdriver a2kbbc_cd = { }; void *a2kclockaddr; -time_t a2gettod __P((void)); -int a2settod __P((time_t)); +time_t a2gettod(void); +int a2settod(time_t); int a2kbbc_match(pdp, match, auxp) diff --git a/sys/arch/amiga/dev/a34kbbc.c b/sys/arch/amiga/dev/a34kbbc.c index 80e6f392346..ade9574e2cf 100644 --- a/sys/arch/amiga/dev/a34kbbc.c +++ b/sys/arch/amiga/dev/a34kbbc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: a34kbbc.c,v 1.2 2000/01/24 16:02:04 espie Exp $ */ +/* $OpenBSD: a34kbbc.c,v 1.3 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: a34kbbc.c,v 1.1 1997/07/19 00:01:42 is Exp $ */ /* @@ -57,8 +57,8 @@ #include <dev/clock_subr.h> -int a34kbbc_match __P((struct device *, void *, void *)); -void a34kbbc_attach __P((struct device *, struct device *, void *)); +int a34kbbc_match(struct device *, void *, void *); +void a34kbbc_attach(struct device *, struct device *, void *); struct cfattach a34kbbc_ca = { sizeof(struct device), a34kbbc_match, a34kbbc_attach @@ -70,8 +70,8 @@ struct cfdriver a34kbbc_cd = { void *a34kclockaddr; -time_t a3gettod __P((void)); -int a3settod __P((time_t)); +time_t a3gettod(void); +int a3settod(time_t); int a34kbbc_match(pdp, match, auxp) diff --git a/sys/arch/amiga/dev/afsc.c b/sys/arch/amiga/dev/afsc.c index 8af0223c471..981686f0749 100644 --- a/sys/arch/amiga/dev/afsc.c +++ b/sys/arch/amiga/dev/afsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: afsc.c,v 1.8 1997/01/18 12:26:21 niklas Exp $ */ +/* $OpenBSD: afsc.c,v 1.9 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: afsc.c,v 1.20 1996/12/23 09:09:49 veego Exp $ */ /* @@ -52,11 +52,11 @@ #include <amiga/dev/siopvar.h> #include <amiga/dev/zbusvar.h> -void afscattach __P((struct device *, struct device *, void *)); -int afscmatch __P((struct device *, void *, void *)); -int afsc_dmaintr __P((void *)); +void afscattach(struct device *, struct device *, void *); +int afscmatch(struct device *, void *, void *); +int afsc_dmaintr(void *); #ifdef DEBUG -void afsc_dump __P((void)); +void afsc_dump(void); #endif struct scsi_adapter afsc_scsiswitch = { diff --git a/sys/arch/amiga/dev/ahsc.c b/sys/arch/amiga/dev/ahsc.c index 3b06d8c8212..021e7400352 100644 --- a/sys/arch/amiga/dev/ahsc.c +++ b/sys/arch/amiga/dev/ahsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahsc.c,v 1.6 1997/01/18 12:26:22 niklas Exp $ */ +/* $OpenBSD: ahsc.c,v 1.7 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: ahsc.c,v 1.18 1996/12/23 09:09:51 veego Exp $ */ /* @@ -52,17 +52,17 @@ #include <amiga/dev/ahscreg.h> #include <amiga/dev/zbusvar.h> -void ahscattach __P((struct device *, struct device *, void *)); -int ahscmatch __P((struct device *, void *, void *)); +void ahscattach(struct device *, struct device *, void *); +int ahscmatch(struct device *, void *, void *); -void ahsc_enintr __P((struct sbic_softc *)); -void ahsc_dmastop __P((struct sbic_softc *)); -int ahsc_dmanext __P((struct sbic_softc *)); -int ahsc_dmaintr __P((void *)); -int ahsc_dmago __P((struct sbic_softc *, char *, int, int)); +void ahsc_enintr(struct sbic_softc *); +void ahsc_dmastop(struct sbic_softc *); +int ahsc_dmanext(struct sbic_softc *); +int ahsc_dmaintr(void *); +int ahsc_dmago(struct sbic_softc *, char *, int, int); #ifdef DEBUG -void ahsc_dump __P((void)); +void ahsc_dump(void); #endif struct scsi_adapter ahsc_scsiswitch = { diff --git a/sys/arch/amiga/dev/atzsc.c b/sys/arch/amiga/dev/atzsc.c index 82f1cb6ffcc..5a5760713ca 100644 --- a/sys/arch/amiga/dev/atzsc.c +++ b/sys/arch/amiga/dev/atzsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atzsc.c,v 1.6 1997/01/18 12:26:23 niklas Exp $ */ +/* $OpenBSD: atzsc.c,v 1.7 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: atzsc.c,v 1.22 1996/12/23 09:09:52 veego Exp $ */ /* @@ -52,17 +52,17 @@ #include <amiga/dev/atzscreg.h> #include <amiga/dev/zbusvar.h> -void atzscattach __P((struct device *, struct device *, void *)); -int atzscmatch __P((struct device *, void *, void *)); +void atzscattach(struct device *, struct device *, void *); +int atzscmatch(struct device *, void *, void *); -void atzsc_enintr __P((struct sbic_softc *)); -void atzsc_dmastop __P((struct sbic_softc *)); -int atzsc_dmanext __P((struct sbic_softc *)); -int atzsc_dmaintr __P((void *)); -int atzsc_dmago __P((struct sbic_softc *, char *, int, int)); +void atzsc_enintr(struct sbic_softc *); +void atzsc_dmastop(struct sbic_softc *); +int atzsc_dmanext(struct sbic_softc *); +int atzsc_dmaintr(void *); +int atzsc_dmago(struct sbic_softc *, char *, int, int); #ifdef DEBUG -void atzsc_dump __P((void)); +void atzsc_dump(void); #endif struct scsi_adapter atzsc_scsiswitch = { diff --git a/sys/arch/amiga/dev/aucc.c b/sys/arch/amiga/dev/aucc.c index ece4504dd92..73655844593 100644 --- a/sys/arch/amiga/dev/aucc.c +++ b/sys/arch/amiga/dev/aucc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aucc.c,v 1.6 2001/02/19 18:26:27 art Exp $ */ +/* $OpenBSD: aucc.c,v 1.7 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: aucc.c,v 1.22 1998/01/12 10:39:10 thorpej Exp $ */ /* @@ -63,7 +63,7 @@ #define AUCC_ALLDMAF (DMAF_AUD0|DMAF_AUD1|DMAF_AUD2|DMAF_AUD3) #ifdef AUDIO_DEBUG -/*extern printf __P((const char *,...));*/ +/*extern printf(const char *,...);*/ int auccdebug = 1; #define DPRINTF(x) if (auccdebug) printf x #else @@ -92,16 +92,16 @@ struct aucc_softc { }; /* interrupt interfaces */ -void aucc_inthdl __P((int)); +void aucc_inthdl(int); /* forward declarations */ -int init_aucc __P((struct aucc_softc *)); -u_int freqtoper __P((u_int)); -u_int pertofreq __P((u_int)); +int init_aucc(struct aucc_softc *); +u_int freqtoper(u_int); +u_int pertofreq(u_int); /* autoconfiguration driver */ -void auccattach __P((struct device *, struct device *, void *)); -int auccmatch __P((struct device *, void *, void *)); +void auccattach(struct device *, struct device *, void *); +int auccmatch(struct device *, void *, void *); struct cfattach aucc_ca = { sizeof(struct aucc_softc), @@ -159,26 +159,26 @@ unsigned char ulaw_to_lin[] = { /* * Define our interface to the higher level audio driver. */ -int aucc_open __P((void *, int)); -void aucc_close __P((void *)); -int aucc_set_out_sr __P((void *, u_long)); -int aucc_query_encoding __P((void *, struct audio_encoding *)); -int aucc_round_blocksize __P((void *, int)); -int aucc_commit_settings __P((void *)); +int aucc_open(void *, int); +void aucc_close(void *); +int aucc_set_out_sr(void *, u_long); +int aucc_query_encoding(void *, struct audio_encoding *); +int aucc_round_blocksize(void *, int); +int aucc_commit_settings(void *); int aucc_start_output __P((void *, void *, int, void (*)(void *), void *)); int aucc_start_input __P((void *, void *, int, void (*)(void *), void *)); -int aucc_halt_output __P((void *)); -int aucc_halt_input __P((void *)); -int aucc_getdev __P((void *, struct audio_device *)); -int aucc_set_port __P((void *, mixer_ctrl_t *)); -int aucc_get_port __P((void *, mixer_ctrl_t *)); -int aucc_query_devinfo __P((void *, mixer_devinfo_t *)); -void aucc_encode __P((int, int, int, u_char *, u_short **)); -int aucc_set_params __P((void *, int, int, - struct audio_params *, struct audio_params *)); -int aucc_get_props __P((void *)); +int aucc_halt_output(void *); +int aucc_halt_input(void *); +int aucc_getdev(void *, struct audio_device *); +int aucc_set_port(void *, mixer_ctrl_t *); +int aucc_get_port(void *, mixer_ctrl_t *); +int aucc_query_devinfo(void *, mixer_devinfo_t *); +void aucc_encode(int, int, int, u_char *, u_short **); +int aucc_set_params(void *, int, int, + struct audio_params *, struct audio_params *); +int aucc_get_props(void *); struct audio_hw_if sa_hw_if = { aucc_open, @@ -471,7 +471,7 @@ aucc_start_output(addr, p, cc, intr, arg) void *addr; void *p; int cc; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; { struct aucc_softc *sc; @@ -587,7 +587,7 @@ aucc_start_input(addr, p, cc, intr, arg) void *addr; void *p; int cc; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; { return (ENXIO); /* no input */ diff --git a/sys/arch/amiga/dev/auccvar.h b/sys/arch/amiga/dev/auccvar.h index bb5e9d1ae17..ff92afb1739 100644 --- a/sys/arch/amiga/dev/auccvar.h +++ b/sys/arch/amiga/dev/auccvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: auccvar.h,v 1.1 1997/09/18 13:39:43 niklas Exp $ */ +/* $OpenBSD: auccvar.h,v 1.2 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: auccvar.h,v 1.3 1997/07/04 21:00:18 is Exp $ */ /* @@ -50,7 +50,7 @@ typedef struct aucc_data { u_int nd_dmalength; /* length of dma data */ int nd_mask; /* mask of active channels, together with this one */ - void (*nd_intr) __P((void *)); /* interrupt routine */ + void (*nd_intr)(void *); /* interrupt routine */ void *nd_intrdata; /* interrupt data */ int nd_doublebuf; /* double buffering */ } aucc_data_t; diff --git a/sys/arch/amiga/dev/bzsc.c b/sys/arch/amiga/dev/bzsc.c index 5461ad49cf8..5067b71f6a8 100644 --- a/sys/arch/amiga/dev/bzsc.c +++ b/sys/arch/amiga/dev/bzsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bzsc.c,v 1.9 2001/11/30 22:08:16 miod Exp $ */ +/* $OpenBSD: bzsc.c,v 1.10 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: bzsc.c,v 1.14 1996/12/23 09:09:53 veego Exp $ */ @@ -56,8 +56,8 @@ #include <amiga/dev/bzscreg.h> #include <amiga/dev/bzscvar.h> -void bzscattach __P((struct device *, struct device *, void *)); -int bzscmatch __P((struct device *, void *, void *)); +void bzscattach(struct device *, struct device *, void *); +int bzscmatch(struct device *, void *, void *); struct scsi_adapter bzsc_scsiswitch = { sfas_scsicmd, @@ -81,15 +81,15 @@ struct cfdriver bzsc_cd = { NULL, "bzsc", DV_DULL, NULL, 0 }; -int bzsc_intr __P((void *)); -void bzsc_set_dma_adr __P((struct sfas_softc *sc, vm_offset_t ptr, int mode)); -void bzsc_set_dma_tc __P((struct sfas_softc *sc, unsigned int len)); -int bzsc_setup_dma __P((struct sfas_softc *sc, vm_offset_t ptr, int len, - int mode)); -int bzsc_build_dma_chain __P((struct sfas_softc *sc, - struct sfas_dma_chain *chain, void *p, int l)); -int bzsc_need_bump __P((struct sfas_softc *sc, vm_offset_t ptr, int len)); -void bzsc_led_dummy __P((struct sfas_softc *sc, int mode)); +int bzsc_intr(void *); +void bzsc_set_dma_adr(struct sfas_softc *sc, vm_offset_t ptr, int mode); +void bzsc_set_dma_tc(struct sfas_softc *sc, unsigned int len); +int bzsc_setup_dma(struct sfas_softc *sc, vm_offset_t ptr, int len, + int mode); +int bzsc_build_dma_chain(struct sfas_softc *sc, + struct sfas_dma_chain *chain, void *p, int l); +int bzsc_need_bump(struct sfas_softc *sc, vm_offset_t ptr, int len); +void bzsc_led_dummy(struct sfas_softc *sc, int mode); /* * if we are an Advanced Systems & Software FastlaneZ3 diff --git a/sys/arch/amiga/dev/bztzsc.c b/sys/arch/amiga/dev/bztzsc.c index 6420f03762d..4f4ff80bce1 100644 --- a/sys/arch/amiga/dev/bztzsc.c +++ b/sys/arch/amiga/dev/bztzsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bztzsc.c,v 1.5 2001/11/30 22:08:16 miod Exp $ */ +/* $OpenBSD: bztzsc.c,v 1.6 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: bztzsc.c,v 1.2 1996/12/23 09:09:54 veego Exp $ */ /* @@ -53,8 +53,8 @@ #include <amiga/dev/bztzscreg.h> #include <amiga/dev/bztzscvar.h> -void bztzscattach __P((struct device *, struct device *, void *)); -int bztzscmatch __P((struct device *, void *, void *)); +void bztzscattach(struct device *, struct device *, void *); +int bztzscmatch(struct device *, void *, void *); struct scsi_adapter bztzsc_scsiswitch = { sfas_scsicmd, @@ -78,14 +78,14 @@ struct cfdriver bztzsc_cd = { NULL, "bztzsc", DV_DULL, NULL, 0 }; -int bztzsc_intr __P((void *)); -void bztzsc_set_dma_tc __P((struct sfas_softc *sc, unsigned int len)); -int bztzsc_setup_dma __P((struct sfas_softc *sc, vm_offset_t ptr, int len, - int mode)); -int bztzsc_build_dma_chain __P((struct sfas_softc *sc, - struct sfas_dma_chain *chain, void *p, int l)); -int bztzsc_need_bump __P((struct sfas_softc *sc, vm_offset_t ptr, int len)); -void bztzsc_led __P((struct sfas_softc *sc, int mode)); +int bztzsc_intr(void *); +void bztzsc_set_dma_tc(struct sfas_softc *sc, unsigned int len); +int bztzsc_setup_dma(struct sfas_softc *sc, vm_offset_t ptr, int len, + int mode); +int bztzsc_build_dma_chain(struct sfas_softc *sc, + struct sfas_dma_chain *chain, void *p, int l); +int bztzsc_need_bump(struct sfas_softc *sc, vm_offset_t ptr, int len); +void bztzsc_led(struct sfas_softc *sc, int mode); /* * If we are an Phase 5 Devices Blizzard-2060 SCSI option: diff --git a/sys/arch/amiga/dev/clock.c b/sys/arch/amiga/dev/clock.c index a31a6a786c9..84f01f0e80d 100644 --- a/sys/arch/amiga/dev/clock.c +++ b/sys/arch/amiga/dev/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.14 2002/01/24 20:31:08 miod Exp $ */ +/* $OpenBSD: clock.c,v 1.15 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: clock.c,v 1.25 1997/01/02 20:59:42 is Exp $ */ /* @@ -98,11 +98,11 @@ struct clockframe hardclock_frame; * periods where N is the value loaded into the counter. */ -int clockmatch __P((struct device *, void *, void *)); -void clockattach __P((struct device *, struct device *, void *)); -void cpu_initclocks __P((void)); -void calibrate_delay __P((struct device *)); -int clockintr __P((void *)); +int clockmatch(struct device *, void *, void *); +void clockattach(struct device *, struct device *, void *); +void cpu_initclocks(void); +void calibrate_delay(struct device *); +int clockintr(void *); struct cfattach clock_ca = { sizeof(struct device), clockmatch, clockattach diff --git a/sys/arch/amiga/dev/com_supio.c b/sys/arch/amiga/dev/com_supio.c index 6da2b8b793e..f2a75dd7a03 100644 --- a/sys/arch/amiga/dev/com_supio.c +++ b/sys/arch/amiga/dev/com_supio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_supio.c,v 1.3 2002/01/30 20:45:34 nordin Exp $ */ +/* $OpenBSD: com_supio.c,v 1.4 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: com_supio.c,v 1.3 1997/08/27 20:41:30 is Exp $ */ /*- @@ -68,9 +68,9 @@ struct comsupio_softc { struct isr sc_isr; }; -int com_supio_match __P((struct device *, void *, void *)); -void com_supio_attach __P((struct device *, struct device *, void *)); -void com_supio_cleanup __P((void *)); +int com_supio_match(struct device *, void *, void *); +void com_supio_attach(struct device *, struct device *, void *); +void com_supio_cleanup(void *); static int comconsaddr; static bus_space_handle_t comconsioh; diff --git a/sys/arch/amiga/dev/drbbc.c b/sys/arch/amiga/dev/drbbc.c index da4f0612cce..c1d32fd3d6c 100644 --- a/sys/arch/amiga/dev/drbbc.c +++ b/sys/arch/amiga/dev/drbbc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: drbbc.c,v 1.1 1997/09/18 13:39:44 niklas Exp $ */ +/* $OpenBSD: drbbc.c,v 1.2 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: drbbc.c,v 1.1 1997/07/17 23:29:30 is Exp $ */ /* @@ -51,16 +51,16 @@ #include <dev/ic/ds.h> -int draco_ds_read_bit __P((void *)); -void draco_ds_write_bit __P((void *, int)); -void draco_ds_reset __P((void *)); +int draco_ds_read_bit(void *); +void draco_ds_write_bit(void *, int); +void draco_ds_reset(void *); -void drbbc_attach __P((struct device *, struct device *, void *)); -int drbbc_match __P((struct device *, void *, void *)); +void drbbc_attach(struct device *, struct device *, void *); +int drbbc_match(struct device *, void *, void *); -time_t dracogettod __P((void)); +time_t dracogettod(void); #ifdef __NOTYET__ -int dracosettod __P((time_t)); +int dracosettod(time_t); #endif struct drbbc_softc { diff --git a/sys/arch/amiga/dev/drsc.c b/sys/arch/amiga/dev/drsc.c index 8d111a70870..281ca7afede 100644 --- a/sys/arch/amiga/dev/drsc.c +++ b/sys/arch/amiga/dev/drsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: drsc.c,v 1.5 2001/02/07 07:46:50 art Exp $ */ +/* $OpenBSD: drsc.c,v 1.6 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: drsc.c,v 1.9 1996/12/23 09:09:57 veego Exp $ */ /* @@ -52,11 +52,11 @@ #include <amiga/dev/siopvar.h> #include <amiga/amiga/drcustom.h> -void drscattach __P((struct device *, struct device *, void *)); -int drscmatch __P((struct device *, void *, void *)); -int drsc_dmaintr __P((struct siop_softc *)); +void drscattach(struct device *, struct device *, void *); +int drscmatch(struct device *, void *, void *); +int drsc_dmaintr(struct siop_softc *); #ifdef DEBUG -void drsc_dump __P((void)); +void drsc_dump(void); #endif struct scsi_adapter drsc_scsiswitch = { diff --git a/sys/arch/amiga/dev/drsupio.c b/sys/arch/amiga/dev/drsupio.c index 779fa48a741..27e332f1ed1 100644 --- a/sys/arch/amiga/dev/drsupio.c +++ b/sys/arch/amiga/dev/drsupio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: drsupio.c,v 1.1 1997/09/18 13:39:47 niklas Exp $ */ +/* $OpenBSD: drsupio.c,v 1.2 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: drsupio.c,v 1.1 1997/08/27 19:32:53 is Exp $ */ /* @@ -59,9 +59,9 @@ struct drsupio_softc { struct amiga_bus_space sc_bst; }; -int drsupiomatch __P((struct device *, void *, void *)); -void drsupioattach __P((struct device *, struct device *, void *)); -int drsupprint __P((void *auxp, const char *)); +int drsupiomatch(struct device *, void *, void *); +void drsupioattach(struct device *, struct device *, void *); +int drsupprint(void *auxp, const char *); struct cfattach drsupio_ca = { sizeof(struct drsupio_softc), drsupiomatch, drsupioattach @@ -71,9 +71,9 @@ struct cfdriver drsupio_cd = { NULL, "drsupio", DV_DULL }; -int drsupio_map __P((bus_space_tag_t, bus_addr_t, bus_size_t, int, - bus_space_handle_t *)); -int drsupio_unmap __P((bus_space_tag_t, bus_space_handle_t, bus_size_t)); +int drsupio_map(bus_space_tag_t, bus_addr_t, bus_size_t, int, + bus_space_handle_t *); +int drsupio_unmap(bus_space_tag_t, bus_space_handle_t, bus_size_t); int drsupiomatch(parent, match, auxp) diff --git a/sys/arch/amiga/dev/empsc.c b/sys/arch/amiga/dev/empsc.c index 51770b31af1..521cbd3c549 100644 --- a/sys/arch/amiga/dev/empsc.c +++ b/sys/arch/amiga/dev/empsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: empsc.c,v 1.6 1997/01/18 12:26:28 niklas Exp $ */ +/* $OpenBSD: empsc.c,v 1.7 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: empsc.c,v 1.13 1996/12/23 09:09:58 veego Exp $ */ /* @@ -50,9 +50,9 @@ #include <amiga/dev/scivar.h> #include <amiga/dev/zbusvar.h> -void empscattach __P((struct device *, struct device *, void *)); -int empscmatch __P((struct device *, void *, void *)); -int empsc_intr __P((void *)); +void empscattach(struct device *, struct device *, void *); +int empscmatch(struct device *, void *, void *); +int empsc_intr(void *); struct scsi_adapter empsc_scsiswitch = { sci_scsicmd, diff --git a/sys/arch/amiga/dev/event_var.h b/sys/arch/amiga/dev/event_var.h index 52fc3a84a88..d87c6d6194d 100644 --- a/sys/arch/amiga/dev/event_var.h +++ b/sys/arch/amiga/dev/event_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: event_var.h,v 1.2 1997/01/16 09:24:02 niklas Exp $ */ +/* $OpenBSD: event_var.h,v 1.3 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: event_var.h,v 1.3 1996/10/11 21:12:46 mhitch Exp $ */ /* @@ -78,10 +78,10 @@ struct evvar { psignal((ev)->ev_io, SIGIO); \ } -void ev_init __P((struct evvar *)); -void ev_fini __P((struct evvar *)); -int ev_read __P((struct evvar *, struct uio *, int)); -int ev_select __P((struct evvar *, int, struct proc *)); +void ev_init(struct evvar *); +void ev_fini(struct evvar *); +int ev_read(struct evvar *, struct uio *, int); +int ev_select(struct evvar *, int, struct proc *); /* * PEVENT is set just above PSOCK, which is just above TTIPRI, on the diff --git a/sys/arch/amiga/dev/fd.c b/sys/arch/amiga/dev/fd.c index a6f03f2c2c2..a651a621d25 100644 --- a/sys/arch/amiga/dev/fd.c +++ b/sys/arch/amiga/dev/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.14 2001/05/05 20:56:33 art Exp $ */ +/* $OpenBSD: fd.c,v 1.15 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: fd.c,v 1.36 1996/12/23 09:09:59 veego Exp $ */ /* @@ -185,43 +185,43 @@ struct fdcargs { int unit; }; -int fdcmatch __P((struct device *, void *, void *)); -void fdcattach __P((struct device *, struct device *, void *)); -int fdcprint __P((void *, const char *)); -int fdmatch __P((struct device *, void *, void *)); -void fdattach __P((struct device *, struct device *, void *)); - -void fdintr __P((int)); -void fdidxintr __P((void)); -int fdpulseintr __P((void *)); -void fdstrategy __P((struct buf *)); -int fdloaddisk __P((struct fd_softc *)); -int fdgetdisklabel __P((struct fd_softc *, dev_t)); -int fdsetdisklabel __P((struct fd_softc *, struct disklabel *)); -int fdputdisklabel __P((struct fd_softc *, dev_t)); -struct fdtype * fdcgetfdtype __P((int)); -void fdmotoroff __P((void *)); -void fdsetpos __P((struct fd_softc *, int, int)); -void fdselunit __P((struct fd_softc *)); -void fdstart __P((struct fd_softc *)); -void fdcont __P((struct fd_softc *)); -void fddmastart __P((struct fd_softc *, int)); -void fdcalibrate __P((void *)); -void fddmadone __P((struct fd_softc *, int)); -void fddone __P((struct fd_softc *)); -void fdfindwork __P((int)); -void fdminphys __P((struct buf *)); -void fdcachetoraw __P((struct fd_softc *)); -void amcachetoraw __P((struct fd_softc *)); -int amrawtocache __P((struct fd_softc *)); -u_long *fdfindsync __P((u_long *, u_long *)); -int fdrawtocache __P((struct fd_softc *)); -void mscachetoraw __P((struct fd_softc *)); -int msrawtocache __P((struct fd_softc *)); -u_long *mfmblkencode __P((u_long *, u_long *, u_long *, int)); -u_long *mfmblkdecode __P((u_long *, u_long *, u_long *, int)); -u_short *msblkdecode __P((u_short *, u_char *, int)); -u_short *msblkencode __P((u_short *, u_char *, int, u_short *)); +int fdcmatch(struct device *, void *, void *); +void fdcattach(struct device *, struct device *, void *); +int fdcprint(void *, const char *); +int fdmatch(struct device *, void *, void *); +void fdattach(struct device *, struct device *, void *); + +void fdintr(int); +void fdidxintr(void); +int fdpulseintr(void *); +void fdstrategy(struct buf *); +int fdloaddisk(struct fd_softc *); +int fdgetdisklabel(struct fd_softc *, dev_t); +int fdsetdisklabel(struct fd_softc *, struct disklabel *); +int fdputdisklabel(struct fd_softc *, dev_t); +struct fdtype * fdcgetfdtype(int); +void fdmotoroff(void *); +void fdsetpos(struct fd_softc *, int, int); +void fdselunit(struct fd_softc *); +void fdstart(struct fd_softc *); +void fdcont(struct fd_softc *); +void fddmastart(struct fd_softc *, int); +void fdcalibrate(void *); +void fddmadone(struct fd_softc *, int); +void fddone(struct fd_softc *); +void fdfindwork(int); +void fdminphys(struct buf *); +void fdcachetoraw(struct fd_softc *); +void amcachetoraw(struct fd_softc *); +int amrawtocache(struct fd_softc *); +u_long *fdfindsync(u_long *, u_long *); +int fdrawtocache(struct fd_softc *); +void mscachetoraw(struct fd_softc *); +int msrawtocache(struct fd_softc *); +u_long *mfmblkencode(u_long *, u_long *, u_long *, int); +u_long *mfmblkdecode(u_long *, u_long *, u_long *, int); +u_short *msblkdecode(u_short *, u_char *, int); +u_short *msblkencode(u_short *, u_char *, int, u_short *); struct dkdriver fddkdriver = { fdstrategy }; diff --git a/sys/arch/amiga/dev/flsc.c b/sys/arch/amiga/dev/flsc.c index 4989593b33a..33e8b966196 100644 --- a/sys/arch/amiga/dev/flsc.c +++ b/sys/arch/amiga/dev/flsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: flsc.c,v 1.11 2001/11/30 22:08:16 miod Exp $ */ +/* $OpenBSD: flsc.c,v 1.12 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: flsc.c,v 1.14 1996/12/23 09:10:00 veego Exp $ */ /* @@ -55,8 +55,8 @@ #include <amiga/dev/flscreg.h> #include <amiga/dev/flscvar.h> -void flscattach __P((struct device *, struct device *, void *)); -int flscmatch __P((struct device *, void *, void *)); +void flscattach(struct device *, struct device *, void *); +int flscmatch(struct device *, void *, void *); struct scsi_adapter flsc_scsiswitch = { sfas_scsicmd, @@ -80,16 +80,16 @@ struct cfdriver flsc_cd = { NULL, "flsc", DV_DULL, NULL, 0 }; -int flsc_intr __P((void *)); -void flsc_set_dma_adr __P((struct sfas_softc *sc, vm_offset_t ptr)); -void flsc_set_dma_tc __P((struct sfas_softc *sc, unsigned int len)); -void flsc_set_dma_mode __P((struct sfas_softc *sc, int mode)); -int flsc_setup_dma __P((struct sfas_softc *sc, vm_offset_t ptr, int len, - int mode)); -int flsc_build_dma_chain __P((struct sfas_softc *sc, - struct sfas_dma_chain *chain, void *p, int l)); -int flsc_need_bump __P((struct sfas_softc *sc, vm_offset_t ptr, int len)); -void flsc_led __P((struct sfas_softc *sc, int mode)); +int flsc_intr(void *); +void flsc_set_dma_adr(struct sfas_softc *sc, vm_offset_t ptr); +void flsc_set_dma_tc(struct sfas_softc *sc, unsigned int len); +void flsc_set_dma_mode(struct sfas_softc *sc, int mode); +int flsc_setup_dma(struct sfas_softc *sc, vm_offset_t ptr, int len, + int mode); +int flsc_build_dma_chain(struct sfas_softc *sc, + struct sfas_dma_chain *chain, void *p, int l); +int flsc_need_bump(struct sfas_softc *sc, vm_offset_t ptr, int len); +void flsc_led(struct sfas_softc *sc, int mode); /* * if we are an Advanced Systems & Software FastlaneZ3 diff --git a/sys/arch/amiga/dev/grf.c b/sys/arch/amiga/dev/grf.c index a4d3ac867d0..a8bb25089ca 100644 --- a/sys/arch/amiga/dev/grf.c +++ b/sys/arch/amiga/dev/grf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf.c,v 1.14 2001/11/06 19:53:14 miod Exp $ */ +/* $OpenBSD: grf.c,v 1.15 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: grf.c,v 1.32 1996/12/23 09:10:01 veego Exp $ */ /* @@ -82,18 +82,18 @@ #define ite_reinit(d) #endif -int grfon __P((dev_t)); -int grfoff __P((dev_t)); -int grfsinfo __P((dev_t, struct grfdyninfo *)); +int grfon(dev_t); +int grfoff(dev_t); +int grfsinfo(dev_t, struct grfdyninfo *); #ifdef BANKEDDEVPAGER -int grfbanked_get __P((dev_t, off_t, int)); -int grfbanked_cur __P((dev_t)); -int grfbanked_set __P((dev_t, int)); +int grfbanked_get(dev_t, off_t, int); +int grfbanked_cur(dev_t); +int grfbanked_set(dev_t, int); #endif -void grfattach __P((struct device *, struct device *, void *)); -int grfmatch __P((struct device *, void *, void *)); -int grfprint __P((void *, const char *)); +void grfattach(struct device *, struct device *, void *); +int grfmatch(struct device *, void *, void *); +int grfprint(void *, const char *); /* * pointers to grf drivers device structs */ diff --git a/sys/arch/amiga/dev/grf_cc.c b/sys/arch/amiga/dev/grf_cc.c index b0c75ad4eef..56531904c0f 100644 --- a/sys/arch/amiga/dev/grf_cc.c +++ b/sys/arch/amiga/dev/grf_cc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_cc.c,v 1.9 2001/11/06 19:53:14 miod Exp $ */ +/* $OpenBSD: grf_cc.c,v 1.10 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: grf_cc.c,v 1.23 1996/12/23 09:10:02 veego Exp $ */ /* @@ -62,10 +62,10 @@ #include "view.h" -int grfccmatch __P((struct device *, void *, void *)); -int grfccprint __P((void *, const char *)); -void grfccattach __P((struct device *, struct device *, void *)); -void grf_cc_on __P((struct grf_softc *)); +int grfccmatch(struct device *, void *, void *); +int grfccprint(void *, const char *); +void grfccattach(struct device *, struct device *, void *); +void grf_cc_on(struct grf_softc *); struct cfattach grfcc_ca = { sizeof(struct grf_softc), grfccmatch, grfccattach diff --git a/sys/arch/amiga/dev/grf_ccreg.h b/sys/arch/amiga/dev/grf_ccreg.h index 116fdb48c7e..4eb118404df 100644 --- a/sys/arch/amiga/dev/grf_ccreg.h +++ b/sys/arch/amiga/dev/grf_ccreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_ccreg.h,v 1.2 1996/05/02 06:43:43 niklas Exp $ */ +/* $OpenBSD: grf_ccreg.h,v 1.3 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: grf_ccreg.h,v 1.9 1996/04/21 21:11:10 veego Exp $ */ /* @@ -30,6 +30,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -int grfcc_cnprobe __P((void)); -void grfcc_iteinit __P((struct grf_softc *)); -int cc_mode __P((struct grf_softc *, u_long, void *, u_long, int)); +int grfcc_cnprobe(void); +void grfcc_iteinit(struct grf_softc *); +int cc_mode(struct grf_softc *, u_long, void *, u_long, int); diff --git a/sys/arch/amiga/dev/grf_cl.c b/sys/arch/amiga/dev/grf_cl.c index 284e88f9950..e26bb3243ef 100644 --- a/sys/arch/amiga/dev/grf_cl.c +++ b/sys/arch/amiga/dev/grf_cl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_cl.c,v 1.15 2001/09/13 13:20:22 jj Exp $ */ +/* $OpenBSD: grf_cl.c,v 1.16 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: grf_cl.c,v 1.20 1997/07/29 17:46:24 veego Exp $ */ /* @@ -83,41 +83,41 @@ #include <amiga/dev/grf_clreg.h> #include <amiga/dev/zbusvar.h> -int cl_mondefok __P((struct grfvideo_mode *)); -void cl_boardinit __P((struct grf_softc *)); -void cl_CompFQ __P((u_int, u_char *, u_char *, u_char *)); -int cl_getvmode __P((struct grf_softc *, struct grfvideo_mode *)); -int cl_setvmode __P((struct grf_softc *, unsigned int)); -int cl_toggle __P((struct grf_softc *, unsigned short)); -int cl_getcmap __P((struct grf_softc *, struct grf_colormap *)); -int cl_putcmap __P((struct grf_softc *, struct grf_colormap *)); +int cl_mondefok(struct grfvideo_mode *); +void cl_boardinit(struct grf_softc *); +void cl_CompFQ(u_int, u_char *, u_char *, u_char *); +int cl_getvmode(struct grf_softc *, struct grfvideo_mode *); +int cl_setvmode(struct grf_softc *, unsigned int); +int cl_toggle(struct grf_softc *, unsigned short); +int cl_getcmap(struct grf_softc *, struct grf_colormap *); +int cl_putcmap(struct grf_softc *, struct grf_colormap *); #ifndef CL5426CONSOLE -void cl_off __P((struct grf_softc *)); +void cl_off(struct grf_softc *); #endif -void cl_inittextmode __P((struct grf_softc *)); -int cl_ioctl __P((register struct grf_softc *, u_long, void *)); -int cl_getmousepos __P((struct grf_softc *, struct grf_position *)); -int cl_setmousepos __P((struct grf_softc *, struct grf_position *)); -int cl_setspriteinfo __P((struct grf_softc *, struct grf_spriteinfo *)); -int cl_getspriteinfo __P((struct grf_softc *, struct grf_spriteinfo *)); -int cl_getspritemax __P((struct grf_softc *, struct grf_position *)); -int cl_blank __P((struct grf_softc *, int *)); -int cl_setmonitor __P((struct grf_softc *, struct grfvideo_mode *)); -void cl_writesprpos __P((volatile char *, short, short)); -void writeshifted __P((volatile char *, char, char)); - -void RegWakeup __P((volatile u_char *)); -void RegOnpass __P((volatile u_char *)); -void RegOffpass __P((volatile u_char *)); - -void grfclattach __P((struct device *, struct device *, void *)); -int grfclprint __P((void *, const char *)); -int grfclmatch __P((struct device *, void *, void *)); -void cl_memset __P((unsigned char *, unsigned char, int)); +void cl_inittextmode(struct grf_softc *); +int cl_ioctl(register struct grf_softc *, u_long, void *); +int cl_getmousepos(struct grf_softc *, struct grf_position *); +int cl_setmousepos(struct grf_softc *, struct grf_position *); +int cl_setspriteinfo(struct grf_softc *, struct grf_spriteinfo *); +int cl_getspriteinfo(struct grf_softc *, struct grf_spriteinfo *); +int cl_getspritemax(struct grf_softc *, struct grf_position *); +int cl_blank(struct grf_softc *, int *); +int cl_setmonitor(struct grf_softc *, struct grfvideo_mode *); +void cl_writesprpos(volatile char *, short, short); +void writeshifted(volatile char *, char, char); + +void RegWakeup(volatile u_char *); +void RegOnpass(volatile u_char *); +void RegOffpass(volatile u_char *); + +void grfclattach(struct device *, struct device *, void *); +int grfclprint(void *, const char *); +int grfclmatch(struct device *, void *, void *); +void cl_memset(unsigned char *, unsigned char, int); /* Handle rgb format */ -void cl_setcolor __P((volatile u_char *, u_char, u_char, u_char)); -void cl_getcolor __P((volatile u_char *, u_char *, u_char *, u_char *)); +void cl_setcolor(volatile u_char *, u_char, u_char, u_char); +void cl_getcolor(volatile u_char *, u_char *, u_char *, u_char *); /* Graphics display definitions. * These are filled by 'grfconfig' using GRFIOCSETMON. diff --git a/sys/arch/amiga/dev/grf_clreg.h b/sys/arch/amiga/dev/grf_clreg.h index 3644079e66a..7d2d9263852 100644 --- a/sys/arch/amiga/dev/grf_clreg.h +++ b/sys/arch/amiga/dev/grf_clreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_clreg.h,v 1.7 1997/09/18 13:39:49 niklas Exp $ */ +/* $OpenBSD: grf_clreg.h,v 1.8 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: grf_clreg.h,v 1.6 1997/03/21 09:40:58 veego Exp $ */ /* @@ -306,11 +306,11 @@ struct grfcltext_mode { WSeq(ba, SEQ_ID_MAP_MASK, (1 << (m & 3))); \ } while (0) -int cl_mode __P((register struct grf_softc *gp, u_long cmd, void *arg, - u_long a2, int a3)); -int cl_load_mon __P((struct grf_softc *gp, struct grfcltext_mode *gv)); -int grfcl_cnprobe __P((void)); -void grfcl_iteinit __P((struct grf_softc *gp)); +int cl_mode(register struct grf_softc *gp, u_long cmd, void *arg, + u_long a2, int a3); +int cl_load_mon(struct grf_softc *gp, struct grfcltext_mode *gv); +int grfcl_cnprobe(void); +void grfcl_iteinit(struct grf_softc *gp); #endif /* _GRF_RHREG_H */ diff --git a/sys/arch/amiga/dev/grf_cv.c b/sys/arch/amiga/dev/grf_cv.c index 1d33e2a975a..6852437bcc3 100644 --- a/sys/arch/amiga/dev/grf_cv.c +++ b/sys/arch/amiga/dev/grf_cv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_cv.c,v 1.16 1998/01/15 14:14:35 niklas Exp $ */ +/* $OpenBSD: grf_cv.c,v 1.17 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: grf_cv.c,v 1.24 1997/07/30 11:05:55 veego Exp $ */ /* @@ -68,38 +68,38 @@ #include <amiga/dev/grf_cvreg.h> #include <amiga/dev/zbusvar.h> -int grfcvmatch __P((struct device *, void *, void *)); -void grfcvattach __P((struct device *, struct device *, void *)); -int grfcvprint __P((void *, const char *)); - -int cvintr __P((void *)); -int cv_has_4mb __P((volatile caddr_t)); -unsigned short cv_compute_clock __P((unsigned long)); -void cv_boardinit __P((struct grf_softc *)); -int cv_getvmode __P((struct grf_softc *, struct grfvideo_mode *)); -int cv_setvmode __P((struct grf_softc *, unsigned int)); -int cv_blank __P((struct grf_softc *, int *)); -int cv_mode __P((register struct grf_softc *, u_long, void *, u_long, int)); -int cv_ioctl __P((register struct grf_softc *gp, u_long cmd, void *data)); -int cv_setmonitor __P((struct grf_softc *, struct grfvideo_mode *)); -int cv_getcmap __P((struct grf_softc *, struct grf_colormap *)); -int cv_putcmap __P((struct grf_softc *, struct grf_colormap *)); -int cv_toggle __P((struct grf_softc *)); -int cv_mondefok __P((struct grfvideo_mode *)); -int cv_load_mon __P((struct grf_softc *, struct grfcvtext_mode *)); -void cv_inittextmode __P((struct grf_softc *)); -static __inline void cv_write_port __P((unsigned short, volatile caddr_t)); -static __inline void cvscreen __P((int, volatile caddr_t)); -static __inline void gfx_on_off __P((int, volatile caddr_t)); +int grfcvmatch(struct device *, void *, void *); +void grfcvattach(struct device *, struct device *, void *); +int grfcvprint(void *, const char *); + +int cvintr(void *); +int cv_has_4mb(volatile caddr_t); +unsigned short cv_compute_clock(unsigned long); +void cv_boardinit(struct grf_softc *); +int cv_getvmode(struct grf_softc *, struct grfvideo_mode *); +int cv_setvmode(struct grf_softc *, unsigned int); +int cv_blank(struct grf_softc *, int *); +int cv_mode(register struct grf_softc *, u_long, void *, u_long, int); +int cv_ioctl(register struct grf_softc *gp, u_long cmd, void *data); +int cv_setmonitor(struct grf_softc *, struct grfvideo_mode *); +int cv_getcmap(struct grf_softc *, struct grf_colormap *); +int cv_putcmap(struct grf_softc *, struct grf_colormap *); +int cv_toggle(struct grf_softc *); +int cv_mondefok(struct grfvideo_mode *); +int cv_load_mon(struct grf_softc *, struct grfcvtext_mode *); +void cv_inittextmode(struct grf_softc *); +static __inline void cv_write_port(unsigned short, volatile caddr_t); +static __inline void cvscreen(int, volatile caddr_t); +static __inline void gfx_on_off(int, volatile caddr_t); #ifndef CV_NO_HARDWARE_CURSOR -int cv_getspritepos __P((struct grf_softc *, struct grf_position *)); -int cv_setspritepos __P((struct grf_softc *, struct grf_position *)); -static __inline short M2I __P((short)); -int cv_getspriteinfo __P((struct grf_softc *,struct grf_spriteinfo *)); -void cv_setup_hwc __P((struct grf_softc *)); -int cv_setspriteinfo __P((struct grf_softc *,struct grf_spriteinfo *)); -int cv_getspritemax __P((struct grf_softc *,struct grf_position *)); +int cv_getspritepos(struct grf_softc *, struct grf_position *); +int cv_setspritepos(struct grf_softc *, struct grf_position *); +static __inline short M2I(short); +int cv_getspriteinfo(struct grf_softc *,struct grf_spriteinfo *); +void cv_setup_hwc(struct grf_softc *); +int cv_setspriteinfo(struct grf_softc *,struct grf_spriteinfo *); +int cv_getspritemax(struct grf_softc *,struct grf_position *); #endif /* !CV_NO_HARDWARE_CURSOR */ /* diff --git a/sys/arch/amiga/dev/grf_cvreg.h b/sys/arch/amiga/dev/grf_cvreg.h index 21ea223a67e..95c70ce3ea1 100644 --- a/sys/arch/amiga/dev/grf_cvreg.h +++ b/sys/arch/amiga/dev/grf_cvreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_cvreg.h,v 1.7 1997/09/18 13:39:50 niklas Exp $ */ +/* $OpenBSD: grf_cvreg.h,v 1.8 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: grf_cvreg.h,v 1.5 1996/05/19 21:05:30 veego Exp $ */ /* @@ -82,14 +82,14 @@ struct grfcvtext_mode { #define vgaw16(ba, reg, val) \ *((unsigned short *) (((volatile caddr_t)ba)+reg)) = val -int grfcv_cnprobe __P((void)); -void grfcv_iteinit __P((struct grf_softc *)); -static __inline void GfxBusyWait __P((volatile caddr_t)); -static __inline void GfxFifoWait __P((volatile caddr_t)); -static __inline unsigned char RAttr __P((volatile caddr_t, short)); -static __inline unsigned char RSeq __P((volatile caddr_t, short)); -static __inline unsigned char RCrt __P((volatile caddr_t, short)); -static __inline unsigned char RGfx __P((volatile caddr_t, short)); +int grfcv_cnprobe(void); +void grfcv_iteinit(struct grf_softc *); +static __inline void GfxBusyWait(volatile caddr_t); +static __inline void GfxFifoWait(volatile caddr_t); +static __inline unsigned char RAttr(volatile caddr_t, short); +static __inline unsigned char RSeq(volatile caddr_t, short); +static __inline unsigned char RCrt(volatile caddr_t, short); +static __inline unsigned char RGfx(volatile caddr_t, short); /* diff --git a/sys/arch/amiga/dev/grf_et.c b/sys/arch/amiga/dev/grf_et.c index 95712b6df7d..30e1dfd8d60 100644 --- a/sys/arch/amiga/dev/grf_et.c +++ b/sys/arch/amiga/dev/grf_et.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_et.c,v 1.7 1997/09/18 13:39:51 niklas Exp $ */ +/* $OpenBSD: grf_et.c,v 1.8 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: grf_et.c,v 1.10 1997/07/29 17:46:31 veego Exp $ */ /* @@ -75,36 +75,36 @@ #include <amiga/dev/grf_etreg.h> #include <amiga/dev/zbusvar.h> -int et_mondefok __P((struct grfvideo_mode *gv)); -void et_boardinit __P((struct grf_softc *gp)); -void et_CompFQ __P((u_int fq, u_char *num, u_char *denom)); -int et_getvmode __P((struct grf_softc *gp, struct grfvideo_mode *vm)); -int et_setvmode __P((struct grf_softc *gp, unsigned int mode)); -int et_toggle __P((struct grf_softc *gp, unsigned short)); -int et_getcmap __P((struct grf_softc *gfp, struct grf_colormap *cmap)); -int et_putcmap __P((struct grf_softc *gfp, struct grf_colormap *cmap)); +int et_mondefok(struct grfvideo_mode *gv); +void et_boardinit(struct grf_softc *gp); +void et_CompFQ(u_int fq, u_char *num, u_char *denom); +int et_getvmode(struct grf_softc *gp, struct grfvideo_mode *vm); +int et_setvmode(struct grf_softc *gp, unsigned int mode); +int et_toggle(struct grf_softc *gp, unsigned short); +int et_getcmap(struct grf_softc *gfp, struct grf_colormap *cmap); +int et_putcmap(struct grf_softc *gfp, struct grf_colormap *cmap); #ifndef TSENGCONSOLE -void et_off __P((struct grf_softc *gp)); +void et_off(struct grf_softc *gp); #endif -void et_inittextmode __P((struct grf_softc *gp)); -int et_ioctl __P((register struct grf_softc *gp, u_long cmd, void *data)); -int et_getmousepos __P((struct grf_softc *gp, struct grf_position *data)); -void et_writesprpos __P((volatile char *ba, short x, short y)); -int et_setmousepos __P((struct grf_softc *gp, struct grf_position *data)); -int et_setspriteinfo __P((struct grf_softc *gp, - struct grf_spriteinfo *data)); -int et_getspriteinfo __P((struct grf_softc *gp, - struct grf_spriteinfo *data)); -int et_getspritemax __P((struct grf_softc *gp, struct grf_position *data)); -int et_setmonitor __P((struct grf_softc *gp, struct grfvideo_mode *gv)); -int et_blank __P((struct grf_softc *gp, int *on)); -int et_getControllerType __P((struct grf_softc *gp)); -int et_getDACType __P((struct grf_softc *gp)); - -int grfetmatch __P((struct device *, void *, void *)); -void grfetattach __P((struct device *, struct device *, void *)); -int grfetprint __P((void *, const char *)); -void et_memset __P((unsigned char *d, unsigned char c, int l)); +void et_inittextmode(struct grf_softc *gp); +int et_ioctl(register struct grf_softc *gp, u_long cmd, void *data); +int et_getmousepos(struct grf_softc *gp, struct grf_position *data); +void et_writesprpos(volatile char *ba, short x, short y); +int et_setmousepos(struct grf_softc *gp, struct grf_position *data); +int et_setspriteinfo(struct grf_softc *gp, + struct grf_spriteinfo *data); +int et_getspriteinfo(struct grf_softc *gp, + struct grf_spriteinfo *data); +int et_getspritemax(struct grf_softc *gp, struct grf_position *data); +int et_setmonitor(struct grf_softc *gp, struct grfvideo_mode *gv); +int et_blank(struct grf_softc *gp, int *on); +int et_getControllerType(struct grf_softc *gp); +int et_getDACType(struct grf_softc *gp); + +int grfetmatch(struct device *, void *, void *); +void grfetattach(struct device *, struct device *, void *); +int grfetprint(void *, const char *); +void et_memset(unsigned char *d, unsigned char c, int l); /* * Graphics display definitions. diff --git a/sys/arch/amiga/dev/grf_etreg.h b/sys/arch/amiga/dev/grf_etreg.h index e98b886100f..a68e3152390 100644 --- a/sys/arch/amiga/dev/grf_etreg.h +++ b/sys/arch/amiga/dev/grf_etreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_etreg.h,v 1.4 1997/09/18 13:39:51 niklas Exp $ */ +/* $OpenBSD: grf_etreg.h,v 1.5 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: grf_etreg.h,v 1.4 1997/07/29 17:42:06 veego Exp $ */ /* @@ -380,9 +380,9 @@ static inline unsigned char RGfx(volatile void * ba, short idx) { return vgar (ba, GCT_ADDRESS_R); } -int et_mode __P((register struct grf_softc *gp, u_long cmd, void *arg, u_long a2, int a3)); -int et_load_mon __P((struct grf_softc *gp, struct grfettext_mode *gv)); -int grfet_cnprobe __P((void)); -void grfet_iteinit __P((struct grf_softc *gp)); +int et_mode(register struct grf_softc *gp, u_long cmd, void *arg, u_long a2, int a3); +int et_load_mon(struct grf_softc *gp, struct grfettext_mode *gv); +int grfet_cnprobe(void); +void grfet_iteinit(struct grf_softc *gp); #endif /* _GRF_ETREG_H */ diff --git a/sys/arch/amiga/dev/grf_rh.c b/sys/arch/amiga/dev/grf_rh.c index a94c31ec102..c75bf86efb5 100644 --- a/sys/arch/amiga/dev/grf_rh.c +++ b/sys/arch/amiga/dev/grf_rh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_rh.c,v 1.13 1997/09/18 13:39:52 niklas Exp $ */ +/* $OpenBSD: grf_rh.c,v 1.14 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: grf_rh.c,v 1.27 1997/07/29 17:52:05 veego Exp $ */ /* @@ -54,13 +54,13 @@ enum mode_type { MT_TXTONLY, MT_GFXONLY, MT_BOTH }; -int rh_mondefok __P((struct MonDef *)); +int rh_mondefok(struct MonDef *); -u_short rh_CompFQ __P((u_int fq)); -int rh_load_mon __P((struct grf_softc *gp, struct MonDef *md)); -int rh_getvmode __P((struct grf_softc *gp, struct grfvideo_mode *vm)); -int rh_setvmode __P((struct grf_softc *gp, unsigned int mode, - enum mode_type type)); +u_short rh_CompFQ(u_int fq); +int rh_load_mon(struct grf_softc *gp, struct MonDef *md); +int rh_getvmode(struct grf_softc *gp, struct grfvideo_mode *vm); +int rh_setvmode(struct grf_softc *gp, unsigned int mode, + enum mode_type type); /* make it patchable, and settable by kernel config option */ #ifndef RH_MEMCLK @@ -1527,10 +1527,10 @@ int rh_default_gfx = 4; static struct MonDef *current_mon; /* EVIL */ -int rh_mode __P((struct grf_softc *, u_long, void *, u_long, int)); -void grfrhattach __P((struct device *, struct device *, void *)); -int grfrhprint __P((void *, const char *)); -int grfrhmatch __P((struct device *, void *, void *)); +int rh_mode(struct grf_softc *, u_long, void *, u_long, int); +void grfrhattach(struct device *, struct device *, void *); +int grfrhprint(void *, const char *); +int grfrhmatch(struct device *, void *, void *); struct cfattach grfrh_ca = { sizeof(struct grf_softc), grfrhmatch, grfrhattach diff --git a/sys/arch/amiga/dev/grf_rhreg.h b/sys/arch/amiga/dev/grf_rhreg.h index 454b264fcdc..797efb694e2 100644 --- a/sys/arch/amiga/dev/grf_rhreg.h +++ b/sys/arch/amiga/dev/grf_rhreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_rhreg.h,v 1.4 1997/09/18 13:39:52 niklas Exp $ */ +/* $OpenBSD: grf_rhreg.h,v 1.5 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: grf_rhreg.h,v 1.8 1997/07/29 17:42:09 veego Exp $ */ /* @@ -653,7 +653,7 @@ struct MonDef { vgaw(ba, PLL_ADDRESS_W, (val >> 8)); } while (0) -static __inline unsigned char RAttr __P((volatile void *, short)); +static __inline unsigned char RAttr(volatile void *, short); static __inline unsigned char RAttr(ba, idx) volatile void *ba; @@ -663,7 +663,7 @@ RAttr(ba, idx) return vgar (ba, ACT_ADDRESS_R); } -static __inline unsigned char RSeq __P((volatile void *, short)); +static __inline unsigned char RSeq(volatile void *, short); static __inline unsigned char RSeq(ba, idx) volatile void *ba; @@ -673,7 +673,7 @@ RSeq(ba, idx) return vgar (ba, SEQ_ADDRESS_R); } -static __inline unsigned char RCrt __P((volatile void *, short)); +static __inline unsigned char RCrt(volatile void *, short); static __inline unsigned char RCrt(ba, idx) volatile void *ba; @@ -683,7 +683,7 @@ RCrt(ba, idx) return vgar (ba, CRT_ADDRESS_R); } -static __inline unsigned char RGfx __P((volatile void *, short)); +static __inline unsigned char RGfx(volatile void *, short); static __inline unsigned char RGfx(ba, idx) volatile void *ba; @@ -693,39 +693,39 @@ RGfx(ba, idx) return vgar (ba, GCT_ADDRESS_R); } -void RZ3DisableHWC __P((struct grf_softc *gp)); -void RZ3SetupHWC __P((struct grf_softc *gp, unsigned char col1, unsigned int col2, unsigned char hsx, unsigned char hsy, const long unsigned int *data)); -void RZ3AlphaErase __P((struct grf_softc *gp, short unsigned int xd, short unsigned int yd, short unsigned int w, short unsigned int h)); -void RZ3AlphaCopy __P((struct grf_softc *gp, short unsigned int xs, short unsigned int ys, short unsigned int xd, short unsigned int yd, short unsigned int w, short unsigned int h)); -void RZ3BitBlit __P((struct grf_softc *gp, struct grf_bitblt *gbb)); -void RZ3BitBlit16 __P((struct grf_softc *gp, struct grf_bitblt *gbb)); -void RZ3BitBlit24 __P((struct grf_softc *gp, struct grf_bitblt *gbb)); -void RZ3SetCursorPos __P((struct grf_softc *gp, short unsigned int pos)); -void RZ3LoadPalette __P((struct grf_softc *gp, unsigned char *pal, unsigned char firstcol, unsigned char colors)); -void RZ3SetPalette __P((struct grf_softc *gp, unsigned char colornum, unsigned char red, unsigned char green, unsigned char blue)); -void RZ3SetPanning __P((struct grf_softc *gp, short unsigned int xoff, short unsigned int yoff)); -void RZ3SetHWCloc __P((struct grf_softc *gp, short unsigned int x, short unsigned int y)); -int rh_mode __P((register struct grf_softc *gp, u_long cmd, void *arg, u_long a2, int a3)); -int rh_ioctl __P((register struct grf_softc *gp, u_long cmd, void *data)); -int rh_getcmap __P((struct grf_softc *gfp, struct grf_colormap *cmap)); -int rh_putcmap __P((struct grf_softc *gfp, struct grf_colormap *cmap)); -int rh_getspritepos __P((struct grf_softc *gp, struct grf_position *pos)); -int rh_setspritepos __P((struct grf_softc *gp, struct grf_position *pos)); -int rh_getspriteinfo __P((struct grf_softc *gp, struct grf_spriteinfo *info)); -int rh_setspriteinfo __P((struct grf_softc *gp, struct grf_spriteinfo *info)); -int rh_getspritemax __P((struct grf_softc *gp, struct grf_position *pos)); -int rh_bitblt __P((struct grf_softc *gp, struct grf_bitblt *bb)); -int rh_blank __P((struct grf_softc *, int *)); +void RZ3DisableHWC(struct grf_softc *gp); +void RZ3SetupHWC(struct grf_softc *gp, unsigned char col1, unsigned int col2, unsigned char hsx, unsigned char hsy, const long unsigned int *data); +void RZ3AlphaErase(struct grf_softc *gp, short unsigned int xd, short unsigned int yd, short unsigned int w, short unsigned int h); +void RZ3AlphaCopy(struct grf_softc *gp, short unsigned int xs, short unsigned int ys, short unsigned int xd, short unsigned int yd, short unsigned int w, short unsigned int h); +void RZ3BitBlit(struct grf_softc *gp, struct grf_bitblt *gbb); +void RZ3BitBlit16(struct grf_softc *gp, struct grf_bitblt *gbb); +void RZ3BitBlit24(struct grf_softc *gp, struct grf_bitblt *gbb); +void RZ3SetCursorPos(struct grf_softc *gp, short unsigned int pos); +void RZ3LoadPalette(struct grf_softc *gp, unsigned char *pal, unsigned char firstcol, unsigned char colors); +void RZ3SetPalette(struct grf_softc *gp, unsigned char colornum, unsigned char red, unsigned char green, unsigned char blue); +void RZ3SetPanning(struct grf_softc *gp, short unsigned int xoff, short unsigned int yoff); +void RZ3SetHWCloc(struct grf_softc *gp, short unsigned int x, short unsigned int y); +int rh_mode(register struct grf_softc *gp, u_long cmd, void *arg, u_long a2, int a3); +int rh_ioctl(register struct grf_softc *gp, u_long cmd, void *data); +int rh_getcmap(struct grf_softc *gfp, struct grf_colormap *cmap); +int rh_putcmap(struct grf_softc *gfp, struct grf_colormap *cmap); +int rh_getspritepos(struct grf_softc *gp, struct grf_position *pos); +int rh_setspritepos(struct grf_softc *gp, struct grf_position *pos); +int rh_getspriteinfo(struct grf_softc *gp, struct grf_spriteinfo *info); +int rh_setspriteinfo(struct grf_softc *gp, struct grf_spriteinfo *info); +int rh_getspritemax(struct grf_softc *gp, struct grf_position *pos); +int rh_bitblt(struct grf_softc *gp, struct grf_bitblt *bb); +int rh_blank(struct grf_softc *, int *); struct ite_softc; -void rh_init __P((struct ite_softc *)); -void rh_cursor __P((struct ite_softc *, int)); -void rh_deinit __P((struct ite_softc *)); -void rh_putc __P((struct ite_softc *, int, int, int, int)); -void rh_clear __P((struct ite_softc *, int, int, int, int)); -void rh_scroll __P((struct ite_softc *, int, int, int, int)); - -int grfrh_cnprobe __P((void)); -void grfrh_iteinit __P((struct grf_softc *)); +void rh_init(struct ite_softc *); +void rh_cursor(struct ite_softc *, int); +void rh_deinit(struct ite_softc *); +void rh_putc(struct ite_softc *, int, int, int, int); +void rh_clear(struct ite_softc *, int, int, int, int); +void rh_scroll(struct ite_softc *, int, int, int, int); + +int grfrh_cnprobe(void); +void grfrh_iteinit(struct grf_softc *); #endif /* _GRF_RHREG_H */ diff --git a/sys/arch/amiga/dev/grf_rt.c b/sys/arch/amiga/dev/grf_rt.c index 27ba8c7506f..4d183276bf3 100644 --- a/sys/arch/amiga/dev/grf_rt.c +++ b/sys/arch/amiga/dev/grf_rt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_rt.c,v 1.11 1997/09/18 13:39:53 niklas Exp $ */ +/* $OpenBSD: grf_rt.c,v 1.12 2002/03/14 01:26:28 millert Exp $ */ /* $NetBSD: grf_rt.c,v 1.35 1997/07/29 17:52:09 veego Exp $ */ /* @@ -49,7 +49,7 @@ #include <amiga/dev/grfvar.h> #include <amiga/dev/grf_rtreg.h> -int rt_ioctl __P((struct grf_softc *gp, u_long, void *)); +int rt_ioctl(struct grf_softc *gp, u_long, void *); /* * marked true early so that retina_cnprobe() can tell if we are alive. @@ -258,8 +258,8 @@ static const long FQTab[16] = static struct MonDef *default_monitor = &DEFAULT_MONDEF; #endif -int retina_alive __P((struct MonDef *)); -int rt_load_mon __P((struct grf_softc *, struct MonDef *)); +int retina_alive(struct MonDef *); +int rt_load_mon(struct grf_softc *, struct MonDef *); /* @@ -764,22 +764,22 @@ rt_load_mon(gp, md) return(1); } -void grfrtattach __P((struct device *, struct device *, void *)); -int grfrtprint __P((void *, const char *)); -int grfrtmatch __P((struct device *, void *, void *)); +void grfrtattach(struct device *, struct device *, void *); +int grfrtprint(void *, const char *); +int grfrtmatch(struct device *, void *, void *); -int rt_mode __P((struct grf_softc *, u_long, void *, u_long, int)); -int rt_getvmode __P((struct grf_softc *, struct grfvideo_mode *)); -int rt_setvmode __P((struct grf_softc *, unsigned, int)); -int rt_getspritepos __P((struct grf_softc *, struct grf_position *)); -int rt_setspritepos __P((struct grf_softc *, struct grf_position *)); -int rt_getspriteinfo __P((struct grf_softc *, struct grf_spriteinfo *)); -int rt_setspriteinfo __P((struct grf_softc *, struct grf_spriteinfo *)); -int rt_getspritemax __P((struct grf_softc *, struct grf_position *)); -int rt_getcmap __P((struct grf_softc *, struct grf_colormap *)); -int rt_putcmap __P((struct grf_softc *, struct grf_colormap *)); -int rt_bitblt __P((struct grf_softc *, struct grf_bitblt *)); -int rt_blank __P((struct grf_softc *, int *)); +int rt_mode(struct grf_softc *, u_long, void *, u_long, int); +int rt_getvmode(struct grf_softc *, struct grfvideo_mode *); +int rt_setvmode(struct grf_softc *, unsigned, int); +int rt_getspritepos(struct grf_softc *, struct grf_position *); +int rt_setspritepos(struct grf_softc *, struct grf_position *); +int rt_getspriteinfo(struct grf_softc *, struct grf_spriteinfo *); +int rt_setspriteinfo(struct grf_softc *, struct grf_spriteinfo *); +int rt_getspritemax(struct grf_softc *, struct grf_position *); +int rt_getcmap(struct grf_softc *, struct grf_colormap *); +int rt_putcmap(struct grf_softc *, struct grf_colormap *); +int rt_bitblt(struct grf_softc *, struct grf_bitblt *); +int rt_blank(struct grf_softc *, int *); struct cfattach grfrt_ca = { sizeof(struct grf_softc), grfrtmatch, grfrtattach diff --git a/sys/arch/amiga/dev/grf_rtreg.h b/sys/arch/amiga/dev/grf_rtreg.h index bce7d302aee..c85fd1b2241 100644 --- a/sys/arch/amiga/dev/grf_rtreg.h +++ b/sys/arch/amiga/dev/grf_rtreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_rtreg.h,v 1.3 1998/04/17 15:55:52 niklas Exp $ */ +/* $OpenBSD: grf_rtreg.h,v 1.4 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: grf_rtreg.h,v 1.7 1996/04/21 21:11:23 veego Exp $ */ /* @@ -523,6 +523,6 @@ static __inline unsigned char RGfx(volatile void * ba, short idx) { return vgar (ba, GCT_ADDRESS_R); } -int grfrt_cnprobe __P((void)); -void grfrt_iteinit __P((struct grf_softc *)); +int grfrt_cnprobe(void); +void grfrt_iteinit(struct grf_softc *); #endif /* _GRF_RTREG_H */ diff --git a/sys/arch/amiga/dev/grf_ul.c b/sys/arch/amiga/dev/grf_ul.c index 42491fb5afb..5cc7dfbe856 100644 --- a/sys/arch/amiga/dev/grf_ul.c +++ b/sys/arch/amiga/dev/grf_ul.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_ul.c,v 1.13 1997/09/18 13:39:54 niklas Exp $ */ +/* $OpenBSD: grf_ul.c,v 1.14 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: grf_ul.c,v 1.24 1997/07/29 17:50:01 veego Exp $ */ #define UL_DEBUG @@ -58,19 +58,19 @@ extern u_int16_t tmscode[]; -int ul_ioctl __P((struct grf_softc *, u_long, void *, dev_t)); -int ul_getcmap __P((struct grf_softc *, struct grf_colormap *, dev_t)); -int ul_putcmap __P((struct grf_softc *, struct grf_colormap *, dev_t)); -int ul_bitblt __P((struct grf_softc *, struct grf_bitblt *, dev_t)); -int ul_blank __P((struct grf_softc *, int *, dev_t)); +int ul_ioctl(struct grf_softc *, u_long, void *, dev_t); +int ul_getcmap(struct grf_softc *, struct grf_colormap *, dev_t); +int ul_putcmap(struct grf_softc *, struct grf_colormap *, dev_t); +int ul_bitblt(struct grf_softc *, struct grf_bitblt *, dev_t); +int ul_blank(struct grf_softc *, int *, dev_t); -static int ulisr __P((void *)); -int ulowell_alive __P((struct grfvideo_mode *)); -static void ul_load_code __P((struct grf_softc *)); -static int ul_load_mon __P((struct grf_softc *, struct grfvideo_mode *)); -static int ul_getvmode __P((struct grf_softc *, struct grfvideo_mode *)); -static int ul_setvmode __P((struct grf_softc *, unsigned)); -static __inline void ul_setfb __P((struct grf_softc *, u_long)); +static int ulisr(void *); +int ulowell_alive(struct grfvideo_mode *); +static void ul_load_code(struct grf_softc *); +static int ul_load_mon(struct grf_softc *, struct grfvideo_mode *); +static int ul_getvmode(struct grf_softc *, struct grfvideo_mode *); +static int ul_setvmode(struct grf_softc *, unsigned); +static __inline void ul_setfb(struct grf_softc *, u_long); /* * marked true early so that ulowell_cnprobe() can tell if we are alive. @@ -436,11 +436,11 @@ ul_load_mon(gp, md) return(1); } -int ul_mode __P((struct grf_softc *, u_long, void *, u_long, int)); +int ul_mode(struct grf_softc *, u_long, void *, u_long, int); -void grfulattach __P((struct device *, struct device *, void *)); -int grfulprint __P((void *, const char *)); -int grfulmatch __P((struct device *, void *, void *)); +void grfulattach(struct device *, struct device *, void *); +int grfulprint(void *, const char *); +int grfulmatch(struct device *, void *, void *); struct cfattach grful_ca = { sizeof(struct grf_ul_softc), grfulmatch, grfulattach diff --git a/sys/arch/amiga/dev/grfabs.c b/sys/arch/amiga/dev/grfabs.c index d9d32b49a51..42a0dab825c 100644 --- a/sys/arch/amiga/dev/grfabs.c +++ b/sys/arch/amiga/dev/grfabs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grfabs.c,v 1.2 1996/05/02 06:43:53 niklas Exp $ */ +/* $OpenBSD: grfabs.c,v 1.3 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: grfabs.c,v 1.5 1996/04/21 21:11:25 veego Exp $ */ /* @@ -61,8 +61,8 @@ struct vbl_node grf_vbl_node; #define ABS(type, val) \ (type) (((int)(val) < 0) ? -(val) : (val)) -void grf_vbl_function __P((void *data)); -dmode_t *get_best_display_mode __P((u_long, u_long, u_char)); +void grf_vbl_function(void *data); +dmode_t *get_best_display_mode(u_long, u_long, u_char); void diff --git a/sys/arch/amiga/dev/grfabs_cc.c b/sys/arch/amiga/dev/grfabs_cc.c index cc8336eece8..9f150f4c146 100644 --- a/sys/arch/amiga/dev/grfabs_cc.c +++ b/sys/arch/amiga/dev/grfabs_cc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grfabs_cc.c,v 1.6 1997/09/10 20:56:42 niklas Exp $ */ +/* $OpenBSD: grfabs_cc.c,v 1.7 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: grfabs_cc.c,v 1.16 1997/06/10 18:30:28 veego Exp $ */ /* @@ -139,8 +139,8 @@ dmdata_t *h_this_data; #define AGA_VGA31KHZ 0x0020 int aga_enable = 0; /* set by start_c(), or can be patched */ -colormap_t *cc_alloc_aga_colormap __P((int)); -int cc_use_aga_colormap __P((view_t *, colormap_t *)); +colormap_t *cc_alloc_aga_colormap(int); +int cc_use_aga_colormap(view_t *, colormap_t *); #endif /* monitor functions. */ diff --git a/sys/arch/amiga/dev/grfabs_reg.h b/sys/arch/amiga/dev/grfabs_reg.h index 7f38b00b8f5..a5ff4156a44 100644 --- a/sys/arch/amiga/dev/grfabs_reg.h +++ b/sys/arch/amiga/dev/grfabs_reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: grfabs_reg.h,v 1.2 1996/05/02 06:43:58 niklas Exp $ */ +/* $OpenBSD: grfabs_reg.h,v 1.3 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: grfabs_reg.h,v 1.5 1996/04/21 21:11:31 veego Exp $ */ /* @@ -282,26 +282,26 @@ struct monitor { */ /* views */ -view_t * grf_alloc_view __P((dmode_t *d, dimen_t *dim, u_char depth)); -void grf_display_view __P((view_t *v)); -void grf_remove_view __P((view_t *v)); -void grf_free_view __P((view_t *v)); -dmode_t *grf_get_display_mode __P((view_t *v)); -int grf_get_colormap __P((view_t *v, colormap_t *cm)); -int grf_use_colormap __P((view_t *v, colormap_t *cm)); +view_t * grf_alloc_view(dmode_t *d, dimen_t *dim, u_char depth); +void grf_display_view(view_t *v); +void grf_remove_view(view_t *v); +void grf_free_view(view_t *v); +dmode_t *grf_get_display_mode(view_t *v); +int grf_get_colormap(view_t *v, colormap_t *cm); +int grf_use_colormap(view_t *v, colormap_t *cm); /* modes */ -view_t *grf_get_current_view __P((dmode_t *d)); -monitor_t *grf_get_monitor __P((dmode_t *d)); +view_t *grf_get_current_view(dmode_t *d); +monitor_t *grf_get_monitor(dmode_t *d); /* monitors */ -dmode_t * grf_get_next_mode __P((monitor_t *m, dmode_t *d)); -dmode_t * grf_get_current_mode __P((monitor_t *)); -dmode_t * grf_get_best_mode __P((monitor_t *m, dimen_t *size, u_char depth)); -bmap_t * grf_alloc_bitmap __P((monitor_t *m, u_short w, u_short h, - u_short d, u_short f)); -void grf_free_bitmap __P((monitor_t *m, bmap_t *bm)); - -int grfcc_probe __P((void)); +dmode_t * grf_get_next_mode(monitor_t *m, dmode_t *d); +dmode_t * grf_get_current_mode(monitor_t *); +dmode_t * grf_get_best_mode(monitor_t *m, dimen_t *size, u_char depth); +bmap_t * grf_alloc_bitmap(monitor_t *m, u_short w, u_short h, + u_short d, u_short f); +void grf_free_bitmap(monitor_t *m, bmap_t *bm); + +int grfcc_probe(void); #endif /* _GRFABS_REG_H */ diff --git a/sys/arch/amiga/dev/grfvar.h b/sys/arch/amiga/dev/grfvar.h index 1214823a31e..e1c46c7cdcb 100644 --- a/sys/arch/amiga/dev/grfvar.h +++ b/sys/arch/amiga/dev/grfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: grfvar.h,v 1.3 1996/05/29 10:15:23 niklas Exp $ */ +/* $OpenBSD: grfvar.h,v 1.4 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: grfvar.h,v 1.14 1996/05/19 21:05:54 veego Exp $ */ /* @@ -60,15 +60,15 @@ struct grf_softc { dev_t g_itedev; /* ite device number */ dev_t g_grfdev; /* grf device number */ caddr_t g_data; /* device dependent data */ - int (*g_mode) __P((struct grf_softc *, u_long, void *, - u_long, int)); + int (*g_mode)(struct grf_softc *, u_long, void *, + u_long, int); int g_conpri; /* priority of ite as console */ - void (*g_iteinit) __P((struct ite_softc *)); - void (*g_itedeinit) __P((struct ite_softc *)); - void (*g_iteclear) __P((struct ite_softc *,int,int,int,int)); - void (*g_iteputc) __P((struct ite_softc *,int,int,int,int)); - void (*g_itecursor) __P((struct ite_softc *,int)); - void (*g_itescroll) __P((struct ite_softc *,int,int,int,int)); + void (*g_iteinit)(struct ite_softc *); + void (*g_itedeinit)(struct ite_softc *); + void (*g_iteclear)(struct ite_softc *,int,int,int,int); + void (*g_iteputc)(struct ite_softc *,int,int,int,int); + void (*g_itecursor)(struct ite_softc *,int); + void (*g_itescroll)(struct ite_softc *,int,int,int,int); }; /* flags */ diff --git a/sys/arch/amiga/dev/gtsc.c b/sys/arch/amiga/dev/gtsc.c index 907dcd3bef7..a7661fe04db 100644 --- a/sys/arch/amiga/dev/gtsc.c +++ b/sys/arch/amiga/dev/gtsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gtsc.c,v 1.6 1997/01/18 12:26:29 niklas Exp $ */ +/* $OpenBSD: gtsc.c,v 1.7 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: gtsc.c,v 1.20 1996/12/23 09:10:11 veego Exp $ */ /* @@ -53,17 +53,17 @@ #include <amiga/dev/zbusvar.h> #include <amiga/dev/gvpbusvar.h> -void gtscattach __P((struct device *, struct device *, void *)); -int gtscmatch __P((struct device *, void *, void *)); +void gtscattach(struct device *, struct device *, void *); +int gtscmatch(struct device *, void *, void *); -void gtsc_enintr __P((struct sbic_softc *)); -void gtsc_dmastop __P((struct sbic_softc *)); -int gtsc_dmanext __P((struct sbic_softc *)); -int gtsc_dmaintr __P((void *)); -int gtsc_dmago __P((struct sbic_softc *, char *, int, int)); +void gtsc_enintr(struct sbic_softc *); +void gtsc_dmastop(struct sbic_softc *); +int gtsc_dmanext(struct sbic_softc *); +int gtsc_dmaintr(void *); +int gtsc_dmago(struct sbic_softc *, char *, int, int); #ifdef DEBUG -void gtsc_dump __P((void)); +void gtsc_dump(void); #endif struct scsi_adapter gtsc_scsiswitch = { diff --git a/sys/arch/amiga/dev/gvpbus.c b/sys/arch/amiga/dev/gvpbus.c index 3bc7a16f54f..845a1d03792 100644 --- a/sys/arch/amiga/dev/gvpbus.c +++ b/sys/arch/amiga/dev/gvpbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gvpbus.c,v 1.5 1997/01/16 09:24:32 niklas Exp $ */ +/* $OpenBSD: gvpbus.c,v 1.6 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: gvpbus.c,v 1.15 1996/12/23 09:10:12 veego Exp $ */ /* @@ -37,9 +37,9 @@ #include <amiga/dev/zbusvar.h> #include <amiga/dev/gvpbusvar.h> -void gvpbusattach __P((struct device *, struct device *, void *)); -int gvpbusmatch __P((struct device *, void *, void *)); -int gvpbusprint __P((void *auxp, const char *)); +void gvpbusattach(struct device *, struct device *, void *); +int gvpbusmatch(struct device *, void *, void *); +int gvpbusprint(void *auxp, const char *); extern int sbic_no_dma; /* Kludge for A1291 - mlh */ diff --git a/sys/arch/amiga/dev/idesc.c b/sys/arch/amiga/dev/idesc.c index fe9806f0bdf..648acdddbf6 100644 --- a/sys/arch/amiga/dev/idesc.c +++ b/sys/arch/amiga/dev/idesc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: idesc.c,v 1.10 1999/07/27 08:49:46 niklas Exp $ */ +/* $OpenBSD: idesc.c,v 1.11 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: idesc.c,v 1.29 1996/12/23 09:10:12 veego Exp $ */ /* @@ -235,22 +235,22 @@ struct idec_softc struct ide_softc sc_ide[2]; }; -int ide_scsicmd __P((struct scsi_xfer *)); +int ide_scsicmd(struct scsi_xfer *); -void idescattach __P((struct device *, struct device *, void *)); -int idescmatch __P((struct device *, void *, void *)); +void idescattach(struct device *, struct device *, void *); +int idescmatch(struct device *, void *, void *); -int ideicmd __P((struct idec_softc *, int, void *, int, void *, int)); -int idego __P((struct idec_softc *, struct scsi_xfer *)); -int idegetsense __P((struct idec_softc *, struct scsi_xfer *)); -void ideabort __P((struct idec_softc *, ide_regmap_p, char *)); -void ideerror __P((struct idec_softc *, ide_regmap_p, u_char)); -int idestart __P((struct idec_softc *)); -int idereset __P((struct idec_softc *)); -void idesetdelay __P((int)); -void ide_scsidone __P((struct idec_softc *, int)); -void ide_donextcmd __P((struct idec_softc *)); -int idesc_intr __P((void *)); +int ideicmd(struct idec_softc *, int, void *, int, void *, int); +int idego(struct idec_softc *, struct scsi_xfer *); +int idegetsense(struct idec_softc *, struct scsi_xfer *); +void ideabort(struct idec_softc *, ide_regmap_p, char *); +void ideerror(struct idec_softc *, ide_regmap_p, u_char); +int idestart(struct idec_softc *); +int idereset(struct idec_softc *); +void idesetdelay(int); +void ide_scsidone(struct idec_softc *, int); +void ide_donextcmd(struct idec_softc *); +int idesc_intr(void *); struct scsi_adapter idesc_scsiswitch = { ide_scsicmd, @@ -292,11 +292,11 @@ struct { * protos. */ -int idecommand __P((struct ide_softc *, int, int, int, int, int)); -int idewait __P((struct idec_softc *, int)); -int idegetctlr __P((struct ide_softc *)); -int ideiread __P((struct ide_softc *, long, u_char *, int)); -int ideiwrite __P((struct ide_softc *, long, u_char *, int)); +int idecommand(struct ide_softc *, int, int, int, int, int); +int idewait(struct idec_softc *, int); +int idegetctlr(struct ide_softc *); +int ideiread(struct ide_softc *, long, u_char *, int); +int ideiwrite(struct ide_softc *, long, u_char *, int); #define wait_for_drq(ide) idewait(ide, IDES_DRQ) #define wait_for_ready(ide) idewait(ide, IDES_READY | IDES_SEEKCMPLT) @@ -305,7 +305,7 @@ int ideiwrite __P((struct ide_softc *, long, u_char *, int)); int ide_no_int = 0; #ifdef DEBUG -void ide_dump_regs __P((ide_regmap_p)); +void ide_dump_regs(ide_regmap_p); int ide_debug = 0; diff --git a/sys/arch/amiga/dev/if_ae.c b/sys/arch/amiga/dev/if_ae.c index 633455ceac8..69ff4ff33a2 100644 --- a/sys/arch/amiga/dev/if_ae.c +++ b/sys/arch/amiga/dev/if_ae.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ae.c,v 1.13 2001/02/20 19:39:30 mickey Exp $ */ +/* $OpenBSD: if_ae.c,v 1.14 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: if_ae.c,v 1.14 1997/03/18 18:44:53 veego Exp $ */ /* @@ -133,25 +133,25 @@ struct ae_softc { /* offsets for: ID, REGS, MEM */ int aestd[] = { 0, 0x0370, 0x8000 }; -int aematch __P((struct device *, void *, void *)); -void aeattach __P((struct device *, struct device *, void *)); -void aewatchdog __P((struct ifnet *)); -void aestop __P((struct ae_softc *)); -void aememinit __P((struct ae_softc *)); -void aereset __P((struct ae_softc *)); -void aeinit __P((struct ae_softc *)); -void aestart __P((struct ifnet *)); -int aeintr __P((void *)); -void aetint __P((struct ae_softc *)); -void aerint __P((struct ae_softc *)); -void aeread __P((struct ae_softc *, u_char *, int)); -static void wcopyfrom __P((char *, char *, int)); -static void wcopyto __P((char *, char *, int)); -static void wzero __P((char *, int)); -int aeput __P((char *, struct mbuf *)); -struct mbuf *aeget __P((struct ae_softc *, u_char *, int)); -int aeioctl __P((struct ifnet *, u_long, caddr_t)); -void aesetladrf __P((struct arpcom *, u_int16_t *)); +int aematch(struct device *, void *, void *); +void aeattach(struct device *, struct device *, void *); +void aewatchdog(struct ifnet *); +void aestop(struct ae_softc *); +void aememinit(struct ae_softc *); +void aereset(struct ae_softc *); +void aeinit(struct ae_softc *); +void aestart(struct ifnet *); +int aeintr(void *); +void aetint(struct ae_softc *); +void aerint(struct ae_softc *); +void aeread(struct ae_softc *, u_char *, int); +static void wcopyfrom(char *, char *, int); +static void wcopyto(char *, char *, int); +static void wzero(char *, int); +int aeput(char *, struct mbuf *); +struct mbuf *aeget(struct ae_softc *, u_char *, int); +int aeioctl(struct ifnet *, u_long, caddr_t); +void aesetladrf(struct arpcom *, u_int16_t *); struct cfattach ae_ca = { sizeof(struct ae_softc), aematch, aeattach diff --git a/sys/arch/amiga/dev/if_bah.c b/sys/arch/amiga/dev/if_bah.c index 736c6677c9e..cb2d3f5f0e1 100644 --- a/sys/arch/amiga/dev/if_bah.c +++ b/sys/arch/amiga/dev/if_bah.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bah.c,v 1.9 2001/08/20 19:35:18 miod Exp $ */ +/* $OpenBSD: if_bah.c,v 1.10 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: if_bah.c,v 1.30 1997/04/04 06:27:32 is Exp $ */ /* @@ -178,20 +178,20 @@ struct bah_softc { #endif }; -int bah_zbus_match __P((struct device *, void *, void *)); -void bah_zbus_attach __P((struct device *, struct device *, void *)); -void bah_init __P((struct bah_softc *)); -void bah_reset __P((struct bah_softc *)); -void bah_stop __P((struct bah_softc *)); -void bah_start __P((struct ifnet *)); -int bahintr __P((void *)); -int bah_ioctl __P((struct ifnet *, unsigned long, caddr_t)); -void bah_watchdog __P((struct ifnet *)); -void movepout __P((u_char *from, u_char __volatile *to, int len)); -void movepin __P((u_char __volatile *from, u_char *to, int len)); -void bah_srint __P((void *vsc, void *dummy)); -void callstart __P((void *vsc, void *dummy)); -__inline static void bah_tint __P((struct bah_softc *, int)); +int bah_zbus_match(struct device *, void *, void *); +void bah_zbus_attach(struct device *, struct device *, void *); +void bah_init(struct bah_softc *); +void bah_reset(struct bah_softc *); +void bah_stop(struct bah_softc *); +void bah_start(struct ifnet *); +int bahintr(void *); +int bah_ioctl(struct ifnet *, unsigned long, caddr_t); +void bah_watchdog(struct ifnet *); +void movepout(u_char *from, u_char __volatile *to, int len); +void movepin(u_char __volatile *from, u_char *to, int len); +void bah_srint(void *vsc, void *dummy); +void callstart(void *vsc, void *dummy); +__inline static void bah_tint(struct bah_softc *, int); void bah_reconwatch(void *); struct cfattach bah_zbus_ca = { diff --git a/sys/arch/amiga/dev/if_ed.c b/sys/arch/amiga/dev/if_ed.c index beb3f2fe37f..27f9554c598 100644 --- a/sys/arch/amiga/dev/if_ed.c +++ b/sys/arch/amiga/dev/if_ed.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ed.c,v 1.13 2001/02/20 19:39:29 mickey Exp $ */ +/* $OpenBSD: if_ed.c,v 1.14 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: if_ed.c,v 1.26 1997/03/17 17:51:42 is Exp $ */ /* @@ -96,30 +96,30 @@ struct ed_softc { u_char next_packet; /* pointer to next unread RX packet */ }; -int ed_zbus_match __P((struct device *, void *, void *)); -void ed_zbus_attach __P((struct device *, struct device *, void *)); -int edintr __P((void *)); -int ed_ioctl __P((struct ifnet *, u_long, caddr_t)); -void ed_start __P((struct ifnet *)); -void ed_watchdog __P((struct ifnet *)); -void ed_reset __P((struct ed_softc *)); -void ed_init __P((struct ed_softc *)); -void ed_stop __P((struct ed_softc *)); -void ed_getmcaf __P((struct arpcom *, u_long *)); -u_short ed_put __P((struct ed_softc *, struct mbuf *, caddr_t)); +int ed_zbus_match(struct device *, void *, void *); +void ed_zbus_attach(struct device *, struct device *, void *); +int edintr(void *); +int ed_ioctl(struct ifnet *, u_long, caddr_t); +void ed_start(struct ifnet *); +void ed_watchdog(struct ifnet *); +void ed_reset(struct ed_softc *); +void ed_init(struct ed_softc *); +void ed_stop(struct ed_softc *); +void ed_getmcaf(struct arpcom *, u_long *); +u_short ed_put(struct ed_softc *, struct mbuf *, caddr_t); #define inline /* XXX for debugging purposes */ -void ed_get_packet __P((struct ed_softc *, caddr_t, u_short)); -static inline void ed_rint __P((struct ed_softc *)); -static inline void ed_xmit __P((struct ed_softc *)); -static inline caddr_t ed_ring_copy __P((struct ed_softc *, caddr_t, caddr_t, - u_short)); +void ed_get_packet(struct ed_softc *, caddr_t, u_short); +static inline void ed_rint(struct ed_softc *); +static inline void ed_xmit(struct ed_softc *); +static inline caddr_t ed_ring_copy(struct ed_softc *, caddr_t, caddr_t, + u_short); -static inline void NIC_PUT __P((struct ed_softc *, int, u_char)); -static inline u_char NIC_GET __P((struct ed_softc *, int)); -static inline void word_copy __P((caddr_t, caddr_t, int)); -struct mbuf *ed_ring_to_mbuf __P((struct ed_softc *, caddr_t, struct mbuf *, u_short)); +static inline void NIC_PUT(struct ed_softc *, int, u_char); +static inline u_char NIC_GET(struct ed_softc *, int); +static inline void word_copy(caddr_t, caddr_t, int); +struct mbuf *ed_ring_to_mbuf(struct ed_softc *, caddr_t, struct mbuf *, u_short); struct cfattach ed_zbus_ca = { sizeof(struct ed_softc), ed_zbus_match, ed_zbus_attach diff --git a/sys/arch/amiga/dev/if_es.c b/sys/arch/amiga/dev/if_es.c index b1afabb0ba6..8eac6515195 100644 --- a/sys/arch/amiga/dev/if_es.c +++ b/sys/arch/amiga/dev/if_es.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_es.c,v 1.12 2001/02/20 19:39:29 mickey Exp $ */ +/* $OpenBSD: if_es.c,v 1.13 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: if_es.c,v 1.16 1996/12/23 09:10:17 veego Exp $ */ /* @@ -110,21 +110,21 @@ int estxint2 = 0; /* IST_TX active after IST_TX_EMPTY */ int estxint3 = 0; /* IST_TX interrupt processed */ int estxint4 = 0; /* ~TEMPTY counts */ int estxint5 = 0; /* IST_TX_EMPTY interrupts */ -void es_dump_smcregs __P((char *, union smcregs *)); +void es_dump_smcregs(char *, union smcregs *); #endif -int esintr __P((void *)); -void esstart __P((struct ifnet *)); -void eswatchdog __P((struct ifnet *)); -int esioctl __P((struct ifnet *, u_long, caddr_t)); -void esrint __P((struct es_softc *)); -void estint __P((struct es_softc *)); -void esinit __P((struct es_softc *)); -void esreset __P((struct es_softc *)); -void esstop __P((struct es_softc *)); - -int esmatch __P((struct device *, void *, void *)); -void esattach __P((struct device *, struct device *, void *)); +int esintr(void *); +void esstart(struct ifnet *); +void eswatchdog(struct ifnet *); +int esioctl(struct ifnet *, u_long, caddr_t); +void esrint(struct es_softc *); +void estint(struct es_softc *); +void esinit(struct es_softc *); +void esreset(struct es_softc *); +void esstop(struct es_softc *); + +int esmatch(struct device *, void *, void *); +void esattach(struct device *, struct device *, void *); struct cfattach es_ca = { sizeof(struct es_softc), esmatch, esattach diff --git a/sys/arch/amiga/dev/if_le_zbus.c b/sys/arch/amiga/dev/if_le_zbus.c index 68523abac19..d0154391c16 100644 --- a/sys/arch/amiga/dev/if_le_zbus.c +++ b/sys/arch/amiga/dev/if_le_zbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_zbus.c,v 1.8 1998/09/16 22:41:16 jason Exp $ */ +/* $OpenBSD: if_le_zbus.c,v 1.9 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: if_le.c,v 1.22 1996/12/23 09:10:18 veego Exp $ */ /*- @@ -73,15 +73,15 @@ /* offsets for: ID, REGS, MEM */ int lestd[] = { 0, 0x4000, 0x8000 }; -int le_zbus_match __P((struct device *, void *, void *)); -void le_zbus_attach __P((struct device *, struct device *, void *)); +int le_zbus_match(struct device *, void *, void *); +void le_zbus_attach(struct device *, struct device *, void *); struct cfattach le_zbus_ca = { sizeof(struct le_softc), le_zbus_match, le_zbus_attach }; -hide void lewrcsr __P((struct am7990_softc *, u_int16_t, u_int16_t)); -hide u_int16_t lerdcsr __P((struct am7990_softc *, u_int16_t)); +hide void lewrcsr(struct am7990_softc *, u_int16_t, u_int16_t); +hide u_int16_t lerdcsr(struct am7990_softc *, u_int16_t); hide void lewrcsr(sc, port, val) diff --git a/sys/arch/amiga/dev/if_ne_zbus.c b/sys/arch/amiga/dev/if_ne_zbus.c index 76ff6e86cea..c771de75b7b 100644 --- a/sys/arch/amiga/dev/if_ne_zbus.c +++ b/sys/arch/amiga/dev/if_ne_zbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ne_zbus.c,v 1.2 2001/03/12 05:36:57 aaron Exp $ */ +/* $OpenBSD: if_ne_zbus.c,v 1.3 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: if_ne_zbus.c,v 1.5 2000/01/23 21:06:13 aymeric Exp $ */ /*- @@ -76,14 +76,14 @@ #include <amiga/dev/zbusvar.h> #ifdef __NetBSD__ -int ne_zbus_match __P((struct device *, struct cfdata *, void *)); +int ne_zbus_match(struct device *, struct cfdata *, void *); #else -int ne_zbus_match __P((struct device *, void *, void *)); +int ne_zbus_match(struct device *, void *, void *); #endif -void ne_zbus_attach __P((struct device *, struct device *, void *)); -int ne_zbus_map __P((bus_space_tag_t, bus_addr_t, bus_size_t, int, - bus_space_handle_t *)); -int ne_zbus_unmap __P((bus_space_tag_t, bus_space_handle_t, bus_size_t)); +void ne_zbus_attach(struct device *, struct device *, void *); +int ne_zbus_map(bus_space_tag_t, bus_addr_t, bus_size_t, int, + bus_space_handle_t *); +int ne_zbus_unmap(bus_space_tag_t, bus_space_handle_t, bus_size_t); struct ne_zbus_softc { struct ne2000_softc sc_ne2000; diff --git a/sys/arch/amiga/dev/if_qn.c b/sys/arch/amiga/dev/if_qn.c index 5d2f9d91a9e..e469d8ffc11 100644 --- a/sys/arch/amiga/dev/if_qn.c +++ b/sys/arch/amiga/dev/if_qn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_qn.c,v 1.14 2001/06/29 08:18:19 jj Exp $ */ +/* $OpenBSD: if_qn.c,v 1.15 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: if_qn.c,v 1.10 1996/12/23 09:10:19 veego Exp $ */ /* @@ -157,23 +157,23 @@ struct qn_softc { #endif -int qnmatch __P((struct device *, void *, void *)); -void qnattach __P((struct device *, struct device *, void *)); -int qnintr __P((void *)); -int qnioctl __P((struct ifnet *, u_long, caddr_t)); -void qnstart __P((struct ifnet *)); -void qnwatchdog __P((struct ifnet *)); -void qnreset __P((struct qn_softc *)); -void qninit __P((struct qn_softc *)); -void qnstop __P((struct qn_softc *)); -static u_short qn_put __P((u_short volatile *, struct mbuf *)); -static void qn_rint __P((struct qn_softc *, u_short)); -static void qn_flush __P((struct qn_softc *)); -static void __inline word_copy_from_card __P((u_short volatile *, u_short *, u_short)); -static void __inline word_copy_to_card __P((u_short *, u_short volatile *, u_short)); -void qn_get_packet __P((struct qn_softc *, u_short)); +int qnmatch(struct device *, void *, void *); +void qnattach(struct device *, struct device *, void *); +int qnintr(void *); +int qnioctl(struct ifnet *, u_long, caddr_t); +void qnstart(struct ifnet *); +void qnwatchdog(struct ifnet *); +void qnreset(struct qn_softc *); +void qninit(struct qn_softc *); +void qnstop(struct qn_softc *); +static u_short qn_put(u_short volatile *, struct mbuf *); +static void qn_rint(struct qn_softc *, u_short); +static void qn_flush(struct qn_softc *); +static void __inline word_copy_from_card(u_short volatile *, u_short *, u_short); +static void __inline word_copy_to_card(u_short *, u_short volatile *, u_short); +void qn_get_packet(struct qn_softc *, u_short); #ifdef QN_DEBUG1 -static void qn_dump __P((struct qn_softc *)); +static void qn_dump(struct qn_softc *); #endif struct cfattach qn_ca = { diff --git a/sys/arch/amiga/dev/ite.c b/sys/arch/amiga/dev/ite.c index 99fb5472151..36182778fc0 100644 --- a/sys/arch/amiga/dev/ite.c +++ b/sys/arch/amiga/dev/ite.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ite.c,v 1.14 2001/08/20 19:35:18 miod Exp $ */ +/* $OpenBSD: ite.c,v 1.15 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: ite.c,v 1.47 1996/12/23 09:10:20 veego Exp $ */ /* @@ -116,39 +116,39 @@ static char sample[20] = { -39,-75,-103,-121,-127,-121,-103,-75,-39 }; -static char *index __P((const char *, char)); -static void ite_sifilter __P((void *, void *)); -void iteputchar __P((int c, struct ite_softc *ip)); -void ite_putstr __P((const char * s, int len, dev_t dev)); -void iteattach __P((struct device *, struct device *, void *)); -int itematch __P((struct device *, void *, void *)); -static void iteprecheckwrap __P((struct ite_softc *)); -static void itecheckwrap __P((struct ite_softc *)); -struct ite_softc *getitesp __P((dev_t)); -void init_bell __P((void)); -void ite_bell __P((void)); -void itecnpollc __P((dev_t, int)); -static void repeat_handler __P((void *)); -inline static void ite_sendstr __P((char *)); -static void alignment_display __P((struct ite_softc *)); -inline static void snap_cury __P((struct ite_softc *)); -inline static void ite_dnchar __P((struct ite_softc *, int)); -inline static void ite_inchar __P((struct ite_softc *, int)); -inline static void ite_clrtoeol __P((struct ite_softc *)); -inline static void ite_clrtobol __P((struct ite_softc *)); -inline static void ite_clrline __P((struct ite_softc *)); -inline static void ite_clrtoeos __P((struct ite_softc *)); -inline static void ite_clrtobos __P((struct ite_softc *)); -inline static void ite_clrscreen __P((struct ite_softc *)); -inline static void ite_dnline __P((struct ite_softc *, int)); -inline static void ite_inline __P((struct ite_softc *, int)); -inline static void ite_lf __P((struct ite_softc *)); -inline static void ite_crlf __P((struct ite_softc *)); -inline static void ite_cr __P((struct ite_softc *)); -inline static void ite_rlf __P((struct ite_softc *)); -inline static int atoi __P((const char *)); -inline static int ite_argnum __P((struct ite_softc *)); -inline static int ite_zargnum __P((struct ite_softc *)); +static char *index(const char *, char); +static void ite_sifilter(void *, void *); +void iteputchar(int c, struct ite_softc *ip); +void ite_putstr(const char * s, int len, dev_t dev); +void iteattach(struct device *, struct device *, void *); +int itematch(struct device *, void *, void *); +static void iteprecheckwrap(struct ite_softc *); +static void itecheckwrap(struct ite_softc *); +struct ite_softc *getitesp(dev_t); +void init_bell(void); +void ite_bell(void); +void itecnpollc(dev_t, int); +static void repeat_handler(void *); +inline static void ite_sendstr(char *); +static void alignment_display(struct ite_softc *); +inline static void snap_cury(struct ite_softc *); +inline static void ite_dnchar(struct ite_softc *, int); +inline static void ite_inchar(struct ite_softc *, int); +inline static void ite_clrtoeol(struct ite_softc *); +inline static void ite_clrtobol(struct ite_softc *); +inline static void ite_clrline(struct ite_softc *); +inline static void ite_clrtoeos(struct ite_softc *); +inline static void ite_clrtobos(struct ite_softc *); +inline static void ite_clrscreen(struct ite_softc *); +inline static void ite_dnline(struct ite_softc *, int); +inline static void ite_inline(struct ite_softc *, int); +inline static void ite_lf(struct ite_softc *); +inline static void ite_crlf(struct ite_softc *); +inline static void ite_cr(struct ite_softc *); +inline static void ite_rlf(struct ite_softc *); +inline static int atoi(const char *); +inline static int ite_argnum(struct ite_softc *); +inline static int ite_zargnum(struct ite_softc *); struct cfattach ite_ca = { sizeof(struct ite_softc), itematch, iteattach diff --git a/sys/arch/amiga/dev/ite_blank.c b/sys/arch/amiga/dev/ite_blank.c index 14606e4b1e2..da33330eb04 100644 --- a/sys/arch/amiga/dev/ite_blank.c +++ b/sys/arch/amiga/dev/ite_blank.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ite_blank.c,v 1.2 2001/08/20 19:35:18 miod Exp $ */ +/* $OpenBSD: ite_blank.c,v 1.3 2002/03/14 01:26:29 millert Exp $ */ /*- * Copyright (c) 1999 Marc Espie. * @@ -40,8 +40,8 @@ #define SUBR_BLANK(ip, mode) ((ip)->grf->g_mode((ip)->grf, GM_GRFIOCTL, &(mode), GRFIOCBLANK, (ip)->grf->g_grfdev )) -void ite_blank __P((void *)); -void ite_unblank __P((struct ite_softc *)); +void ite_blank(void *); +void ite_unblank(struct ite_softc *); static int blanked_screen = 0; static int blank_enabled = 0; diff --git a/sys/arch/amiga/dev/ite_blank.h b/sys/arch/amiga/dev/ite_blank.h index 34505dcba70..0609c0dc72e 100644 --- a/sys/arch/amiga/dev/ite_blank.h +++ b/sys/arch/amiga/dev/ite_blank.h @@ -1,7 +1,7 @@ -/* $OpenBSD: ite_blank.h,v 1.1 1999/11/05 17:15:34 espie Exp $ */ -void ite_restart_blanker __P((struct ite_softc *)); -void ite_reset_blanker __P((struct ite_softc *)); -void ite_disable_blanker __P((struct ite_softc *)); -void ite_enable_blanker __P((struct ite_softc *)); +/* $OpenBSD: ite_blank.h,v 1.2 2002/03/14 01:26:29 millert Exp $ */ +void ite_restart_blanker(struct ite_softc *); +void ite_reset_blanker(struct ite_softc *); +void ite_disable_blanker(struct ite_softc *); +void ite_enable_blanker(struct ite_softc *); extern int blank_time; diff --git a/sys/arch/amiga/dev/ite_cc.c b/sys/arch/amiga/dev/ite_cc.c index ada8711ce77..42e3d3fa89b 100644 --- a/sys/arch/amiga/dev/ite_cc.c +++ b/sys/arch/amiga/dev/ite_cc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ite_cc.c,v 1.2 1996/05/02 06:44:10 niklas Exp $ */ +/* $OpenBSD: ite_cc.c,v 1.3 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: ite_cc.c,v 1.25 1996/04/21 21:11:54 veego Exp $ */ /* @@ -101,15 +101,15 @@ struct ite_priv { }; typedef struct ite_priv ipriv_t; -void view_deinit __P((struct ite_softc *)); -void view_init __P((struct ite_softc *)); +void view_deinit(struct ite_softc *); +void view_init(struct ite_softc *); -static void putc8 __P((struct ite_softc *, int, int, int, int)); -static void clear8 __P((struct ite_softc *, int, int, int, int)); -static void scroll8 __P((struct ite_softc *, int, int, int, int)); -static void cursor32 __P((struct ite_softc *, int)); -static void scrollbmap __P((bmap_t *, u_short, u_short, u_short, u_short, - short, short, u_char)); +static void putc8(struct ite_softc *, int, int, int, int); +static void clear8(struct ite_softc *, int, int, int, int); +static void scroll8(struct ite_softc *, int, int, int, int); +static void cursor32(struct ite_softc *, int); +static void scrollbmap(bmap_t *, u_short, u_short, u_short, u_short, + short, short, u_char); /* patchable */ int ite_default_x = 0; /* def leftedge offset */ @@ -124,23 +124,23 @@ int ite_default_height = 512; /* def PAL height */ int ite_default_height = 400; /* def NON-PAL/NTSC height (?) */ #endif -int ite_newsize __P((struct ite_softc *, struct itewinsize *)); -static void putc_nm __P((ipriv_t *, u_char *, u_char *, u_int, u_int, - u_int, u_int)); -static void putc_in __P((ipriv_t *, u_char *, u_char *, u_int, u_int, - u_int, u_int)); -static void putc_ul __P((ipriv_t *, u_char *, u_char *, u_int, u_int, - u_int, u_int)); -static void putc_ul_in __P((ipriv_t *, u_char *, u_char *, u_int, u_int, - u_int, u_int)); -static void putc_bd __P((ipriv_t *, u_char *, u_char *, u_int, u_int, - u_int, u_int)); -static void putc_bd_in __P((ipriv_t *, u_char *, u_char *, u_int, u_int, - u_int, u_int)); -static void putc_bd_ul __P((ipriv_t *, u_char *, u_char *, u_int, u_int, - u_int, u_int)); -static void putc_bd_ul_in __P((ipriv_t *, u_char *, u_char *, u_int, u_int, - u_int, u_int)); +int ite_newsize(struct ite_softc *, struct itewinsize *); +static void putc_nm(ipriv_t *, u_char *, u_char *, u_int, u_int, + u_int, u_int); +static void putc_in(ipriv_t *, u_char *, u_char *, u_int, u_int, + u_int, u_int); +static void putc_ul(ipriv_t *, u_char *, u_char *, u_int, u_int, + u_int, u_int); +static void putc_ul_in(ipriv_t *, u_char *, u_char *, u_int, u_int, + u_int, u_int); +static void putc_bd(ipriv_t *, u_char *, u_char *, u_int, u_int, + u_int, u_int); +static void putc_bd_in(ipriv_t *, u_char *, u_char *, u_int, u_int, + u_int, u_int); +static void putc_bd_ul(ipriv_t *, u_char *, u_char *, u_int, u_int, + u_int, u_int); +static void putc_bd_ul_in(ipriv_t *, u_char *, u_char *, u_int, u_int, + u_int, u_int); /* * called from grf_cc to return console priority @@ -680,8 +680,8 @@ putc_bd_ul_in (cci,p,f,co,ro,fw,fh) } -typedef void cc_putc_func __P((ipriv_t *, u_char *, u_char *, u_int, u_int, - u_int, u_int)); +typedef void cc_putc_func(ipriv_t *, u_char *, u_char *, u_int, u_int, + u_int, u_int); cc_putc_func *put_func[ATTR_ALL+1] = { putc_nm, diff --git a/sys/arch/amiga/dev/ite_cl.c b/sys/arch/amiga/dev/ite_cl.c index 84ad8d6e369..43ffc670e69 100644 --- a/sys/arch/amiga/dev/ite_cl.c +++ b/sys/arch/amiga/dev/ite_cl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ite_cl.c,v 1.4 2000/12/15 17:41:45 espie Exp $ */ +/* $OpenBSD: ite_cl.c,v 1.5 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: ite_cl.c,v 1.3.2.1 1999/06/28 23:22:17 perry Exp $ */ /* @@ -58,13 +58,13 @@ int cl_console = 1; int cl_console = 0; #endif -void cl_init __P((struct ite_softc *ip)); -void cl_cursor __P((struct ite_softc *ip, int flag)); -void cl_deinit __P((struct ite_softc *ip)); -void cl_putc __P((struct ite_softc *ip, int c, int dy, int dx, int mode)); -void cl_clear __P((struct ite_softc *ip, int sy, int sx, int h, int w)); -void cl_scroll __P((struct ite_softc *ip, int sy, int sx, int count, - int dir)); +void cl_init(struct ite_softc *ip); +void cl_cursor(struct ite_softc *ip, int flag); +void cl_deinit(struct ite_softc *ip); +void cl_putc(struct ite_softc *ip, int c, int dy, int dx, int mode); +void cl_clear(struct ite_softc *ip, int sy, int sx, int h, int w); +void cl_scroll(struct ite_softc *ip, int sy, int sx, int count, + int dir); /* diff --git a/sys/arch/amiga/dev/ite_cv.c b/sys/arch/amiga/dev/ite_cv.c index 0edbb26a527..e2757252906 100644 --- a/sys/arch/amiga/dev/ite_cv.c +++ b/sys/arch/amiga/dev/ite_cv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ite_cv.c,v 1.3 1996/05/29 10:15:28 niklas Exp $ */ +/* $OpenBSD: ite_cv.c,v 1.4 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: ite_cv.c,v 1.3 1996/05/19 21:05:58 veego Exp $ */ /* @@ -60,12 +60,12 @@ #include <amiga/dev/grfvar.h> #include <amiga/dev/grf_cvreg.h> -void cv_ite_init __P((struct ite_softc *)); -void cv_ite_deinit __P((struct ite_softc *)); -static void cv_cursor __P((struct ite_softc *, int)); -static void cv_putc __P((struct ite_softc *, int, int, int, int)); -static void cv_clear __P((struct ite_softc *, int, int, int, int)); -static void cv_scroll __P((struct ite_softc *, int, int, int, int)); +void cv_ite_init(struct ite_softc *); +void cv_ite_deinit(struct ite_softc *); +static void cv_cursor(struct ite_softc *, int); +static void cv_putc(struct ite_softc *, int, int, int, int); +static void cv_clear(struct ite_softc *, int, int, int, int); +static void cv_scroll(struct ite_softc *, int, int, int, int); /* * called from grf_cv to return console priority diff --git a/sys/arch/amiga/dev/ite_et.c b/sys/arch/amiga/dev/ite_et.c index 2a45cd6bc43..fee6799f731 100644 --- a/sys/arch/amiga/dev/ite_et.c +++ b/sys/arch/amiga/dev/ite_et.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ite_et.c,v 1.4 1997/09/18 13:39:58 niklas Exp $ */ +/* $OpenBSD: ite_et.c,v 1.5 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: ite_et.c,v 1.3 1997/03/05 22:50:41 veego Exp $ */ /* @@ -58,13 +58,13 @@ int et_console = 1; int et_console = 0; #endif -void et_init __P((struct ite_softc *ip)); -void et_cursor __P((struct ite_softc *ip, int flag)); -void et_deinit __P((struct ite_softc *ip)); -void et_putc __P((struct ite_softc *ip, int c, int dy, int dx, int mode)); -void et_clear __P((struct ite_softc *ip, int sy, int sx, int h, int w)); -void et_scroll __P((struct ite_softc *ip, int sy, int sx, int count, - int dir)); +void et_init(struct ite_softc *ip); +void et_cursor(struct ite_softc *ip, int flag); +void et_deinit(struct ite_softc *ip); +void et_putc(struct ite_softc *ip, int c, int dy, int dx, int mode); +void et_clear(struct ite_softc *ip, int sy, int sx, int h, int w); +void et_scroll(struct ite_softc *ip, int sy, int sx, int count, + int dir); static void etbcopy(const void *src, void *dst, size_t len); diff --git a/sys/arch/amiga/dev/ite_rh.c b/sys/arch/amiga/dev/ite_rh.c index caf4c4c681b..978d586e9a3 100644 --- a/sys/arch/amiga/dev/ite_rh.c +++ b/sys/arch/amiga/dev/ite_rh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ite_rh.c,v 1.2 1996/05/02 06:44:13 niklas Exp $ */ +/* $OpenBSD: ite_rh.c,v 1.3 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: ite_rh.c,v 1.7 1996/04/23 22:53:05 veego Exp $ */ /* @@ -50,8 +50,8 @@ #include <amiga/dev/itevar.h> #ifdef RETINA_SPEED_HACK -static void screen_up __P((struct ite_softc *, int, int, int)); -static void screen_down __P((struct ite_softc *, int, int, int)); +static void screen_up(struct ite_softc *, int, int, int); +static void screen_down(struct ite_softc *, int, int, int); #endif /* diff --git a/sys/arch/amiga/dev/ite_rt.c b/sys/arch/amiga/dev/ite_rt.c index f4ba9cebb94..a669b9a4f67 100644 --- a/sys/arch/amiga/dev/ite_rt.c +++ b/sys/arch/amiga/dev/ite_rt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ite_rt.c,v 1.2 1996/05/02 06:44:14 niklas Exp $ */ +/* $OpenBSD: ite_rt.c,v 1.3 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: ite_rt.c,v 1.16 1996/04/23 22:53:12 veego Exp $ */ /* @@ -51,16 +51,16 @@ int retina_console = 1; -void retina_cursor __P((struct ite_softc *,int)); -void retina_scroll __P((struct ite_softc *,int,int,int,int)); -void retina_deinit __P((struct ite_softc *)); -void retina_clear __P((struct ite_softc *,int,int,int,int)); -void retina_putc __P((struct ite_softc *,int,int,int,int)); -void retina_init __P((struct ite_softc *)); +void retina_cursor(struct ite_softc *,int); +void retina_scroll(struct ite_softc *,int,int,int,int); +void retina_deinit(struct ite_softc *); +void retina_clear(struct ite_softc *,int,int,int,int); +void retina_putc(struct ite_softc *,int,int,int,int); +void retina_init(struct ite_softc *); #ifdef RETINA_SPEED_HACK -static void screen_up __P((struct ite_softc *, int, int, int)); -static void screen_down __P((struct ite_softc *, int, int, int)); +static void screen_up(struct ite_softc *, int, int, int); +static void screen_down(struct ite_softc *, int, int, int); #endif /* diff --git a/sys/arch/amiga/dev/ite_ul.c b/sys/arch/amiga/dev/ite_ul.c index 0e6646c5ac7..5a7b4ad61f8 100644 --- a/sys/arch/amiga/dev/ite_ul.c +++ b/sys/arch/amiga/dev/ite_ul.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ite_ul.c,v 1.4 1997/01/16 09:24:52 niklas Exp $ */ +/* $OpenBSD: ite_ul.c,v 1.5 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: ite_ul.c,v 1.7 1996/10/13 03:07:20 christos Exp $ */ /* @@ -86,15 +86,15 @@ extern u_int8_t kernel_font[], kernel_cursor[]; int ulowell_console = 1; -void ulowell_cursor __P((struct ite_softc *,int)); -void ulowell_scroll __P((struct ite_softc *,int,int,int,int)); -void ulowell_deinit __P((struct ite_softc *)); -void ulowell_clear __P((struct ite_softc *,int,int,int,int)); -void ulowell_putc __P((struct ite_softc *,int,int,int,int)); -void ulowell_init __P((struct ite_softc *)); +void ulowell_cursor(struct ite_softc *,int); +void ulowell_scroll(struct ite_softc *,int,int,int,int); +void ulowell_deinit(struct ite_softc *); +void ulowell_clear(struct ite_softc *,int,int,int,int); +void ulowell_putc(struct ite_softc *,int,int,int,int); +void ulowell_init(struct ite_softc *); #ifdef DEBUG_UL -void gsp_dump __P((u_int16_t *,int)); +void gsp_dump(u_int16_t *,int); #endif /* Text always on overlay plane, so: */ diff --git a/sys/arch/amiga/dev/itevar.h b/sys/arch/amiga/dev/itevar.h index 529ab8c4269..357569bef8c 100644 --- a/sys/arch/amiga/dev/itevar.h +++ b/sys/arch/amiga/dev/itevar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: itevar.h,v 1.4 2001/08/20 19:35:18 miod Exp $ */ +/* $OpenBSD: itevar.h,v 1.5 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: itevar.h,v 1.14 1996/04/21 21:12:03 veego Exp $ */ /* @@ -194,29 +194,29 @@ struct consdev; struct termios; /* console related function */ -void itecnprobe __P((struct consdev *)); -void itecninit __P((struct consdev *)); -int itecngetc __P((dev_t)); -void itecnputc __P((dev_t, int)); -void ite_cnfinish __P((struct ite_softc *)); +void itecnprobe(struct consdev *); +void itecninit(struct consdev *); +int itecngetc(dev_t); +void itecnputc(dev_t, int); +void ite_cnfinish(struct ite_softc *); /* standard ite device entry points. */ -void iteinit __P((dev_t)); -int iteopen __P((dev_t, int, int, struct proc *)); -int iteclose __P((dev_t, int, int, struct proc *)); -int iteread __P((dev_t, struct uio *, int)); -int itewrite __P((dev_t, struct uio *, int)); -int iteioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); -void itestart __P((struct tty *)); +void iteinit(dev_t); +int iteopen(dev_t, int, int, struct proc *); +int iteclose(dev_t, int, int, struct proc *); +int iteread(dev_t, struct uio *, int); +int itewrite(dev_t, struct uio *, int); +int iteioctl(dev_t, u_long, caddr_t, int, struct proc *); +void itestart(struct tty *); /* ite functions */ -int ite_on __P((dev_t, int)); -void ite_off __P((dev_t, int)); -void ite_reinit __P((dev_t)); -int ite_param __P((struct tty *, struct termios *)); -void ite_reset __P((struct ite_softc *)); -int ite_cnfilter __P((u_char, enum caller)); -void ite_filter __P((u_char ,enum caller)); -int ite_grf_ioctl __P((struct ite_softc *, u_long, caddr_t, int, struct proc *)); +int ite_on(dev_t, int); +void ite_off(dev_t, int); +void ite_reinit(dev_t); +int ite_param(struct tty *, struct termios *); +void ite_reset(struct ite_softc *); +int ite_cnfilter(u_char, enum caller); +void ite_filter(u_char ,enum caller); +int ite_grf_ioctl(struct ite_softc *, u_long, caddr_t, int, struct proc *); #endif /* _ITEVAR_H */ diff --git a/sys/arch/amiga/dev/ivsc.c b/sys/arch/amiga/dev/ivsc.c index 163e52ad285..df849badc84 100644 --- a/sys/arch/amiga/dev/ivsc.c +++ b/sys/arch/amiga/dev/ivsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ivsc.c,v 1.6 1997/01/18 12:26:31 niklas Exp $ */ +/* $OpenBSD: ivsc.c,v 1.7 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: ivsc.c,v 1.21 1996/12/23 09:10:21 veego Exp $ */ /* @@ -49,14 +49,14 @@ #include <amiga/dev/scivar.h> #include <amiga/dev/zbusvar.h> -void ivscattach __P((struct device *, struct device *, void *)); -int ivscmatch __P((struct device *, void *, void *)); +void ivscattach(struct device *, struct device *, void *); +int ivscmatch(struct device *, void *, void *); -int ivsc_intr __P((void *)); -int ivsc_dma_xfer_in __P((struct sci_softc *dev, int len, - register u_char *buf, int phase)); -int ivsc_dma_xfer_out __P((struct sci_softc *dev, int len, - register u_char *buf, int phase)); +int ivsc_intr(void *); +int ivsc_dma_xfer_in(struct sci_softc *dev, int len, + register u_char *buf, int phase); +int ivsc_dma_xfer_out(struct sci_softc *dev, int len, + register u_char *buf, int phase); struct scsi_adapter ivsc_scsiswitch = { sci_scsicmd, diff --git a/sys/arch/amiga/dev/joy.c b/sys/arch/amiga/dev/joy.c index a37ddce8e25..060b6a68605 100644 --- a/sys/arch/amiga/dev/joy.c +++ b/sys/arch/amiga/dev/joy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: joy.c,v 1.1 2000/09/02 13:45:40 espie Exp $ */ +/* $OpenBSD: joy.c,v 1.2 2002/03/14 01:26:29 millert Exp $ */ /* * Copyright (c) 2000 Marc Espie. @@ -38,8 +38,8 @@ -int joymatch __P((struct device *, void *, void *)); -void joyattach __P((struct device *, struct device *, void *)); +int joymatch(struct device *, void *, void *); +void joyattach(struct device *, struct device *, void *); struct cfattach joy_ca = { sizeof(struct device), joymatch, joyattach diff --git a/sys/arch/amiga/dev/kbd.c b/sys/arch/amiga/dev/kbd.c index e3fe894d037..7cdebc41727 100644 --- a/sys/arch/amiga/dev/kbd.c +++ b/sys/arch/amiga/dev/kbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kbd.c,v 1.5 1997/01/16 09:24:55 niklas Exp $ */ +/* $OpenBSD: kbd.c,v 1.6 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: kbd.c,v 1.28 1996/12/23 09:10:22 veego Exp $ */ /* @@ -72,10 +72,10 @@ struct kbd_softc { }; struct kbd_softc kbd_softc; -int kbdmatch __P((struct device *, void *, void *)); -void kbdattach __P((struct device *, struct device *, void *)); -void kbdintr __P((int)); -void kbdstuffchar __P((u_char)); +int kbdmatch(struct device *, void *, void *); +void kbdattach(struct device *, struct device *, void *); +void kbdintr(int); +void kbdstuffchar(u_char); struct cfattach kbd_ca = { sizeof(struct device), kbdmatch, kbdattach diff --git a/sys/arch/amiga/dev/kbdmap.h b/sys/arch/amiga/dev/kbdmap.h index 6da31dca97a..af987fc2098 100644 --- a/sys/arch/amiga/dev/kbdmap.h +++ b/sys/arch/amiga/dev/kbdmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kbdmap.h,v 1.2 1996/05/02 06:44:18 niklas Exp $ */ +/* $OpenBSD: kbdmap.h,v 1.3 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: kbdmap.h,v 1.10 1996/04/21 21:12:08 veego Exp $ */ /* @@ -137,6 +137,6 @@ struct kbdmap { extern struct kbdmap kbdmap, ascii_kbdmap; extern unsigned char acctable[KBD_NUM_ACC][64]; #include <sys/cdefs.h> -void kbdenable __P((void)); -int kbdgetcn __P((void)); +void kbdenable(void); +int kbdgetcn(void); #endif diff --git a/sys/arch/amiga/dev/mfc.c b/sys/arch/amiga/dev/mfc.c index b2f2ac06a8c..1a2ec705621 100644 --- a/sys/arch/amiga/dev/mfc.c +++ b/sys/arch/amiga/dev/mfc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfc.c,v 1.11 2002/02/15 20:45:30 nordin Exp $ */ +/* $OpenBSD: mfc.c,v 1.12 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: mfc.c,v 1.18 1996/12/23 09:10:23 veego Exp $ */ /* @@ -182,27 +182,27 @@ struct mfc_args { char unit; }; -int mfcprint __P((void *auxp, const char *)); -void mfcattach __P((struct device *, struct device *, void *)); -int mfcmatch __P((struct device *, void *, void *)); +int mfcprint(void *auxp, const char *); +void mfcattach(struct device *, struct device *, void *); +int mfcmatch(struct device *, void *, void *); #if NMFCS > 0 -int mfcsmatch __P((struct device *, void *, void *)); -void mfcsattach __P((struct device *, struct device *, void *)); -int mfcsparam __P(( struct tty *, struct termios *)); -int mfcshwiflow __P((struct tty *, int)); -void mfcsstart __P((struct tty *)); -int mfcsmctl __P((dev_t, int, int)); -void mfcsxintr __P((int)); -void mfcseint __P((int, int)); -void mfcsmint __P((register int)); +int mfcsmatch(struct device *, void *, void *); +void mfcsattach(struct device *, struct device *, void *); +int mfcsparam( struct tty *, struct termios *); +int mfcshwiflow(struct tty *, int); +void mfcsstart(struct tty *); +int mfcsmctl(dev_t, int, int); +void mfcsxintr(int); +void mfcseint(int, int); +void mfcsmint(register int); #endif #if NMFCP > 0 -void mfcpattach __P((struct device *, struct device *, void *)); -int mfcpmatch __P((struct device *, void *, void *)); +void mfcpattach(struct device *, struct device *, void *); +int mfcpmatch(struct device *, void *, void *); #endif -int mfcintr __P((void *)); +int mfcintr(void *); struct cfattach mfc_ca = { sizeof(struct mfc_softc), mfcmatch, mfcattach diff --git a/sys/arch/amiga/dev/mgnsc.c b/sys/arch/amiga/dev/mgnsc.c index 186f04f3e87..487a5c67031 100644 --- a/sys/arch/amiga/dev/mgnsc.c +++ b/sys/arch/amiga/dev/mgnsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mgnsc.c,v 1.10 1997/01/18 12:26:32 niklas Exp $ */ +/* $OpenBSD: mgnsc.c,v 1.11 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: mgnsc.c,v 1.18 1996/04/21 21:12:11 veego Exp $ */ /* @@ -53,11 +53,11 @@ #include <amiga/dev/siopvar.h> #include <amiga/dev/zbusvar.h> -void mgnscattach __P((struct device *, struct device *, void *)); -int mgnscmatch __P((struct device *, void *, void *)); -int mgnsc_dmaintr __P((void *)); +void mgnscattach(struct device *, struct device *, void *); +int mgnscmatch(struct device *, void *, void *); +int mgnsc_dmaintr(void *); #ifdef DEBUG -void mgnsc_dump __P((void)); +void mgnsc_dump(void); #endif struct scsi_adapter mgnsc_scsiswitch = { diff --git a/sys/arch/amiga/dev/mlhsc.c b/sys/arch/amiga/dev/mlhsc.c index fb3f33979ab..59b518a110e 100644 --- a/sys/arch/amiga/dev/mlhsc.c +++ b/sys/arch/amiga/dev/mlhsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mlhsc.c,v 1.6 1997/01/18 12:26:34 niklas Exp $ */ +/* $OpenBSD: mlhsc.c,v 1.7 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: mlhsc.c,v 1.16 1996/12/23 09:10:25 veego Exp $ */ /* @@ -48,13 +48,13 @@ #include <amiga/dev/scivar.h> #include <amiga/dev/zbusvar.h> -void mlhscattach __P((struct device *, struct device *, void *)); -int mlhscmatch __P((struct device *, void *, void *)); +void mlhscattach(struct device *, struct device *, void *); +int mlhscmatch(struct device *, void *, void *); -int mlhsc_dma_xfer_in __P((struct sci_softc *dev, int len, - register u_char *buf, int phase)); -int mlhsc_dma_xfer_out __P((struct sci_softc *dev, int len, - register u_char *buf, int phase)); +int mlhsc_dma_xfer_in(struct sci_softc *dev, int len, + register u_char *buf, int phase); +int mlhsc_dma_xfer_out(struct sci_softc *dev, int len, + register u_char *buf, int phase); struct scsi_adapter mlhsc_scsiswitch = { sci_scsicmd, diff --git a/sys/arch/amiga/dev/ms.c b/sys/arch/amiga/dev/ms.c index 2a622ba4b90..6824286acce 100644 --- a/sys/arch/amiga/dev/ms.c +++ b/sys/arch/amiga/dev/ms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ms.c,v 1.5 2001/09/13 13:34:53 jj Exp $ */ +/* $OpenBSD: ms.c,v 1.6 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: ms.c,v 1.14 1996/12/23 09:10:25 veego Exp $ */ /* @@ -73,12 +73,12 @@ #include <sys/conf.h> #include <machine/conf.h> -void msattach __P((struct device *, struct device *, void *)); -int msmatch __P((struct device *, void *, void *)); +void msattach(struct device *, struct device *, void *); +int msmatch(struct device *, void *, void *); -void msintr __P((void *)); -void ms_enable __P((dev_t)); -void ms_disable __P((dev_t)); +void msintr(void *); +void ms_enable(dev_t); +void ms_disable(dev_t); struct ms_softc { struct device sc_dev; diff --git a/sys/arch/amiga/dev/msc.c b/sys/arch/amiga/dev/msc.c index 742eecf29e8..d3630258370 100644 --- a/sys/arch/amiga/dev/msc.c +++ b/sys/arch/amiga/dev/msc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msc.c,v 1.7 2002/02/15 20:45:30 nordin Exp $ */ +/* $OpenBSD: msc.c,v 1.8 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: msc.c,v 1.13 1996/12/23 09:10:26 veego Exp $ */ /* @@ -107,10 +107,10 @@ * you have three boards with minor device numbers from 0 to 45. */ -int mscparam __P((struct tty *, struct termios *)); -void mscstart __P((struct tty *)); -int mschwiflow __P((struct tty *, int)); -int mscinitcard __P((struct zbus_args *)); +int mscparam(struct tty *, struct termios *); +void mscstart(struct tty *); +int mschwiflow(struct tty *, int); +int mscinitcard(struct zbus_args *); int mscdefaultrate = TTYDEF_SPEED; @@ -163,11 +163,11 @@ struct speedtab mscspeedtab_turbo[] = { struct speedtab *mscspeedtab; -int mscmctl __P((dev_t dev, int bits, int howto)); -void mscmint __P((register void *data)); +int mscmctl(dev_t dev, int bits, int howto); +void mscmint(register void *data); -int mscmatch __P((struct device *, void *, void *)); -void mscattach __P((struct device *, struct device *, void *)); +int mscmatch(struct device *, void *, void *); +void mscattach(struct device *, struct device *, void *); #define SWFLAGS(dev) (msc->openflags | (MSCDIALIN(dev) ? 0 : TIOCFLAG_SOFTCAR)) #define DEBUG_CD 0 diff --git a/sys/arch/amiga/dev/otgsc.c b/sys/arch/amiga/dev/otgsc.c index 25a03e08ab5..8b4e6782819 100644 --- a/sys/arch/amiga/dev/otgsc.c +++ b/sys/arch/amiga/dev/otgsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: otgsc.c,v 1.6 1997/01/18 12:26:35 niklas Exp $ */ +/* $OpenBSD: otgsc.c,v 1.7 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: otgsc.c,v 1.17 1996/12/23 09:10:27 veego Exp $ */ /* @@ -48,14 +48,14 @@ #include <amiga/dev/scivar.h> #include <amiga/dev/zbusvar.h> -void otgscattach __P((struct device *, struct device *, void *)); -int otgscmatch __P((struct device *, void *, void *)); +void otgscattach(struct device *, struct device *, void *); +int otgscmatch(struct device *, void *, void *); -int otgsc_dma_xfer_in __P((struct sci_softc *dev, int len, - register u_char *buf, int phase)); -int otgsc_dma_xfer_out __P((struct sci_softc *dev, int len, - register u_char *buf, int phase)); -int otgsc_intr __P((void *)); +int otgsc_dma_xfer_in(struct sci_softc *dev, int len, + register u_char *buf, int phase); +int otgsc_dma_xfer_out(struct sci_softc *dev, int len, + register u_char *buf, int phase); +int otgsc_intr(void *); struct scsi_adapter otgsc_scsiswitch = { sci_scsicmd, diff --git a/sys/arch/amiga/dev/par.c b/sys/arch/amiga/dev/par.c index 94b9d4aa6ee..76202a16fe1 100644 --- a/sys/arch/amiga/dev/par.c +++ b/sys/arch/amiga/dev/par.c @@ -1,4 +1,4 @@ -/* $OpenBSD: par.c,v 1.8 2001/08/20 19:35:18 miod Exp $ */ +/* $OpenBSD: par.c,v 1.9 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: par.c,v 1.16 1996/12/23 09:10:28 veego Exp $ */ /* @@ -91,19 +91,19 @@ int pardebug = 0; #define PDB_NOCHECK 0x80 #endif -int parrw __P((dev_t, struct uio *)); -int parhztoms __P((int)); -int parmstohz __P((int)); -int parsend __P((u_char *, int)); -int parreceive __P((u_char *, int)); -int parsendch __P((u_char)); +int parrw(dev_t, struct uio *); +int parhztoms(int); +int parmstohz(int); +int parsend(u_char *, int); +int parreceive(u_char *, int); +int parsendch(u_char); -void partimo __P((void *)); -void parstart __P((void *)); -void parintr __P((void *)); +void partimo(void *); +void parstart(void *); +void parintr(void *); -void parattach __P((struct device *, struct device *, void *)); -int parmatch __P((struct device *, void *, void *)); +void parattach(struct device *, struct device *, void *); +int parmatch(struct device *, void *, void *); struct cfattach par_ca = { sizeof(struct device), parmatch, parattach diff --git a/sys/arch/amiga/dev/rtc.h b/sys/arch/amiga/dev/rtc.h index 842e77e2acb..3f10cfb94e4 100644 --- a/sys/arch/amiga/dev/rtc.h +++ b/sys/arch/amiga/dev/rtc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rtc.h,v 1.4 2000/01/24 16:02:04 espie Exp $ */ +/* $OpenBSD: rtc.h,v 1.5 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: rtc.h,v 1.5 1997/07/17 23:29:28 is Exp $ */ /* @@ -39,8 +39,8 @@ /* this is a hook set by a clock driver for the configured realtime clock, returning plain current unix-time */ -time_t (*gettod) __P((void)); -int (*settod) __P((time_t)); +time_t (*gettod)(void); +int (*settod)(time_t); struct rtclock2000 { u_int :28, second2:4; /* lower digit */ diff --git a/sys/arch/amiga/dev/sbic.c b/sys/arch/amiga/dev/sbic.c index 7493889fa83..29391173c2e 100644 --- a/sys/arch/amiga/dev/sbic.c +++ b/sys/arch/amiga/dev/sbic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbic.c,v 1.15 2001/11/30 22:08:16 miod Exp $ */ +/* $OpenBSD: sbic.c,v 1.16 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: sbic.c,v 1.28 1996/10/13 03:07:29 christos Exp $ */ /* @@ -82,32 +82,32 @@ #define b_cylin b_resid #define SBIC_WAIT(regs, until, timeo) sbicwait(regs, until, timeo, __LINE__) -int sbicicmd __P((struct sbic_softc *, int, int, void *, int, void *, int)); -int sbicgo __P((struct sbic_softc *, struct scsi_xfer *)); -int sbicdmaok __P((struct sbic_softc *, struct scsi_xfer *)); -int sbicwait __P((sbic_regmap_p, char, int , int)); -int sbiccheckdmap __P((void *, u_long, u_long)); -int sbicselectbus __P((struct sbic_softc *, sbic_regmap_p, u_char, u_char, u_char)); -int sbicxfstart __P((sbic_regmap_p, int, u_char, int)); -int sbicxfout __P((sbic_regmap_p regs, int, void *, int)); -int sbicfromscsiperiod __P((struct sbic_softc *, sbic_regmap_p, int)); -int sbictoscsiperiod __P((struct sbic_softc *, sbic_regmap_p, int)); -int sbicpoll __P((struct sbic_softc *)); -int sbicnextstate __P((struct sbic_softc *, u_char, u_char)); -int sbicmsgin __P((struct sbic_softc *)); -int sbicxfin __P((sbic_regmap_p regs, int, void *)); -int sbicabort __P((struct sbic_softc *, sbic_regmap_p, char *)); -void sbicxfdone __P((struct sbic_softc *, sbic_regmap_p, int)); -void sbicerror __P((struct sbic_softc *, sbic_regmap_p, u_char)); -void sbicstart __P((struct sbic_softc *)); -void sbicreset __P((struct sbic_softc *)); -void sbic_scsidone __P((struct sbic_acb *, int)); -void sbic_sched __P((struct sbic_softc *)); -void sbic_save_ptrs __P((struct sbic_softc *, sbic_regmap_p,int,int)); -void sbic_load_ptrs __P((struct sbic_softc *, sbic_regmap_p,int,int)); +int sbicicmd(struct sbic_softc *, int, int, void *, int, void *, int); +int sbicgo(struct sbic_softc *, struct scsi_xfer *); +int sbicdmaok(struct sbic_softc *, struct scsi_xfer *); +int sbicwait(sbic_regmap_p, char, int , int); +int sbiccheckdmap(void *, u_long, u_long); +int sbicselectbus(struct sbic_softc *, sbic_regmap_p, u_char, u_char, u_char); +int sbicxfstart(sbic_regmap_p, int, u_char, int); +int sbicxfout(sbic_regmap_p regs, int, void *, int); +int sbicfromscsiperiod(struct sbic_softc *, sbic_regmap_p, int); +int sbictoscsiperiod(struct sbic_softc *, sbic_regmap_p, int); +int sbicpoll(struct sbic_softc *); +int sbicnextstate(struct sbic_softc *, u_char, u_char); +int sbicmsgin(struct sbic_softc *); +int sbicxfin(sbic_regmap_p regs, int, void *); +int sbicabort(struct sbic_softc *, sbic_regmap_p, char *); +void sbicxfdone(struct sbic_softc *, sbic_regmap_p, int); +void sbicerror(struct sbic_softc *, sbic_regmap_p, u_char); +void sbicstart(struct sbic_softc *); +void sbicreset(struct sbic_softc *); +void sbic_scsidone(struct sbic_acb *, int); +void sbic_sched(struct sbic_softc *); +void sbic_save_ptrs(struct sbic_softc *, sbic_regmap_p,int,int); +void sbic_load_ptrs(struct sbic_softc *, sbic_regmap_p,int,int); #ifdef DEBUG -void sbicdumpstate __P((void)); -void sbic_dump_acb __P((struct sbic_acb *)); +void sbicdumpstate(void); +void sbic_dump_acb(struct sbic_acb *); #endif /* @@ -145,7 +145,7 @@ int reselect_debug = 0; int report_sense = 0; int data_pointer_debug = 0; u_char debug_asr, debug_csr, routine; -void sbictimeout __P((struct sbic_softc *dev)); +void sbictimeout(struct sbic_softc *dev); #define CSR_TRACE_SIZE 32 #if CSR_TRACE_SIZE diff --git a/sys/arch/amiga/dev/sbicvar.h b/sys/arch/amiga/dev/sbicvar.h index f7e4313a620..a08864c0740 100644 --- a/sys/arch/amiga/dev/sbicvar.h +++ b/sys/arch/amiga/dev/sbicvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sbicvar.h,v 1.4 2001/01/25 03:50:46 todd Exp $ */ +/* $OpenBSD: sbicvar.h,v 1.5 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: sbicvar.h,v 1.11 1996/04/21 21:12:23 veego Exp $ */ /* @@ -138,10 +138,10 @@ struct sbic_softc { u_long sc_dmamask; /* dma valid mem mask */ struct dma_chain *sc_cur; struct dma_chain *sc_last; - int (*sc_dmago) __P((struct sbic_softc *, char *, int, int)); - int (*sc_dmanext) __P((struct sbic_softc *)); - void (*sc_enintr) __P((struct sbic_softc *)); - void (*sc_dmastop) __P((struct sbic_softc *)); + int (*sc_dmago)(struct sbic_softc *, char *, int, int); + int (*sc_dmanext)(struct sbic_softc *); + void (*sc_enintr)(struct sbic_softc *); + void (*sc_dmastop)(struct sbic_softc *); u_short gtsc_bankmask; /* GVP specific bank selected */ }; @@ -224,12 +224,12 @@ struct scsi_fmt_cdb { struct buf; struct scsi_xfer; -void sbic_minphys __P((struct buf *bp)); -int sbic_scsicmd __P((struct scsi_xfer *)); -void sbicinit __P((struct sbic_softc *)); -int sbicintr __P((struct sbic_softc *)); +void sbic_minphys(struct buf *bp); +int sbic_scsicmd(struct scsi_xfer *); +void sbicinit(struct sbic_softc *); +int sbicintr(struct sbic_softc *); #ifdef DEBUG -void sbic_dump __P((struct sbic_softc *dev)); +void sbic_dump(struct sbic_softc *dev); #endif #endif /* _SBICVAR_H_ */ diff --git a/sys/arch/amiga/dev/sci.c b/sys/arch/amiga/dev/sci.c index c25f3c0321a..2214d97c695 100644 --- a/sys/arch/amiga/dev/sci.c +++ b/sys/arch/amiga/dev/sci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sci.c,v 1.7 2001/11/06 01:47:02 art Exp $ */ +/* $OpenBSD: sci.c,v 1.8 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: sci.c,v 1.19 1996/10/13 03:07:31 christos Exp $ */ /* @@ -70,17 +70,17 @@ #define b_cylin b_resid -int sciicmd __P((struct sci_softc *, int, void *, int, void *, int,u_char)); -int scigo __P((struct sci_softc *, struct scsi_xfer *)); -int scigetsense __P((struct sci_softc *, struct scsi_xfer *)); -int sciselectbus __P((struct sci_softc *, u_char, u_char)); -void sciabort __P((struct sci_softc *, char *)); -void scierror __P((struct sci_softc *, u_char)); -void scisetdelay __P((int)); -void sci_scsidone __P((struct sci_softc *, int)); -void sci_donextcmd __P((struct sci_softc *)); -int sci_ixfer_out __P((struct sci_softc *, int, register u_char *, int)); -void sci_ixfer_in __P((struct sci_softc *, int, register u_char *, int)); +int sciicmd(struct sci_softc *, int, void *, int, void *, int,u_char); +int scigo(struct sci_softc *, struct scsi_xfer *); +int scigetsense(struct sci_softc *, struct scsi_xfer *); +int sciselectbus(struct sci_softc *, u_char, u_char); +void sciabort(struct sci_softc *, char *); +void scierror(struct sci_softc *, u_char); +void scisetdelay(int); +void sci_scsidone(struct sci_softc *, int); +void sci_donextcmd(struct sci_softc *); +int sci_ixfer_out(struct sci_softc *, int, register u_char *, int); +void sci_ixfer_in(struct sci_softc *, int, register u_char *, int); int sci_cmd_wait = SCI_CMD_WAIT; int sci_data_wait = SCI_DATA_WAIT; diff --git a/sys/arch/amiga/dev/scivar.h b/sys/arch/amiga/dev/scivar.h index be32c553d11..b5548b5db9a 100644 --- a/sys/arch/amiga/dev/scivar.h +++ b/sys/arch/amiga/dev/scivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scivar.h,v 1.2 1996/05/02 06:44:29 niklas Exp $ */ +/* $OpenBSD: scivar.h,v 1.3 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: scivar.h,v 1.10 1996/04/28 06:41:01 mhitch Exp $ */ /* @@ -71,9 +71,9 @@ struct sci_softc { volatile u_char *sci_irecv; /* w: Start dma receive, initiator */ /* psuedo DMA transfer */ - int (*dma_xfer_in) __P((struct sci_softc *, int, u_char *, int)); + int (*dma_xfer_in)(struct sci_softc *, int, u_char *, int); /* psuedo DMA transfer */ - int (*dma_xfer_out) __P((struct sci_softc *, int, u_char *, int)); + int (*dma_xfer_out)(struct sci_softc *, int, u_char *, int); u_char sc_flags; u_char sc_lun; /* one for each target */ @@ -142,8 +142,8 @@ struct scsi_fmt_cdb { struct buf; struct scsi_xfer; -void sci_minphys __P((struct buf *)); -int sci_scsicmd __P((struct scsi_xfer *)); -void scireset __P((struct sci_softc *)); +void sci_minphys(struct buf *); +int sci_scsicmd(struct scsi_xfer *); +void scireset(struct sci_softc *); #endif /* _SCIVAR_H_ */ diff --git a/sys/arch/amiga/dev/ser.c b/sys/arch/amiga/dev/ser.c index c912f731ba2..d4419569758 100644 --- a/sys/arch/amiga/dev/ser.c +++ b/sys/arch/amiga/dev/ser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ser.c,v 1.11 2002/02/15 20:45:30 nordin Exp $ */ +/* $OpenBSD: ser.c,v 1.12 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: ser.c,v 1.43 1998/01/12 10:40:11 thorpej Exp $ */ /* @@ -80,8 +80,8 @@ #define SERUNIT(dev) (minor(dev) & 0x7f) #define SERCUA(dev) (minor(dev) & 0x80) -void serattach __P((struct device *, struct device *, void *)); -int sermatch __P((struct device *, void *, void *)); +void serattach(struct device *, struct device *, void *); +int sermatch(struct device *, void *, void *); struct ser_softc { struct device dev; @@ -107,21 +107,21 @@ struct cfdriver ser_cd = { #define splser() spl5() -void serstart __P((struct tty *)); -int serparam __P((struct tty *, struct termios *)); -void serintr __P((int)); -int serhwiflow __P((struct tty *, int)); -int sermctl __P((dev_t dev, int, int)); -void ser_fastint __P((void)); -void sereint __P((int, int)); -static void ser_putchar __P((struct tty *, u_short)); -void ser_outintr __P((void)); -void sercnprobe __P((struct consdev *)); -void sercninit __P((struct consdev *)); -void serinit __P((int, int)); -int sercngetc __P((dev_t dev)); -void sercnputc __P((dev_t, int)); -void sercnpollc __P((dev_t, int)); +void serstart(struct tty *); +int serparam(struct tty *, struct termios *); +void serintr(int); +int serhwiflow(struct tty *, int); +int sermctl(dev_t dev, int, int); +void ser_fastint(void); +void sereint(int, int); +static void ser_putchar(struct tty *, u_short); +void ser_outintr(void); +void sercnprobe(struct consdev *); +void sercninit(struct consdev *); +void serinit(int, int); +int sercngetc(dev_t dev); +void sercnputc(dev_t, int); +void sercnpollc(dev_t, int); int ser_active; int ser_hasfifo; @@ -183,7 +183,7 @@ long serintrcount[16]; long sermintcount[16]; #endif -void sermint __P((register int unit)); +void sermint(register int unit); int sermatch(pdp, match, auxp) diff --git a/sys/arch/amiga/dev/sfas.c b/sys/arch/amiga/dev/sfas.c index a51a2955e98..1ecb6cf73d3 100644 --- a/sys/arch/amiga/dev/sfas.c +++ b/sys/arch/amiga/dev/sfas.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sfas.c,v 1.14 2001/11/30 22:08:16 miod Exp $ */ +/* $OpenBSD: sfas.c,v 1.15 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: sfas.c,v 1.12 1996/10/13 03:07:33 christos Exp $ */ /* @@ -62,39 +62,39 @@ #include <amiga/dev/sfasvar.h> #include <amiga/dev/zbusvar.h> -void sfasinitialize __P((struct sfas_softc *)); -void sfas_minphys __P((struct buf *bp)); -int sfas_scsicmd __P((struct scsi_xfer *xs)); -void sfas_donextcmd __P((struct sfas_softc *dev, struct sfas_pending *pendp)); -void sfas_scsidone __P((struct sfas_softc *dev, struct scsi_xfer *xs, - int stat)); -void sfasiwait __P((struct sfas_softc *dev)); -void sfasreset __P((struct sfas_softc *dev, int how)); -int sfasselect __P((struct sfas_softc *dev, struct sfas_pending *pendp, +void sfasinitialize(struct sfas_softc *); +void sfas_minphys(struct buf *bp); +int sfas_scsicmd(struct scsi_xfer *xs); +void sfas_donextcmd(struct sfas_softc *dev, struct sfas_pending *pendp); +void sfas_scsidone(struct sfas_softc *dev, struct scsi_xfer *xs, + int stat); +void sfasiwait(struct sfas_softc *dev); +void sfasreset(struct sfas_softc *dev, int how); +int sfasselect(struct sfas_softc *dev, struct sfas_pending *pendp, unsigned char *cbuf, int clen, - unsigned char *buf, int len, int mode)); -void sfasicmd __P((struct sfas_softc *dev, struct sfas_pending *pendp)); -int sfas_postaction __P((struct sfas_softc *dev, sfas_regmap_p rp, - struct nexus *nexus)); -int sfas_midaction __P((struct sfas_softc *dev, sfas_regmap_p rp, - struct nexus *nexus)); -void sfas_init_nexus __P((struct sfas_softc *dev, struct nexus *nexus)); -int sfasgo __P((struct sfas_softc *dev, struct sfas_pending *pendp)); -void sfas_save_pointers __P((struct sfas_softc *dev)); -void sfas_restore_pointers __P((struct sfas_softc *dev)); -void sfas_ixfer __P((struct sfas_softc *dev)); -void sfas_build_sdtrm __P((struct sfas_softc *dev, int period, int offset)); -int sfas_select_unit __P((struct sfas_softc *dev, short target)); -struct nexus *sfas_arbitate_target __P((struct sfas_softc *dev, int target)); -void sfas_setup_nexus __P((struct sfas_softc *dev, struct nexus *nexus, + unsigned char *buf, int len, int mode); +void sfasicmd(struct sfas_softc *dev, struct sfas_pending *pendp); +int sfas_postaction(struct sfas_softc *dev, sfas_regmap_p rp, + struct nexus *nexus); +int sfas_midaction(struct sfas_softc *dev, sfas_regmap_p rp, + struct nexus *nexus); +void sfas_init_nexus(struct sfas_softc *dev, struct nexus *nexus); +int sfasgo(struct sfas_softc *dev, struct sfas_pending *pendp); +void sfas_save_pointers(struct sfas_softc *dev); +void sfas_restore_pointers(struct sfas_softc *dev); +void sfas_ixfer(struct sfas_softc *dev); +void sfas_build_sdtrm(struct sfas_softc *dev, int period, int offset); +int sfas_select_unit(struct sfas_softc *dev, short target); +struct nexus *sfas_arbitate_target(struct sfas_softc *dev, int target); +void sfas_setup_nexus(struct sfas_softc *dev, struct nexus *nexus, struct sfas_pending *pendp, unsigned char *cbuf, - int clen, unsigned char *buf, int len, int mode)); -void sfas_request_sense __P((struct sfas_softc *dev, struct nexus *nexus)); -int sfas_pretests __P((struct sfas_softc *dev, sfas_regmap_p rp)); + int clen, unsigned char *buf, int len, int mode); +void sfas_request_sense(struct sfas_softc *dev, struct nexus *nexus); +int sfas_pretests(struct sfas_softc *dev, sfas_regmap_p rp); #ifdef SFAS_NEED_VM_PATCH -void sfas_unlink_vm_link __P((struct sfas_softc *dev)); -void sfas_link_vm_link __P((struct sfas_softc *dev, - struct vm_link_data *vm_link_data)); +void sfas_unlink_vm_link(struct sfas_softc *dev); +void sfas_link_vm_link(struct sfas_softc *dev, + struct vm_link_data *vm_link_data); #endif /* diff --git a/sys/arch/amiga/dev/sfasvar.h b/sys/arch/amiga/dev/sfasvar.h index ac3bc11f7fc..dff16f4596d 100644 --- a/sys/arch/amiga/dev/sfasvar.h +++ b/sys/arch/amiga/dev/sfasvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sfasvar.h,v 1.3 2001/06/27 05:44:44 nate Exp $ */ +/* $OpenBSD: sfasvar.h,v 1.4 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: sfasvar.h,v 1.4 1996/04/21 21:12:33 veego Exp $ */ /* @@ -203,20 +203,17 @@ struct sfas_softc { u_char sc_config_flags; /* Generic DMA functions */ - int (*sc_setup_dma) - __P((struct sfas_softc *sc, - vm_offset_t ptr, int len, int mode)); - int (*sc_build_dma_chain) - __P((struct sfas_softc *sc, + int (*sc_setup_dma)(struct sfas_softc *sc, + vm_offset_t ptr, int len, int mode); + int (*sc_build_dma_chain)(struct sfas_softc *sc, struct sfas_dma_chain *chain, - void *p, int l)); - int (*sc_need_bump) - __P((struct sfas_softc *sc, - vm_offset_t ptr, int len)); + void *p, int l); + int (*sc_need_bump)(struct sfas_softc *sc, + vm_offset_t ptr, int len); /* Generic Led data */ int sc_led_status; - void (*sc_led) __P((struct sfas_softc *sc, int mode)); + void (*sc_led)(struct sfas_softc *sc, int mode); /* Nexus list */ struct nexus sc_nexus[8]; @@ -298,9 +295,9 @@ struct sfas_softc { #define SFAS_SLOW_CABLE 0x08 /* Cable is "unsafe" for fast scsi-2 */ #define SFAS_SLOW_START 0x10 /* There are slow starters on the bus */ -void sfasinitialize __P((struct sfas_softc *sc)); -void sfas_minphys __P((struct buf *bp)); -int sfas_scsicmd __P((struct scsi_xfer *)); -void sfasintr __P((struct sfas_softc *dev)); +void sfasinitialize(struct sfas_softc *sc); +void sfas_minphys(struct buf *bp); +int sfas_scsicmd(struct scsi_xfer *); +void sfasintr(struct sfas_softc *dev); #endif /* _SFASVAR_H_ */ diff --git a/sys/arch/amiga/dev/siop.c b/sys/arch/amiga/dev/siop.c index 87fe7f831ab..267f31d919d 100644 --- a/sys/arch/amiga/dev/siop.c +++ b/sys/arch/amiga/dev/siop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siop.c,v 1.10 1997/09/11 06:24:05 niklas Exp $ */ +/* $OpenBSD: siop.c,v 1.11 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: siop.c,v 1.37 1997/08/27 11:23:21 bouyer Exp $ */ /* @@ -67,20 +67,20 @@ #define SCSI_DATA_WAIT 500000 /* wait per data in/out step */ #define SCSI_INIT_WAIT 500000 /* wait per step (both) during init */ -void siop_select __P((struct siop_softc *)); -void siopabort __P((struct siop_softc *, siop_regmap_p, char *)); -void sioperror __P((struct siop_softc *, siop_regmap_p, u_char)); -void siopstart __P((struct siop_softc *)); -int siop_checkintr __P((struct siop_softc *, u_char, u_char, u_char, int *)); -void siopreset __P((struct siop_softc *)); -void siopsetdelay __P((int)); -void siop_scsidone __P((struct siop_acb *, int)); -void siop_sched __P((struct siop_softc *)); -int siop_poll __P((struct siop_softc *, struct siop_acb *)); -void siopintr __P((struct siop_softc *)); -void scsi_period_to_siop __P((struct siop_softc *, int)); -void siop_start __P((struct siop_softc *, int, int, u_char *, int, u_char *, int)); -void siop_dump_acb __P((struct siop_acb *)); +void siop_select(struct siop_softc *); +void siopabort(struct siop_softc *, siop_regmap_p, char *); +void sioperror(struct siop_softc *, siop_regmap_p, u_char); +void siopstart(struct siop_softc *); +int siop_checkintr(struct siop_softc *, u_char, u_char, u_char, int *); +void siopreset(struct siop_softc *); +void siopsetdelay(int); +void siop_scsidone(struct siop_acb *, int); +void siop_sched(struct siop_softc *); +int siop_poll(struct siop_softc *, struct siop_acb *); +void siopintr(struct siop_softc *); +void scsi_period_to_siop(struct siop_softc *, int); +void siop_start(struct siop_softc *, int, int, u_char *, int, u_char *, int); +void siop_dump_acb(struct siop_acb *); /* 53C710 script */ const @@ -159,8 +159,8 @@ int siopphmm = 0; siop_trix = (siop_trix + 4) & (SIOP_TRACE_SIZE - 1); u_char siop_trbuf[SIOP_TRACE_SIZE]; int siop_trix; -void siop_dump __P((struct siop_softc *)); -void siop_dump_trace __P((void)); +void siop_dump(struct siop_softc *); +void siop_dump_trace(void); #else #define SIOP_TRACE(a,b,c,d) #endif diff --git a/sys/arch/amiga/dev/siopvar.h b/sys/arch/amiga/dev/siopvar.h index 40ccd69a11d..47c5d3951ed 100644 --- a/sys/arch/amiga/dev/siopvar.h +++ b/sys/arch/amiga/dev/siopvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: siopvar.h,v 1.3 1996/05/02 06:44:36 niklas Exp $ */ +/* $OpenBSD: siopvar.h,v 1.4 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: siopvar.h,v 1.14 1996/04/21 21:12:38 veego Exp $ */ /* @@ -196,12 +196,12 @@ struct siop_softc { #define STS_INTERMED 0x10 /* Intermediate status sent */ #define STS_EXT 0x80 /* Extended status valid */ -void siop_minphys __P((struct buf *bp)); -int siop_scsicmd __P((struct scsi_xfer *)); -void siopinitialize __P((struct siop_softc *)); -void siopintr __P((struct siop_softc *)); +void siop_minphys(struct buf *bp); +int siop_scsicmd(struct scsi_xfer *); +void siopinitialize(struct siop_softc *); +void siopintr(struct siop_softc *); #ifdef DEBUG -void siop_dump __P((struct siop_softc *)); +void siop_dump(struct siop_softc *); #endif #endif /* _SIOPVAR_H */ diff --git a/sys/arch/amiga/dev/view.c b/sys/arch/amiga/dev/view.c index 0d2d6d3657d..025b3ad9335 100644 --- a/sys/arch/amiga/dev/view.c +++ b/sys/arch/amiga/dev/view.c @@ -1,4 +1,4 @@ -/* $OpenBSD: view.c,v 1.5 2001/11/01 12:13:45 art Exp $ */ +/* $OpenBSD: view.c,v 1.6 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: view.c,v 1.16 1996/10/13 03:07:35 christos Exp $ */ /* @@ -56,14 +56,14 @@ #include "view.h" -static void view_display __P((struct view_softc *)); -static void view_remove __P((struct view_softc *)); -static int view_setsize __P((struct view_softc *, struct view_size *)); +static void view_display(struct view_softc *); +static void view_remove(struct view_softc *); +static int view_setsize(struct view_softc *, struct view_size *); -int view_get_colormap __P((struct view_softc *, colormap_t *)); -int view_set_colormap __P((struct view_softc *, colormap_t *)); +int view_get_colormap(struct view_softc *, colormap_t *); +int view_set_colormap(struct view_softc *, colormap_t *); -void viewattach __P((int)); +void viewattach(int); struct view_softc views[NVIEW]; int view_inited; /* also checked in ite_cc.c */ diff --git a/sys/arch/amiga/dev/viewioctl.h b/sys/arch/amiga/dev/viewioctl.h index ca88ef965c8..2d3b38c0c79 100644 --- a/sys/arch/amiga/dev/viewioctl.h +++ b/sys/arch/amiga/dev/viewioctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: viewioctl.h,v 1.2 1996/05/02 06:44:37 niklas Exp $ */ +/* $OpenBSD: viewioctl.h,v 1.3 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: viewioctl.h,v 1.6 1996/04/21 21:12:40 veego Exp $ */ /* @@ -57,7 +57,7 @@ struct view_size { #define VIOCGCMAP _IOWR('V', 0x6, colormap_t) #ifdef _KERNEL -int viewioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); -void viewprobe __P((void)); +int viewioctl(dev_t, u_long, caddr_t, int, struct proc *); +void viewprobe(void); #endif diff --git a/sys/arch/amiga/dev/wesc.c b/sys/arch/amiga/dev/wesc.c index 2267e2b4b9b..a24fe811872 100644 --- a/sys/arch/amiga/dev/wesc.c +++ b/sys/arch/amiga/dev/wesc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wesc.c,v 1.7 1997/01/18 12:26:35 niklas Exp $ */ +/* $OpenBSD: wesc.c,v 1.8 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: wesc.c,v 1.19 1996/12/23 09:10:30 veego Exp $ */ /* @@ -51,11 +51,11 @@ #include <amiga/dev/siopvar.h> #include <amiga/dev/zbusvar.h> -void wescattach __P((struct device *, struct device *, void *)); -int wescmatch __P((struct device *, void *, void *)); -int wesc_dmaintr __P((void *)); +void wescattach(struct device *, struct device *, void *); +int wescmatch(struct device *, void *, void *); +int wesc_dmaintr(void *); #ifdef DEBUG -void wesc_dump __P((void)); +void wesc_dump(void); #endif struct scsi_adapter wesc_scsiswitch = { diff --git a/sys/arch/amiga/dev/wstsc.c b/sys/arch/amiga/dev/wstsc.c index 32c4f107931..9f293bfa76b 100644 --- a/sys/arch/amiga/dev/wstsc.c +++ b/sys/arch/amiga/dev/wstsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wstsc.c,v 1.6 1997/01/18 12:26:36 niklas Exp $ */ +/* $OpenBSD: wstsc.c,v 1.7 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: wstsc.c,v 1.18 1996/12/23 09:10:31 veego Exp $ */ /* @@ -48,18 +48,18 @@ #include <amiga/dev/scivar.h> #include <amiga/dev/zbusvar.h> -void wstscattach __P((struct device *, struct device *, void *)); -int wstscmatch __P((struct device *, void *, void *)); - -int wstsc_dma_xfer_in __P((struct sci_softc *dev, int len, - register u_char *buf, int phase)); -int wstsc_dma_xfer_out __P((struct sci_softc *dev, int len, - register u_char *buf, int phase)); -int wstsc_dma_xfer_in2 __P((struct sci_softc *dev, int len, - register u_short *buf, int phase)); -int wstsc_dma_xfer_out2 __P((struct sci_softc *dev, int len, - register u_short *buf, int phase)); -int wstsc_intr __P((void *)); +void wstscattach(struct device *, struct device *, void *); +int wstscmatch(struct device *, void *, void *); + +int wstsc_dma_xfer_in(struct sci_softc *dev, int len, + register u_char *buf, int phase); +int wstsc_dma_xfer_out(struct sci_softc *dev, int len, + register u_char *buf, int phase); +int wstsc_dma_xfer_in2(struct sci_softc *dev, int len, + register u_short *buf, int phase); +int wstsc_dma_xfer_out2(struct sci_softc *dev, int len, + register u_short *buf, int phase); +int wstsc_intr(void *); struct scsi_adapter wstsc_scsiswitch = { sci_scsicmd, diff --git a/sys/arch/amiga/dev/zbus.c b/sys/arch/amiga/dev/zbus.c index 94034cf18fb..10f47f48fc0 100644 --- a/sys/arch/amiga/dev/zbus.c +++ b/sys/arch/amiga/dev/zbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zbus.c,v 1.10 2000/02/29 19:05:22 niklas Exp $ */ +/* $OpenBSD: zbus.c,v 1.11 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: zbus.c,v 1.33 1997/03/27 23:50:39 veego Exp $ */ /* @@ -192,11 +192,11 @@ static struct preconfdata preconftab[] = { }; static int npreconfent = sizeof(preconftab) / sizeof(struct preconfdata); -void zbusattach __P((struct device *, struct device *, void *)); -int zbusprint __P((void *, const char *)); -int zbusmatch __P((struct device *, void *, void *)); -caddr_t zbusmap __P((caddr_t, u_int)); -static char *aconflookup __P((int, int)); +void zbusattach(struct device *, struct device *, void *); +int zbusprint(void *, const char *); +int zbusmatch(struct device *, void *, void *); +caddr_t zbusmap(caddr_t, u_int); +static char *aconflookup(int, int); /* * given a manufacturer id and product id, find the name diff --git a/sys/arch/amiga/dev/zssc.c b/sys/arch/amiga/dev/zssc.c index 89df2ee472e..073a5b1ab5e 100644 --- a/sys/arch/amiga/dev/zssc.c +++ b/sys/arch/amiga/dev/zssc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zssc.c,v 1.10 1997/01/18 12:26:37 niklas Exp $ */ +/* $OpenBSD: zssc.c,v 1.11 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: zssc.c,v 1.22 1996/12/23 09:10:33 veego Exp $ */ /* @@ -51,11 +51,11 @@ #include <amiga/dev/siopvar.h> #include <amiga/dev/zbusvar.h> -void zsscattach __P((struct device *, struct device *, void *)); -int zsscmatch __P((struct device *, void *, void *)); -int zssc_dmaintr __P((void *)); +void zsscattach(struct device *, struct device *, void *); +int zsscmatch(struct device *, void *, void *); +int zssc_dmaintr(void *); #ifdef DEBUG -void zssc_dump __P((void)); +void zssc_dump(void); #endif struct scsi_adapter zssc_scsiswitch = { diff --git a/sys/arch/amiga/include/cpu.h b/sys/arch/amiga/include/cpu.h index 1c121dcbbae..593ae380243 100644 --- a/sys/arch/amiga/include/cpu.h +++ b/sys/arch/amiga/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.18 2002/02/23 00:31:11 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.19 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: cpu.h,v 1.36 1996/09/11 00:11:42 thorpej Exp $ */ /* @@ -148,33 +148,33 @@ int machineid; /* * Prototypes from amiga_init.c */ -void *alloc_z2mem __P((long)); +void *alloc_z2mem(long); /* * Prototypes from autoconf.c */ -int is_a1200 __P((void)); -int is_a3000 __P((void)); -int is_a4000 __P((void)); +int is_a1200(void); +int is_a3000(void); +int is_a4000(void); #ifdef DRACO -int is_draco __P((void)); +int is_draco(void); #endif /* * Prototypes from clock.c */ -u_long clkread __P((void)); +u_long clkread(void); #ifdef DRACO /* * Prototypes from kbd.c */ -void drkbdintr __P((void)); +void drkbdintr(void); /* * Prototypes from drsc.c */ -void drsc_handler __P((void)); +void drsc_handler(void); #endif /* @@ -184,68 +184,68 @@ struct fpframe; struct user; struct pcb; -void doboot __P((void)) __attribute__((__noreturn__)); -void loadustp __P((int)); -void m68881_save __P((struct fpframe *)); -void m68881_restore __P((struct fpframe *)); -u_int probeva __P((u_int, u_int)); -void proc_trampoline __P((void)); -void savectx __P((struct pcb *)); -void switch_exit __P((struct proc *)); -void DCIAS __P((vm_offset_t)); -void DCIA __P((void)); -void DCIS __P((void)); -void DCIU __P((void)); -void ICIA __P((void)); -void ICPA __P((void)); -void PCIA __P((void)); -void TBIA __P((void)); -void TBIS __P((vm_offset_t)); -void TBIAS __P((void)); -void TBIAU __P((void)); +void doboot(void) __attribute__((__noreturn__)); +void loadustp(int); +void m68881_save(struct fpframe *); +void m68881_restore(struct fpframe *); +u_int probeva(u_int, u_int); +void proc_trampoline(void); +void savectx(struct pcb *); +void switch_exit(struct proc *); +void DCIAS(vm_offset_t); +void DCIA(void); +void DCIS(void); +void DCIU(void); +void ICIA(void); +void ICPA(void); +void PCIA(void); +void TBIA(void); +void TBIS(vm_offset_t); +void TBIAS(void); +void TBIAU(void); #if defined(M68040) || defined(M68060) -void DCFA __P((void)); -void DCFP __P((vm_offset_t)); -void DCFL __P((vm_offset_t)); -void DCPL __P((vm_offset_t)); -void DCPP __P((vm_offset_t)); -void ICPL __P((vm_offset_t)); -void ICPP __P((vm_offset_t)); +void DCFA(void); +void DCFP(vm_offset_t); +void DCFL(vm_offset_t); +void DCPL(vm_offset_t); +void DCPP(vm_offset_t); +void ICPL(vm_offset_t); +void ICPP(vm_offset_t); #endif /* * Prototypes from machdep.c */ -int badaddr __P((caddr_t)); -int badbaddr __P((caddr_t)); -void bootsync __P((void)); -void dumpconf __P((void)); +int badaddr(caddr_t); +int badbaddr(caddr_t); +void bootsync(void); +void dumpconf(void); /* * Prototypes from sys_machdep.c: */ -int cachectl __P((int, caddr_t, int)); -int dma_cachectl __P((caddr_t, int)); +int cachectl(int, caddr_t, int); +int dma_cachectl(caddr_t, int); /* * Prototypes from vm_machdep.c */ -int kvtop __P((caddr_t)); -void physaccess __P((caddr_t, caddr_t, int, int)); -void physunaccess __P((caddr_t, int)); +int kvtop(caddr_t); +void physaccess(caddr_t, caddr_t, int, int); +void physunaccess(caddr_t, int); #ifdef GENERIC /* * Prototypes from swapgeneric.c: */ -void setconf __P((void)); +void setconf(void); #endif /* * Prototypes from pmap.c: */ -void pmap_bootstrap __P((vm_offset_t, vm_offset_t)); -vm_offset_t pmap_map __P((vm_offset_t, vm_offset_t, vm_offset_t, int)); +void pmap_bootstrap(vm_offset_t, vm_offset_t); +vm_offset_t pmap_map(vm_offset_t, vm_offset_t, vm_offset_t, int); #endif /* _KERNEL */ diff --git a/sys/arch/amiga/include/mtpr.h b/sys/arch/amiga/include/mtpr.h index 6723b955520..b09eaec9f7c 100644 --- a/sys/arch/amiga/include/mtpr.h +++ b/sys/arch/amiga/include/mtpr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mtpr.h,v 1.4 1997/09/18 13:40:02 niklas Exp $ */ +/* $OpenBSD: mtpr.h,v 1.5 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: mtpr.h,v 1.10 1996/05/09 20:31:53 is Exp $ */ /* @@ -81,7 +81,7 @@ extern unsigned char ssir; #define setsoftclock() (ssir |= SIR_CLOCK, setsoftint()) #define setsoftcback() (ssir |= SIR_CBACK, setsoftint()) -void softintr_schedule __P((void *)); +void softintr_schedule(void *); void *softintr_establish __P((int, void (*)(void *), void *)); #endif /* _KERNEL */ diff --git a/sys/arch/amiga/include/param.h b/sys/arch/amiga/include/param.h index 90c46449d87..d8b14cda588 100644 --- a/sys/arch/amiga/include/param.h +++ b/sys/arch/amiga/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.20 2002/02/23 00:31:11 miod Exp $ */ +/* $OpenBSD: param.h,v 1.21 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: param.h,v 1.35 1997/07/10 08:22:36 veego Exp $ */ /* @@ -83,8 +83,8 @@ #include <machine/cpu.h> -void delay __P((int)); -void DELAY __P((int)); +void delay(int); +void DELAY(int); #endif /* !_LOCORE */ #endif /* _KERNEL */ diff --git a/sys/arch/amiga/include/pmap.h b/sys/arch/amiga/include/pmap.h index e1a34c9d9dd..f2db397362d 100644 --- a/sys/arch/amiga/include/pmap.h +++ b/sys/arch/amiga/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.12 2002/02/23 00:31:11 miod Exp $ */ +/* $OpenBSD: pmap.h,v 1.13 2002/03/14 01:26:29 millert Exp $ */ #ifndef _MACHINE_PMAP_H_ #define _MACHINE_PMAP_H_ @@ -6,7 +6,7 @@ #include <m68k/pmap_motorola.h> #ifdef _KERNEL -void pmap_init_md __P((void)); +void pmap_init_md(void); #define PMAP_INIT_MD() pmap_init_md() #endif diff --git a/sys/arch/amiga/include/psl.h b/sys/arch/amiga/include/psl.h index 3e32805eea7..fc63d5523ac 100644 --- a/sys/arch/amiga/include/psl.h +++ b/sys/arch/amiga/include/psl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psl.h,v 1.12 2001/06/24 17:05:34 miod Exp $ */ +/* $OpenBSD: psl.h,v 1.13 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: psl.h,v 1.11 1996/11/30 00:33:49 is Exp $ */ #ifndef _MACHINE_PSL_H_ @@ -7,10 +7,10 @@ #include <m68k/psl.h> #if defined(_KERNEL) && !defined(_LOCORE) -static __inline int splraise __P((int)); -static __inline int splexact __P((int)); -static __inline void splx __P((int)); -static __inline int spllower __P((int)); +static __inline int splraise(int); +static __inline int splexact(int); +static __inline void splx(int); +static __inline int spllower(int); static __inline int splraise(npsl) @@ -46,7 +46,7 @@ splx(npsl) #ifdef IPL_REMAP_1 extern int isr_exter_ipl; -extern void walk_ipls __P((int, int)); +extern void walk_ipls(int, int); static __inline void splx(npsl) @@ -64,7 +64,7 @@ splx(npsl) #endif #ifdef IPL_REMAP_2 -extern int walk_ipls __P((int)); +extern int walk_ipls(int); static __inline void splx(npsl) diff --git a/sys/arch/amiga/isa/cross.c b/sys/arch/amiga/isa/cross.c index 181bb08bcb8..b17fcde3d37 100644 --- a/sys/arch/amiga/isa/cross.c +++ b/sys/arch/amiga/isa/cross.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cross.c,v 1.20 2001/11/28 16:24:26 art Exp $ */ +/* $OpenBSD: cross.c,v 1.21 2002/03/14 01:26:29 millert Exp $ */ /* * Copyright (c) 1994, 1996 Niklas Hallqvist, Carsten Hammer @@ -54,8 +54,8 @@ #include <amiga/isa/crossvar.h> #if 1 -void crossattach __P((struct device *, struct device *, void *)); -int crossmatch __P((struct device *, void *, void *)); +void crossattach(struct device *, struct device *, void *); +int crossmatch(struct device *, void *, void *); struct cfattach cross_ca = { sizeof(struct cross_softc), crossmatch, crossattach @@ -93,27 +93,27 @@ crossmatch(parent, match, aux) int crossdebug = 0; -void crossattach __P((struct device *, struct device *, void *)); -int crossmatch __P((struct device *, void *, void *)); -int crossprint __P((void *, const char *)); +void crossattach(struct device *, struct device *, void *); +int crossmatch(struct device *, void *, void *); +int crossprint(void *, const char *); -int cross_io_map __P((bus_space_tag_t, bus_addr_t, bus_size_t, int, - bus_space_handle_t *)); -int cross_mem_map __P((bus_space_tag_t, bus_addr_t, bus_size_t, int, - bus_space_handle_t *)); -int cross_io_unmap __P((bus_space_tag_t, bus_space_handle_t, bus_size_t)); -int cross_mem_unmap __P((bus_space_tag_t, bus_space_handle_t, bus_size_t)); +int cross_io_map(bus_space_tag_t, bus_addr_t, bus_size_t, int, + bus_space_handle_t *); +int cross_mem_map(bus_space_tag_t, bus_addr_t, bus_size_t, int, + bus_space_handle_t *); +int cross_io_unmap(bus_space_tag_t, bus_space_handle_t, bus_size_t); +int cross_mem_unmap(bus_space_tag_t, bus_space_handle_t, bus_size_t); -int crossintr __P((void *)); +int crossintr(void *); -void cross_attach_hook __P((struct device *, struct device *, - struct isabus_attach_args *)); +void cross_attach_hook(struct device *, struct device *, + struct isabus_attach_args *); void *cross_intr_establish __P((void *, int, int, int, int (*)(void *), void *, char *)); -void cross_intr_disestablish __P((void *, void *)); -int cross_intr_check __P((void *, int, int)); +void cross_intr_disestablish(void *, void *); +int cross_intr_check(void *, int, int); -int cross_pager_get_pages __P((vm_pager_t, struct vm_page **, int, boolean_t)); +int cross_pager_get_pages(vm_pager_t, struct vm_page **, int, boolean_t); struct cfattach cross_ca = { sizeof(struct cross_softc), crossmatch, crossattach diff --git a/sys/arch/amiga/isa/crossvar.h b/sys/arch/amiga/isa/crossvar.h index 5a725e0b9f2..663bc5350bb 100644 --- a/sys/arch/amiga/isa/crossvar.h +++ b/sys/arch/amiga/isa/crossvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: crossvar.h,v 1.7 2001/06/27 03:54:14 art Exp $ */ +/* $OpenBSD: crossvar.h,v 1.8 2002/03/14 01:26:29 millert Exp $ */ /* * Copyright (c) 1994, 1996 Niklas Hallqvist @@ -39,7 +39,7 @@ */ struct intrhand { struct intrhand *ih_next; - int (*ih_fun) __P ((void *)); + int (*ih_fun)(void *); void *ih_arg; u_long ih_count; int ih_irq; diff --git a/sys/arch/amiga/isa/ggbus.c b/sys/arch/amiga/isa/ggbus.c index 8ad6a563cdb..c30dd46d0f2 100644 --- a/sys/arch/amiga/isa/ggbus.c +++ b/sys/arch/amiga/isa/ggbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ggbus.c,v 1.14 2001/06/25 00:43:08 mickey Exp $ */ +/* $OpenBSD: ggbus.c,v 1.15 2002/03/14 01:26:29 millert Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Niklas Hallqvist @@ -54,26 +54,26 @@ int ggdebug = 0; int ggstrayints = 0; -void ggbusattach __P((struct device *, struct device *, void *)); -int ggbusmatch __P((struct device *, void *, void *)); -int ggbusprint __P((void *, const char *)); +void ggbusattach(struct device *, struct device *, void *); +int ggbusmatch(struct device *, void *, void *); +int ggbusprint(void *, const char *); -int ggbus_io_map __P((bus_space_tag_t, bus_addr_t, bus_size_t, int, - bus_space_handle_t *)); -int ggbus_mem_map __P((bus_space_tag_t, bus_addr_t, bus_size_t, int, - bus_space_handle_t *)); -int ggbus_cannot_mem_map __P((bus_space_tag_t, bus_addr_t, bus_size_t, int, - bus_space_handle_t *)); -int ggbus_unmap __P((bus_space_tag_t, bus_space_handle_t, bus_size_t)); +int ggbus_io_map(bus_space_tag_t, bus_addr_t, bus_size_t, int, + bus_space_handle_t *); +int ggbus_mem_map(bus_space_tag_t, bus_addr_t, bus_size_t, int, + bus_space_handle_t *); +int ggbus_cannot_mem_map(bus_space_tag_t, bus_addr_t, bus_size_t, int, + bus_space_handle_t *); +int ggbus_unmap(bus_space_tag_t, bus_space_handle_t, bus_size_t); -int ggbusintr __P((void *)); +int ggbusintr(void *); -void ggbus_attach_hook __P((struct device *, struct device *, - struct isabus_attach_args *)); +void ggbus_attach_hook(struct device *, struct device *, + struct isabus_attach_args *); void *ggbus_intr_establish __P((void *, int, int, int, int (*)(void *), void *, char *)); -void ggbus_intr_disestablish __P((void *, void *)); -int ggbus_intr_check __P((void *, int, int)); +void ggbus_intr_disestablish(void *, void *); +int ggbus_intr_check(void *, int, int); struct cfattach ggbus_ca = { sizeof(struct ggbus_softc), ggbusmatch, ggbusattach diff --git a/sys/arch/amiga/isa/ggbusvar.h b/sys/arch/amiga/isa/ggbusvar.h index d3aa2b7997f..334f412ce97 100644 --- a/sys/arch/amiga/isa/ggbusvar.h +++ b/sys/arch/amiga/isa/ggbusvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ggbusvar.h,v 1.4 1996/11/28 23:33:09 niklas Exp $ */ +/* $OpenBSD: ggbusvar.h,v 1.5 2002/03/14 01:26:29 millert Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Niklas Hallqvist @@ -39,7 +39,7 @@ */ struct intrhand { struct intrhand *ih_next; - int (*ih_fun) __P((void *)); + int (*ih_fun)(void *); void *ih_arg; u_long ih_count; int ih_irq; diff --git a/sys/arch/amiga/isa/isa_machdep.h b/sys/arch/amiga/isa/isa_machdep.h index a7d9c40efb9..6749560e84f 100644 --- a/sys/arch/amiga/isa/isa_machdep.h +++ b/sys/arch/amiga/isa/isa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.h,v 1.4 1999/01/19 10:04:55 niklas Exp $ */ +/* $OpenBSD: isa_machdep.h,v 1.5 2002/03/14 01:26:29 millert Exp $ */ /* * Copyright (c) 1995, 1996 Niklas Hallqvist @@ -42,15 +42,15 @@ typedef struct amiga_isa_chipset *isa_chipset_tag_t; struct amiga_isa_chipset { void *ic_data; - void (*ic_attach_hook) __P((struct device *, struct device *, - struct isabus_attach_args *)); + void (*ic_attach_hook)(struct device *, struct device *, + struct isabus_attach_args *); void *(*ic_intr_establish) __P((void *, int, int, int, int (*)(void *), void *, char *)); - void (*ic_intr_disestablish) __P((void *, void *)); - int (*ic_intr_check) __P((void *, int, int)); + void (*ic_intr_disestablish)(void *, void *); + int (*ic_intr_check)(void *, int, int); }; -int __isa_intr_check __P((int, int, int *)); +int __isa_intr_check(int, int, int *); /* * Functions provided to machine-independent ISA code. diff --git a/sys/arch/amiga/isa/isapnp_machdep.h b/sys/arch/amiga/isa/isapnp_machdep.h index d7508c2e016..df4457f7518 100644 --- a/sys/arch/amiga/isa/isapnp_machdep.h +++ b/sys/arch/amiga/isa/isapnp_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isapnp_machdep.h,v 1.1 1998/01/07 00:34:56 niklas Exp $ */ +/* $OpenBSD: isapnp_machdep.h,v 1.2 2002/03/14 01:26:29 millert Exp $ */ /* $NetBSD: isapnp_machdep.h,v 1.2 1997/10/04 17:32:32 thorpej Exp $ */ /*- @@ -70,7 +70,7 @@ /* * Functions provided to machine-independent ISA PnP code. */ -int isapnp_map __P((struct isapnp_softc *)); -void isapnp_unmap __P((struct isapnp_softc *)); -int isapnp_map_readport __P((struct isapnp_softc *)); -void isapnp_unmap_readport __P((struct isapnp_softc *)); +int isapnp_map(struct isapnp_softc *); +void isapnp_unmap(struct isapnp_softc *); +int isapnp_map_readport(struct isapnp_softc *); +void isapnp_unmap_readport(struct isapnp_softc *); diff --git a/sys/arch/amiga/stand/boot/aout2bb/aout2bb.c b/sys/arch/amiga/stand/boot/aout2bb/aout2bb.c index 006faa03658..1f7a1392168 100644 --- a/sys/arch/amiga/stand/boot/aout2bb/aout2bb.c +++ b/sys/arch/amiga/stand/boot/aout2bb/aout2bb.c @@ -1,5 +1,5 @@ /* - * $OpenBSD: aout2bb.c,v 1.2 1997/03/22 00:20:48 niklas Exp $ + * $OpenBSD: aout2bb.c,v 1.3 2002/03/14 01:26:29 millert Exp $ * $NetBSD: aout2bb.c,v 1.2 1996/12/31 22:39:58 veego Exp $ * * Copyright (c) 1996 Ignatios Souvatzis @@ -51,7 +51,7 @@ #include "aout2bb.h" #include "chksum.h" -void usage __P((void)); +void usage(void); int intcmp(const void *, const void *); int main(int argc, char *argv[]); diff --git a/sys/arch/amiga/stand/boot/aout2bb/chksum.h b/sys/arch/amiga/stand/boot/aout2bb/chksum.h index 34fddcf8cca..f3528f8a63f 100644 --- a/sys/arch/amiga/stand/boot/aout2bb/chksum.h +++ b/sys/arch/amiga/stand/boot/aout2bb/chksum.h @@ -1,5 +1,5 @@ /* - * $OpenBSD: chksum.h,v 1.1 1997/01/16 09:26:51 niklas Exp $ + * $OpenBSD: chksum.h,v 1.2 2002/03/14 01:26:29 millert Exp $ * $NetBSD: chksum.h,v 1.1.1.1 1996/11/29 23:36:30 is Exp $ * * Copyright (c) 1996 Ignatios Souvatzis @@ -35,5 +35,5 @@ #define CHKSUMOFFS 1 -u_int32_t chksum __P((u_int32_t *, int)); +u_int32_t chksum(u_int32_t *, int); diff --git a/sys/arch/amiga/stand/boot/main.c b/sys/arch/amiga/stand/boot/main.c index c788275d318..bfaf4d86d9a 100644 --- a/sys/arch/amiga/stand/boot/main.c +++ b/sys/arch/amiga/stand/boot/main.c @@ -1,5 +1,5 @@ /* - * $OpenBSD: main.c,v 1.4 2000/02/12 15:29:06 espie Exp $ + * $OpenBSD: main.c,v 1.5 2002/03/14 01:26:29 millert Exp $ * $NetBSD: main.c,v 1.1.1.1 1996/11/29 23:36:29 is Exp $ * * @@ -60,10 +60,10 @@ #define EXECMIN 36 -void startit __P((void *, u_long, u_long, void *, u_long, u_long, int, void *, - int, int, u_long, u_long, int)); -void startit_end __P((void)); -int get_cpuid __P((u_int32_t *)); +void startit(void *, u_long, u_long, void *, u_long, u_long, int, void *, + int, int, u_long, u_long, int); +void startit_end(void); +int get_cpuid(u_int32_t *); /* * Kernel startup interface version diff --git a/sys/arch/amiga/stand/boot/xd.c b/sys/arch/amiga/stand/boot/xd.c index b3831842c60..31e068ee980 100644 --- a/sys/arch/amiga/stand/boot/xd.c +++ b/sys/arch/amiga/stand/boot/xd.c @@ -1,5 +1,5 @@ /* - * $OpenBSD: xd.c,v 1.1 1997/01/16 09:26:45 niklas Exp $ + * $OpenBSD: xd.c,v 1.2 2002/03/14 01:26:29 millert Exp $ * $NetBSD: xd.c,v 1.1.1.1 1996/11/29 23:36:29 is Exp $ * * Copyright (c) 1996 Ignatios Souvatzis. @@ -42,10 +42,10 @@ #include "amigaio.h" #include "libstubs.h" -static int xdstrategy __P((void *, int, daddr_t, size_t, void *, size_t *)); -static int xdopen __P((struct open_file *, ...)); -static int xdclose __P((struct open_file *)); -static int xdioctl __P((struct open_file *, u_long, void *)); +static int xdstrategy(void *, int, daddr_t, size_t, void *, size_t *); +static int xdopen(struct open_file *, ...); +static int xdclose(struct open_file *); +static int xdioctl(struct open_file *, u_long, void *); static u_int32_t aio_base; static struct AmigaIO *aio_save; diff --git a/sys/arch/amiga/stand/loadbsd/loadbsd.c b/sys/arch/amiga/stand/loadbsd/loadbsd.c index a960993f653..c6725aa7849 100644 --- a/sys/arch/amiga/stand/loadbsd/loadbsd.c +++ b/sys/arch/amiga/stand/loadbsd/loadbsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: loadbsd.c,v 1.14 2000/06/07 15:39:24 espie Exp $ */ +/* $OpenBSD: loadbsd.c,v 1.15 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: loadbsd.c,v 1.22 1996/10/13 13:39:52 is Exp $ */ /* @@ -73,10 +73,10 @@ #define __P(x) #endif #endif -void err __P((int, const char *, ...)); -void errx __P((int, const char *, ...)); -void warn __P((const char *, ...)); -void warnx __P((const char *, ...)); +void err(int, const char *, ...); +void errx(int, const char *, ...); +void warn(const char *, ...); +void warnx(const char *, ...); #endif extern const char _version[]; @@ -158,19 +158,19 @@ struct boot_memlist { struct boot_memlist memlist; struct boot_memlist *kmemlist; -void get_mem_config __P((void **, u_long *, u_long *)); -void get_cpuid __P((void)); -void get_eclock __P((void)); -void get_AGA __P((void)); -void usage __P((void)); -void verbose_usage __P((void)); -void Version __P((void)); -void startit __P((void *, u_long, u_long, void *, u_long, u_long, int, void *, - int, int, u_long, u_long, int)); -void startit_end __P((void)); +void get_mem_config(void **, u_long *, u_long *); +void get_cpuid(void); +void get_eclock(void); +void get_AGA(void); +void usage(void); +void verbose_usage(void); +void Version(void); +void startit(void *, u_long, u_long, void *, u_long, u_long, int, void *, + int, int, u_long, u_long, int); +void startit_end(void); -extern void open_libraries __P((void)); -extern void ensure_no_poolmem __P((void)); +extern void open_libraries(void); +extern void ensure_no_poolmem(void); extern struct ExecBase *SysBase; extern char *optarg; @@ -207,8 +207,8 @@ main(argc, argv) int *nkcd; void *fmem; char *esym; - void (*start_it) __P((void *, u_long, u_long, void *, u_long, u_long, - int, void *, int, int, u_long, u_long, int)) = startit; + void (*start_it)(void *, u_long, u_long, void *, u_long, u_long, + int, void *, int, int, u_long, u_long, int) = startit; program_name = argv[0]; boothowto = RB_AUTOBOOT; diff --git a/sys/arch/amiga/stand/loadkmap/loadkmap.c b/sys/arch/amiga/stand/loadkmap/loadkmap.c index ddb7eb102c2..50a31992acf 100644 --- a/sys/arch/amiga/stand/loadkmap/loadkmap.c +++ b/sys/arch/amiga/stand/loadkmap/loadkmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: loadkmap.c,v 1.2 1996/10/04 22:35:36 niklas Exp $ */ +/* $OpenBSD: loadkmap.c,v 1.3 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: loadkmap.c,v 1.4 1994/10/26 02:07:09 cgd Exp $ */ #include <sys/types.h> @@ -9,7 +9,7 @@ #include <stdio.h> -void load_kmap __P((const char *)); +void load_kmap(const char *); void dump_kmap(); int diff --git a/sys/arch/hp300/dev/ac.c b/sys/arch/hp300/dev/ac.c index 693444f5114..17d3247e2f4 100644 --- a/sys/arch/hp300/dev/ac.c +++ b/sys/arch/hp300/dev/ac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ac.c,v 1.8 2001/05/31 10:21:01 art Exp $ */ +/* $OpenBSD: ac.c,v 1.9 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: ac.c,v 1.9 1997/04/02 22:37:21 scottr Exp $ */ /* @@ -69,12 +69,12 @@ /* cdev_decl(ac); */ /* XXX we should use macros to do these... */ -int acopen __P((dev_t, int, int, struct proc *)); -int acclose __P((dev_t, int, int, struct proc *)); -int acioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); +int acopen(dev_t, int, int, struct proc *); +int acclose(dev_t, int, int, struct proc *); +int acioctl(dev_t, u_long, caddr_t, int, struct proc *); -static int acmatch __P((struct device *, void *, void *)); -static void acattach __P((struct device *, struct device *, void *)); +static int acmatch(struct device *, void *, void *); +static void acattach(struct device *, struct device *, void *); struct cfattach ac_ca = { sizeof(struct ac_softc), acmatch, acattach @@ -84,9 +84,9 @@ struct cfdriver ac_cd = { NULL, "ac", DV_DULL }; -void acstart __P((void *)); -void acgo __P((void *)); -void acintr __P((void *, int)); +void acstart(void *); +void acgo(void *); +void acintr(void *, int); #ifdef DEBUG int ac_debug = 0x0000; diff --git a/sys/arch/hp300/dev/acvar.h b/sys/arch/hp300/dev/acvar.h index 96b622886e9..afe4c2e6eda 100644 --- a/sys/arch/hp300/dev/acvar.h +++ b/sys/arch/hp300/dev/acvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: acvar.h,v 1.4 1997/04/16 11:55:56 downsj Exp $ */ +/* $OpenBSD: acvar.h,v 1.5 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: acvar.h,v 1.4 1997/03/31 07:32:15 scottr Exp $ */ /* @@ -89,12 +89,12 @@ struct ac_restatdb { }; #ifdef _KERNEL -int accommand __P((dev_t, int, char *, int)); +int accommand(dev_t, int, char *, int); -void acstart __P((void *)); -void acgo __P((void *)); -void acintr __P((void *, int)); +void acstart(void *); +void acgo(void *); +void acintr(void *, int); -int acgeteinfo __P((dev_t)); -void acconvert __P((char *, char *, int)); +int acgeteinfo(dev_t); +void acconvert(char *, char *, int); #endif /* _KERNEL */ diff --git a/sys/arch/hp300/dev/apci.c b/sys/arch/hp300/dev/apci.c index 260a000852c..f78e3316b42 100644 --- a/sys/arch/hp300/dev/apci.c +++ b/sys/arch/hp300/dev/apci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apci.c,v 1.11 2001/09/23 07:05:06 millert Exp $ */ +/* $OpenBSD: apci.c,v 1.12 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: apci.c,v 1.9 2000/11/02 00:35:05 eeh Exp $ */ /*- @@ -143,8 +143,8 @@ struct apci_softc { #define APCI_ISCONSOLE 0x02 /* unit is console */ #define APCI_SOFTCAR 0x04 /* soft carrier */ -int apcimatch __P((struct device *, void *, void *)); -void apciattach __P((struct device *, struct device *, void *)); +int apcimatch(struct device *, void *, void *); +void apciattach(struct device *, struct device *, void *); struct cfattach apci_ca = { sizeof(struct apci_softc), apcimatch, apciattach @@ -154,14 +154,14 @@ struct cfdriver apci_cd = { NULL, "apci", DV_TTY }; -int apciintr __P((void *)); -void apcieint __P((struct apci_softc *, int)); -void apcimint __P((struct apci_softc *, u_char)); -int apciparam __P((struct tty *, struct termios *)); -void apcistart __P((struct tty *)); -int apcimctl __P((struct apci_softc *, int, int)); -void apciinit __P((struct apciregs *, int)); -void apcitimeout __P((void *)); +int apciintr(void *); +void apcieint(struct apci_softc *, int); +void apcimint(struct apci_softc *, u_char); +int apciparam(struct tty *, struct termios *); +void apcistart(struct tty *); +int apcimctl(struct apci_softc *, int, int); +void apciinit(struct apciregs *, int); +void apcitimeout(void *); cdev_decl(apci); @@ -197,10 +197,10 @@ struct apciregs *apci_cn = NULL; /* console hardware */ int apciconsinit; /* has been initialized */ int apcimajor; /* our major number */ -void apcicnprobe __P((struct consdev *)); -void apcicninit __P((struct consdev *)); -int apcicngetc __P((dev_t)); -void apcicnputc __P((dev_t, int)); +void apcicnprobe(struct consdev *); +void apcicninit(struct consdev *); +int apcicngetc(dev_t); +void apcicnputc(dev_t, int); int diff --git a/sys/arch/hp300/dev/ct.c b/sys/arch/hp300/dev/ct.c index 6b9f68b7942..ef2b5e8ccda 100644 --- a/sys/arch/hp300/dev/ct.c +++ b/sys/arch/hp300/dev/ct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ct.c,v 1.7 1997/04/16 11:55:57 downsj Exp $ */ +/* $OpenBSD: ct.c,v 1.8 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: ct.c,v 1.21 1997/04/02 22:37:23 scottr Exp $ */ /* @@ -109,8 +109,8 @@ struct ct_softc { #define CTF_CANSTREAM 0x200 #define CTF_WRTTN 0x400 -int ctmatch __P((struct device *, void *, void *)); -void ctattach __P((struct device *, struct device *, void *)); +int ctmatch(struct device *, void *, void *); +void ctattach(struct device *, struct device *, void *); struct cfattach ct_ca = { sizeof(struct ct_softc), ctmatch, ctattach @@ -120,20 +120,20 @@ struct cfdriver ct_cd = { NULL, "ct", DV_TAPE }; -int ctident __P((struct device *, struct ct_softc *, - struct hpibbus_attach_args *)); +int ctident(struct device *, struct ct_softc *, + struct hpibbus_attach_args *); -void ctreset __P((struct ct_softc *)); -void ctaddeof __P((struct ct_softc *)); -void ctustart __P((struct ct_softc *)); -void cteof __P((struct ct_softc *, struct buf *)); -void ctdone __P((struct ct_softc *, struct buf *)); +void ctreset(struct ct_softc *); +void ctaddeof(struct ct_softc *); +void ctustart(struct ct_softc *); +void cteof(struct ct_softc *, struct buf *); +void ctdone(struct ct_softc *, struct buf *); -void ctstart __P((void *)); -void ctgo __P((void *)); -void ctintr __P((void *)); +void ctstart(void *); +void ctgo(void *); +void ctintr(void *); -void ctcommand __P((dev_t, int, int)); +void ctcommand(dev_t, int, int); cdev_decl(ct); bdev_decl(ct); diff --git a/sys/arch/hp300/dev/dca.c b/sys/arch/hp300/dev/dca.c index 506484a74ba..78652a5b716 100644 --- a/sys/arch/hp300/dev/dca.c +++ b/sys/arch/hp300/dev/dca.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dca.c,v 1.14 2002/02/15 20:45:30 nordin Exp $ */ +/* $OpenBSD: dca.c,v 1.15 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: dca.c,v 1.35 1997/05/05 20:58:18 thorpej Exp $ */ /* @@ -94,8 +94,8 @@ struct dca_softc { }; -int dcamatch __P((struct device *, void *, void *)); -void dcaattach __P((struct device *, struct device *, void *)); +int dcamatch(struct device *, void *, void *); +void dcaattach(struct device *, struct device *, void *); struct cfattach dca_ca = { sizeof(struct dca_softc), dcamatch, dcaattach @@ -110,21 +110,21 @@ int dcamajor; cdev_decl(dca); -int dcaintr __P((void *)); -void dcaeint __P((struct dca_softc *, int)); -void dcamint __P((struct dca_softc *)); +int dcaintr(void *); +void dcaeint(struct dca_softc *, int); +void dcamint(struct dca_softc *); -int dcaparam __P((struct tty *, struct termios *)); -void dcastart __P((struct tty *)); -int dcastop __P((struct tty *, int)); -int dcamctl __P((struct dca_softc *, int, int)); -void dcainit __P((struct dcadevice *, int)); +int dcaparam(struct tty *, struct termios *); +void dcastart(struct tty *); +int dcastop(struct tty *, int); +int dcamctl(struct dca_softc *, int, int); +void dcainit(struct dcadevice *, int); -int dca_console_scan __P((int, caddr_t, void *)); -void dcacnprobe __P((struct consdev *)); -void dcacninit __P((struct consdev *)); -int dcacngetc __P((dev_t)); -void dcacnputc __P((dev_t, int)); +int dca_console_scan(int, caddr_t, void *); +void dcacnprobe(struct consdev *); +void dcacninit(struct consdev *); +int dcacngetc(dev_t); +void dcacnputc(dev_t, int); /* * Stuff for DCA console support. @@ -170,7 +170,7 @@ long dcaintrcount[16]; long dcamintcount[16]; #endif -void dcainit __P((struct dcadevice *, int)); +void dcainit(struct dcadevice *, int); int dcamatch(parent, match, aux) diff --git a/sys/arch/hp300/dev/dcm.c b/sys/arch/hp300/dev/dcm.c index e37846cf27f..5114370dd05 100644 --- a/sys/arch/hp300/dev/dcm.c +++ b/sys/arch/hp300/dev/dcm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dcm.c,v 1.12 2002/02/15 20:45:30 nordin Exp $ */ +/* $OpenBSD: dcm.c,v 1.13 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: dcm.c,v 1.41 1997/05/05 20:59:16 thorpej Exp $ */ /* @@ -251,30 +251,30 @@ struct dcm_softc { cdev_decl(dcm); -int dcmintr __P((void *)); -void dcmpint __P((struct dcm_softc *, int, int)); -void dcmrint __P((struct dcm_softc *)); -void dcmreadbuf __P((struct dcm_softc *, int)); -void dcmxint __P((struct dcm_softc *, int)); -void dcmmint __P((struct dcm_softc *, int, int)); - -int dcmparam __P((struct tty *, struct termios *)); -void dcmstart __P((struct tty *)); -int dcmstop __P((struct tty *, int)); -int dcmmctl __P((dev_t, int, int)); -void dcmsetischeme __P((int, int)); -void dcminit __P((struct dcmdevice *, int, int)); - -int dcmselftest __P((struct dcm_softc *)); - -int dcm_console_scan __P((int, caddr_t, void *)); -void dcmcnprobe __P((struct consdev *)); -void dcmcninit __P((struct consdev *)); -int dcmcngetc __P((dev_t)); -void dcmcnputc __P((dev_t, int)); - -int dcmmatch __P((struct device *, void *, void *)); -void dcmattach __P((struct device *, struct device *, void *)); +int dcmintr(void *); +void dcmpint(struct dcm_softc *, int, int); +void dcmrint(struct dcm_softc *); +void dcmreadbuf(struct dcm_softc *, int); +void dcmxint(struct dcm_softc *, int); +void dcmmint(struct dcm_softc *, int, int); + +int dcmparam(struct tty *, struct termios *); +void dcmstart(struct tty *); +int dcmstop(struct tty *, int); +int dcmmctl(dev_t, int, int); +void dcmsetischeme(int, int); +void dcminit(struct dcmdevice *, int, int); + +int dcmselftest(struct dcm_softc *); + +int dcm_console_scan(int, caddr_t, void *); +void dcmcnprobe(struct consdev *); +void dcmcninit(struct consdev *); +int dcmcngetc(dev_t); +void dcmcnputc(dev_t, int); + +int dcmmatch(struct device *, void *, void *); +void dcmattach(struct device *, struct device *, void *); struct cfattach dcm_ca = { sizeof(struct dcm_softc), dcmmatch, dcmattach diff --git a/sys/arch/hp300/dev/dio.c b/sys/arch/hp300/dev/dio.c index 4050e865588..eb4ecaf449b 100644 --- a/sys/arch/hp300/dev/dio.c +++ b/sys/arch/hp300/dev/dio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dio.c,v 1.6 1997/10/06 06:44:49 millert Exp $ */ +/* $OpenBSD: dio.c,v 1.7 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: dio.c,v 1.7 1997/05/05 21:00:32 thorpej Exp $ */ /*- @@ -63,13 +63,13 @@ extern caddr_t internalhpib; -int dio_scodesize __P((struct dio_attach_args *)); -char *dio_devinfo __P((struct dio_attach_args *, char *, size_t)); +int dio_scodesize(struct dio_attach_args *); +char *dio_devinfo(struct dio_attach_args *, char *, size_t); -int diomatch __P((struct device *, void *, void *)); -void dioattach __P((struct device *, struct device *, void *)); -int dioprint __P((void *, const char *)); -int diosubmatch __P((struct device *, void *, void *)); +int diomatch(struct device *, void *, void *); +void dioattach(struct device *, struct device *, void *); +int dioprint(void *, const char *); +int diosubmatch(struct device *, void *, void *); struct cfattach dio_ca = { sizeof(struct device), diomatch, dioattach @@ -320,7 +320,7 @@ dio_devinfo(da, buf, buflen) */ void * dio_intr_establish(func, arg, ipl, priority) - int (*func) __P((void *)); + int (*func)(void *); void *arg; int ipl; int priority; diff --git a/sys/arch/hp300/dev/diovar.h b/sys/arch/hp300/dev/diovar.h index 735334aa099..b211dc371a3 100644 --- a/sys/arch/hp300/dev/diovar.h +++ b/sys/arch/hp300/dev/diovar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: diovar.h,v 1.3 1997/07/06 08:01:48 downsj Exp $ */ +/* $OpenBSD: diovar.h,v 1.4 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: diovar.h,v 1.3 1997/05/05 21:01:33 thorpej Exp $ */ /*- @@ -76,7 +76,7 @@ struct dio_devdesc { #define DIO_UNKNOWN_SCODE -1 #ifdef _KERNEL -void *dio_scodetopa __P((int)); +void *dio_scodetopa(int); void *dio_intr_establish __P((int (*)(void *), void *, int, int)); -void dio_intr_disestablish __P((void *)); +void dio_intr_disestablish(void *); #endif /* _KERNEL */ diff --git a/sys/arch/hp300/dev/dma.c b/sys/arch/hp300/dev/dma.c index cde3f981f0f..0f577c73520 100644 --- a/sys/arch/hp300/dev/dma.c +++ b/sys/arch/hp300/dev/dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dma.c,v 1.11 2001/11/04 02:58:51 miod Exp $ */ +/* $OpenBSD: dma.c,v 1.12 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: dma.c,v 1.19 1997/05/05 21:02:39 thorpej Exp $ */ /* @@ -102,7 +102,7 @@ struct dma_softc { #define DMAF_VCFLUSH 0x02 #define DMAF_NOINTR 0x04 -int dmaintr __P((void *)); +int dmaintr(void *); #ifdef DEBUG int dmadebug = 0; @@ -111,7 +111,7 @@ int dmadebug = 0; #define DDB_FOLLOW 0x04 #define DDB_IO 0x08 -void dmatimeout __P((void *)); +void dmatimeout(void *); int dmatimo[NDMACHAN]; long dmahits[NDMACHAN]; diff --git a/sys/arch/hp300/dev/dmavar.h b/sys/arch/hp300/dev/dmavar.h index 19679b61638..cfb8897fa3e 100644 --- a/sys/arch/hp300/dev/dmavar.h +++ b/sys/arch/hp300/dev/dmavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dmavar.h,v 1.4 1997/04/16 11:56:01 downsj Exp $ */ +/* $OpenBSD: dmavar.h,v 1.5 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: dmavar.h,v 1.9 1997/04/01 03:10:59 scottr Exp $ */ /* @@ -65,15 +65,15 @@ struct dmaqueue { * it has been given the DMA controller, and to stop the * initiator when the DMA controller has stopped. */ - void (*dq_start) __P((void *)); - void (*dq_done) __P((void *)); + void (*dq_start)(void *); + void (*dq_done)(void *); }; #ifdef _KERNEL -void dmainit __P((void)); -void dmago __P((int, char *, int, int)); -void dmastop __P((int)); -void dmafree __P((struct dmaqueue *)); -int dmareq __P((struct dmaqueue *)); -void dmacomputeipl __P((void)); +void dmainit(void); +void dmago(int, char *, int, int); +void dmastop(int); +void dmafree(struct dmaqueue *); +int dmareq(struct dmaqueue *); +void dmacomputeipl(void); #endif /* _KERNEL */ diff --git a/sys/arch/hp300/dev/fhpib.c b/sys/arch/hp300/dev/fhpib.c index c45742ab320..aa9c9df07c2 100644 --- a/sys/arch/hp300/dev/fhpib.c +++ b/sys/arch/hp300/dev/fhpib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fhpib.c,v 1.9 2001/05/01 16:51:09 millert Exp $ */ +/* $OpenBSD: fhpib.c,v 1.10 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: fhpib.c,v 1.18 1997/05/05 21:04:16 thorpej Exp $ */ /* @@ -80,18 +80,18 @@ int doppollint = 1; /* use ppoll interrupts instead of watchdog */ int fhpibppolldelay = 50; #endif -void fhpibifc __P((struct fhpibdevice *)); -void fhpibdmadone __P((void *)); -int fhpibwait __P((struct fhpibdevice *, int)); +void fhpibifc(struct fhpibdevice *); +void fhpibdmadone(void *); +int fhpibwait(struct fhpibdevice *, int); -void fhpibreset __P((struct hpibbus_softc *)); -int fhpibsend __P((struct hpibbus_softc *, int, int, void *, int)); -int fhpibrecv __P((struct hpibbus_softc *, int, int, void *, int)); -int fhpibppoll __P((struct hpibbus_softc *)); -void fhpibppwatch __P((void *)); -void fhpibgo __P((struct hpibbus_softc *, int, int, void *, int, int, int)); -void fhpibdone __P((struct hpibbus_softc *)); -int fhpibintr __P((void *)); +void fhpibreset(struct hpibbus_softc *); +int fhpibsend(struct hpibbus_softc *, int, int, void *, int); +int fhpibrecv(struct hpibbus_softc *, int, int, void *, int); +int fhpibppoll(struct hpibbus_softc *); +void fhpibppwatch(void *); +void fhpibgo(struct hpibbus_softc *, int, int, void *, int, int, int); +void fhpibdone(struct hpibbus_softc *); +int fhpibintr(void *); /* * Our controller ops structure. @@ -118,8 +118,8 @@ struct fhpib_softc { struct hpibbus_softc *sc_hpibbus; /* XXX */ }; -int fhpibmatch __P((struct device *, void *, void *)); -void fhpibattach __P((struct device *, struct device *, void *)); +int fhpibmatch(struct device *, void *, void *); +void fhpibattach(struct device *, struct device *, void *); struct cfattach fhpib_ca = { sizeof(struct fhpib_softc), fhpibmatch, fhpibattach diff --git a/sys/arch/hp300/dev/frodo.c b/sys/arch/hp300/dev/frodo.c index e3e1e9c4b20..945cff1a19a 100644 --- a/sys/arch/hp300/dev/frodo.c +++ b/sys/arch/hp300/dev/frodo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frodo.c,v 1.2 2001/05/10 20:17:54 millert Exp $ */ +/* $OpenBSD: frodo.c,v 1.3 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: frodo.c,v 1.5 1999/07/31 21:15:20 thorpej Exp $ */ /*- @@ -88,7 +88,7 @@ * Description of a Frodo interrupt handler. */ struct frodo_isr { - int (*isr_func) __P((void *)); + int (*isr_func)(void *); void *isr_arg; int isr_priority; }; @@ -101,15 +101,15 @@ struct frodo_softc { int sc_refcnt; /* number of interrupt refs */ }; -int frodomatch __P((struct device *, void *, void *)); -void frodoattach __P((struct device *, struct device *, void *)); +int frodomatch(struct device *, void *, void *); +void frodoattach(struct device *, struct device *, void *); -int frodoprint __P((void *, const char *)); -int frodosubmatch __P((struct device *, void *, void *)); +int frodoprint(void *, const char *); +int frodosubmatch(struct device *, void *, void *); -int frodointr __P((void *)); +int frodointr(void *); -void frodo_imask __P((struct frodo_softc *, u_int16_t, u_int16_t)); +void frodo_imask(struct frodo_softc *, u_int16_t, u_int16_t); struct cfattach frodo_ca = { sizeof(struct frodo_softc), frodomatch, frodoattach @@ -248,7 +248,7 @@ frodoprint(aux, pnp) void frodo_intr_establish(frdev, func, arg, line, priority) struct device *frdev; - int (*func) __P((void *)); + int (*func)(void *); void *arg; int line; int priority; diff --git a/sys/arch/hp300/dev/frodovar.h b/sys/arch/hp300/dev/frodovar.h index 7cd5dde1b3c..6958d75eef9 100644 --- a/sys/arch/hp300/dev/frodovar.h +++ b/sys/arch/hp300/dev/frodovar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: frodovar.h,v 1.1 1997/07/06 08:01:51 downsj Exp $ */ +/* $OpenBSD: frodovar.h,v 1.2 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: frodovar.h,v 1.1 1997/05/12 08:03:50 thorpej Exp $ */ /* @@ -46,4 +46,4 @@ struct frodo_attach_args { void frodo_intr_establish __P((struct device *, int (*func)(void *), void *, int, int)); -void frodo_intr_disestablish __P((struct device *, int)); +void frodo_intr_disestablish(struct device *, int); diff --git a/sys/arch/hp300/dev/grf.c b/sys/arch/hp300/dev/grf.c index 322cc2e78e9..4f3b20b93ec 100644 --- a/sys/arch/hp300/dev/grf.c +++ b/sys/arch/hp300/dev/grf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf.c,v 1.18 2001/12/19 08:58:05 art Exp $ */ +/* $OpenBSD: grf.c,v 1.19 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: grf.c,v 1.30 1998/08/20 08:33:41 kleink Exp $ */ /* @@ -88,8 +88,8 @@ extern struct emul emul_hpux; /* prototypes for the devsw entry points */ cdev_decl(grf); -int grfmatch __P((struct device *, void *, void *)); -void grfattach __P((struct device *, struct device *, void *)); +int grfmatch(struct device *, void *, void *); +void grfattach(struct device *, struct device *, void *); struct cfattach grf_ca = { sizeof(struct grf_softc), grfmatch, grfattach @@ -99,7 +99,7 @@ struct cfdriver grf_cd = { NULL, "grf", DV_DULL }; -int grfprint __P((void *, const char *)); +int grfprint(void *, const char *); /* * Frambuffer state information, statically allocated for benefit diff --git a/sys/arch/hp300/dev/grf_dv.c b/sys/arch/hp300/dev/grf_dv.c index 196ea7bf7cb..c26649795d8 100644 --- a/sys/arch/hp300/dev/grf_dv.c +++ b/sys/arch/hp300/dev/grf_dv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_dv.c,v 1.7 2000/11/10 15:33:05 provos Exp $ */ +/* $OpenBSD: grf_dv.c,v 1.8 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: grf_dv.c,v 1.11 1997/03/31 07:34:14 scottr Exp $ */ /* @@ -75,19 +75,19 @@ #include "ite.h" -int dv_init __P((struct grf_data *, int, caddr_t)); -int dv_mode __P((struct grf_data *, int, caddr_t)); -void dv_reset __P((struct dvboxfb *)); +int dv_init(struct grf_data *, int, caddr_t); +int dv_mode(struct grf_data *, int, caddr_t); +void dv_reset(struct dvboxfb *); -int dvbox_intio_match __P((struct device *, void *, void *)); -void dvbox_intio_attach __P((struct device *, struct device *, void *)); +int dvbox_intio_match(struct device *, void *, void *); +void dvbox_intio_attach(struct device *, struct device *, void *); -int dvbox_dio_match __P((struct device *, void *, void *)); -void dvbox_dio_attach __P((struct device *, struct device *, void *)); +int dvbox_dio_match(struct device *, void *, void *); +void dvbox_dio_attach(struct device *, struct device *, void *); -int dvbox_console_scan __P((int, caddr_t, void *)); -void dvboxcnprobe __P((struct consdev *cp)); -void dvboxcninit __P((struct consdev *cp)); +int dvbox_console_scan(int, caddr_t, void *); +void dvboxcnprobe(struct consdev *cp); +void dvboxcninit(struct consdev *cp); struct cfattach dvbox_intio_ca = { sizeof(struct grfdev_softc), dvbox_intio_match, dvbox_intio_attach @@ -107,14 +107,14 @@ struct grfsw dvbox_grfsw = { }; #if NITE > 0 -void dvbox_init __P((struct ite_data *)); -void dvbox_deinit __P((struct ite_data *)); -void dvbox_putc __P((struct ite_data *, int, int, int, int)); -void dvbox_cursor __P((struct ite_data *, int)); -void dvbox_clear __P((struct ite_data *, int, int, int, int)); -void dvbox_scroll __P((struct ite_data *, int, int, int, int)); -void dvbox_windowmove __P((struct ite_data *, int, int, int, int, - int, int, int)); +void dvbox_init(struct ite_data *); +void dvbox_deinit(struct ite_data *); +void dvbox_putc(struct ite_data *, int, int, int, int); +void dvbox_cursor(struct ite_data *, int); +void dvbox_clear(struct ite_data *, int, int, int, int); +void dvbox_scroll(struct ite_data *, int, int, int, int); +void dvbox_windowmove(struct ite_data *, int, int, int, int, + int, int, int); /* DaVinci ite switch */ struct itesw dvbox_itesw = { diff --git a/sys/arch/hp300/dev/grf_gb.c b/sys/arch/hp300/dev/grf_gb.c index 4e1b70161f6..dfb7bed13d1 100644 --- a/sys/arch/hp300/dev/grf_gb.c +++ b/sys/arch/hp300/dev/grf_gb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_gb.c,v 1.6 1997/04/16 11:56:03 downsj Exp $ */ +/* $OpenBSD: grf_gb.c,v 1.7 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: grf_gb.c,v 1.11 1997/03/31 07:34:15 scottr Exp $ */ /* @@ -85,19 +85,19 @@ u_char crtc_init_data[CRTC_DATA_LENGTH] = { 0x30, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00 }; -int gb_init __P((struct grf_data *gp, int, caddr_t)); -int gb_mode __P((struct grf_data *gp, int, caddr_t)); -void gb_microcode __P((struct gboxfb *)); +int gb_init(struct grf_data *gp, int, caddr_t); +int gb_mode(struct grf_data *gp, int, caddr_t); +void gb_microcode(struct gboxfb *); -int gbox_intio_match __P((struct device *, void *, void *)); -void gbox_intio_attach __P((struct device *, struct device *, void *)); +int gbox_intio_match(struct device *, void *, void *); +void gbox_intio_attach(struct device *, struct device *, void *); -int gbox_dio_match __P((struct device *, void *, void *)); -void gbox_dio_attach __P((struct device *, struct device *, void *)); +int gbox_dio_match(struct device *, void *, void *); +void gbox_dio_attach(struct device *, struct device *, void *); -int gbox_console_scan __P((int, caddr_t, void *)); -void gboxcnprobe __P((struct consdev *cp)); -void gboxcninit __P((struct consdev *cp)); +int gbox_console_scan(int, caddr_t, void *); +void gboxcnprobe(struct consdev *cp); +void gboxcninit(struct consdev *cp); struct cfattach gbox_intio_ca = { sizeof(struct grfdev_softc), gbox_intio_match, gbox_intio_attach @@ -117,14 +117,14 @@ struct grfsw gbox_grfsw = { }; #if NITE > 0 -void gbox_init __P((struct ite_data *)); -void gbox_deinit __P((struct ite_data *)); -void gbox_putc __P((struct ite_data *, int, int, int, int)); -void gbox_cursor __P((struct ite_data *, int)); -void gbox_clear __P((struct ite_data *, int, int, int, int)); -void gbox_scroll __P((struct ite_data *, int, int, int, int)); -void gbox_windowmove __P((struct ite_data *, int, int, int, int, - int, int, int)); +void gbox_init(struct ite_data *); +void gbox_deinit(struct ite_data *); +void gbox_putc(struct ite_data *, int, int, int, int); +void gbox_cursor(struct ite_data *, int); +void gbox_clear(struct ite_data *, int, int, int, int); +void gbox_scroll(struct ite_data *, int, int, int, int); +void gbox_windowmove(struct ite_data *, int, int, int, int, + int, int, int); /* Gatorbox ite switch */ struct itesw gbox_itesw = { diff --git a/sys/arch/hp300/dev/grf_hy.c b/sys/arch/hp300/dev/grf_hy.c index 300d032aa0f..96939b98c80 100644 --- a/sys/arch/hp300/dev/grf_hy.c +++ b/sys/arch/hp300/dev/grf_hy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_hy.c,v 1.7 2000/11/10 15:33:05 provos Exp $ */ +/* $OpenBSD: grf_hy.c,v 1.8 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: grf_hy.c,v 1.9 1997/03/31 07:34:16 scottr Exp $ */ /* @@ -79,16 +79,16 @@ caddr_t badhyaddr = (caddr_t) -1; -int hy_init __P((struct grf_data *gp, int, caddr_t)); -int hy_mode __P((struct grf_data *gp, int, caddr_t)); -void hyper_ite_fontinit __P((struct ite_data *)); +int hy_init(struct grf_data *gp, int, caddr_t); +int hy_mode(struct grf_data *gp, int, caddr_t); +void hyper_ite_fontinit(struct ite_data *); -int hyper_dio_match __P((struct device *, void *, void *)); -void hyper_dio_attach __P((struct device *, struct device *, void *)); +int hyper_dio_match(struct device *, void *, void *); +void hyper_dio_attach(struct device *, struct device *, void *); -int hyper_console_scan __P((int, caddr_t, void *)); -void hypercnprobe __P((struct consdev *cp)); -void hypercninit __P((struct consdev *cp)); +int hyper_console_scan(int, caddr_t, void *); +void hypercnprobe(struct consdev *cp); +void hypercninit(struct consdev *cp); struct cfattach hyper_dio_ca = { sizeof(struct grfdev_softc), hyper_dio_match, hyper_dio_attach @@ -104,15 +104,15 @@ struct grfsw hyper_grfsw = { }; #if NITE > 0 -void hyper_init __P((struct ite_data *)); -void hyper_deinit __P((struct ite_data *)); -void hyper_int_fontinit __P((struct ite_data *)); -void hyper_putc __P((struct ite_data *, int, int, int, int)); -void hyper_cursor __P((struct ite_data *, int)); -void hyper_clear __P((struct ite_data *, int, int, int, int)); -void hyper_scroll __P((struct ite_data *, int, int, int, int)); -void hyper_windowmove __P((struct ite_data *, int, int, int, int, - int, int, int)); +void hyper_init(struct ite_data *); +void hyper_deinit(struct ite_data *); +void hyper_int_fontinit(struct ite_data *); +void hyper_putc(struct ite_data *, int, int, int, int); +void hyper_cursor(struct ite_data *, int); +void hyper_clear(struct ite_data *, int, int, int, int); +void hyper_scroll(struct ite_data *, int, int, int, int); +void hyper_windowmove(struct ite_data *, int, int, int, int, + int, int, int); /* Hyperion ite switch */ struct itesw hyper_itesw = { diff --git a/sys/arch/hp300/dev/grf_rb.c b/sys/arch/hp300/dev/grf_rb.c index 9627a222c11..2e338f455b0 100644 --- a/sys/arch/hp300/dev/grf_rb.c +++ b/sys/arch/hp300/dev/grf_rb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_rb.c,v 1.7 2000/11/10 15:33:05 provos Exp $ */ +/* $OpenBSD: grf_rb.c,v 1.8 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: grf_rb.c,v 1.11 1997/03/31 07:34:17 scottr Exp $ */ /* @@ -75,18 +75,18 @@ #include "ite.h" -int rb_init __P((struct grf_data *gp, int, caddr_t)); -int rb_mode __P((struct grf_data *gp, int, caddr_t)); +int rb_init(struct grf_data *gp, int, caddr_t); +int rb_mode(struct grf_data *gp, int, caddr_t); -int rbox_intio_match __P((struct device *, void *, void *)); -void rbox_intio_attach __P((struct device *, struct device *, void *)); +int rbox_intio_match(struct device *, void *, void *); +void rbox_intio_attach(struct device *, struct device *, void *); -int rbox_dio_match __P((struct device *, void *, void *)); -void rbox_dio_attach __P((struct device *, struct device *, void *)); +int rbox_dio_match(struct device *, void *, void *); +void rbox_dio_attach(struct device *, struct device *, void *); -int rbox_console_scan __P((int, caddr_t, void *)); -void rboxcnprobe __P((struct consdev *cp)); -void rboxcninit __P((struct consdev *cp)); +int rbox_console_scan(int, caddr_t, void *); +void rboxcnprobe(struct consdev *cp); +void rboxcninit(struct consdev *cp); struct cfattach rbox_intio_ca = { sizeof(struct grfdev_softc), rbox_intio_match, rbox_intio_attach @@ -106,14 +106,14 @@ struct grfsw rbox_grfsw = { }; #if NITE > 0 -void rbox_init __P((struct ite_data *)); -void rbox_deinit __P((struct ite_data *)); -void rbox_putc __P((struct ite_data *, int, int, int, int)); -void rbox_cursor __P((struct ite_data *, int)); -void rbox_clear __P((struct ite_data *, int, int, int, int)); -void rbox_scroll __P((struct ite_data *, int, int, int, int)); -void rbox_windowmove __P((struct ite_data *, int, int, int, int, - int, int, int)); +void rbox_init(struct ite_data *); +void rbox_deinit(struct ite_data *); +void rbox_putc(struct ite_data *, int, int, int, int); +void rbox_cursor(struct ite_data *, int); +void rbox_clear(struct ite_data *, int, int, int, int); +void rbox_scroll(struct ite_data *, int, int, int, int); +void rbox_windowmove(struct ite_data *, int, int, int, int, + int, int, int); /* Renaissance ite switch */ struct itesw rbox_itesw = { diff --git a/sys/arch/hp300/dev/grf_subr.c b/sys/arch/hp300/dev/grf_subr.c index 19f11c0d058..3f545a27ebf 100644 --- a/sys/arch/hp300/dev/grf_subr.c +++ b/sys/arch/hp300/dev/grf_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_subr.c,v 1.5 1997/04/16 11:56:05 downsj Exp $ */ +/* $OpenBSD: grf_subr.c,v 1.6 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: grf_subr.c,v 1.4 1997/03/31 07:34:18 scottr Exp $ */ /*- @@ -54,12 +54,12 @@ #include <hp300/dev/itevar.h> -int grfdevprint __P((void *, const char *)); +int grfdevprint(void *, const char *); void grfdev_attach(sc, init, regs, sw, isw) struct grfdev_softc *sc; - int (*init) __P((struct grf_data *, int, caddr_t)); + int (*init)(struct grf_data *, int, caddr_t); caddr_t regs; struct grfsw *sw; struct itesw *isw; diff --git a/sys/arch/hp300/dev/grf_tc.c b/sys/arch/hp300/dev/grf_tc.c index 4b1c59cc684..188620c9447 100644 --- a/sys/arch/hp300/dev/grf_tc.c +++ b/sys/arch/hp300/dev/grf_tc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_tc.c,v 1.8 2000/11/10 15:33:05 provos Exp $ */ +/* $OpenBSD: grf_tc.c,v 1.9 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: grf_tc.c,v 1.11 1997/03/31 07:34:18 scottr Exp $ */ /* @@ -75,20 +75,20 @@ #include "ite.h" -int tc_init __P((struct grf_data *, int, caddr_t)); -int tc_mode __P((struct grf_data *, int, caddr_t)); +int tc_init(struct grf_data *, int, caddr_t); +int tc_mode(struct grf_data *, int, caddr_t); -void topcat_common_attach __P((struct grfdev_softc *, caddr_t, u_int8_t)); +void topcat_common_attach(struct grfdev_softc *, caddr_t, u_int8_t); -int topcat_intio_match __P((struct device *, void *, void *)); -void topcat_intio_attach __P((struct device *, struct device *, void *)); +int topcat_intio_match(struct device *, void *, void *); +void topcat_intio_attach(struct device *, struct device *, void *); -int topcat_dio_match __P((struct device *, void *, void *)); -void topcat_dio_attach __P((struct device *, struct device *, void *)); +int topcat_dio_match(struct device *, void *, void *); +void topcat_dio_attach(struct device *, struct device *, void *); -int topcat_console_scan __P((int, caddr_t, void *)); -void topcatcnprobe __P((struct consdev *cp)); -void topcatcninit __P((struct consdev *cp)); +int topcat_console_scan(int, caddr_t, void *); +void topcatcnprobe(struct consdev *cp); +void topcatcninit(struct consdev *cp); struct cfattach topcat_intio_ca = { sizeof(struct grfdev_softc), topcat_intio_match, topcat_intio_attach @@ -123,14 +123,14 @@ struct grfsw hrmcatseye_grfsw = { }; #if NITE > 0 -void topcat_init __P((struct ite_data *)); -void topcat_deinit __P((struct ite_data *)); -void topcat_putc __P((struct ite_data *, int, int, int, int)); -void topcat_cursor __P((struct ite_data *, int)); -void topcat_clear __P((struct ite_data *, int, int, int, int)); -void topcat_scroll __P((struct ite_data *, int, int, int, int)); -void topcat_windowmove __P((struct ite_data *, int, int, int, int, - int, int, int)); +void topcat_init(struct ite_data *); +void topcat_deinit(struct ite_data *); +void topcat_putc(struct ite_data *, int, int, int, int); +void topcat_cursor(struct ite_data *, int); +void topcat_clear(struct ite_data *, int, int, int, int); +void topcat_scroll(struct ite_data *, int, int, int, int); +void topcat_windowmove(struct ite_data *, int, int, int, int, + int, int, int); /* Topcat/catseye ite switch */ struct itesw topcat_itesw = { diff --git a/sys/arch/hp300/dev/grfvar.h b/sys/arch/hp300/dev/grfvar.h index 0da88462c8c..1c6a8ea3f3b 100644 --- a/sys/arch/hp300/dev/grfvar.h +++ b/sys/arch/hp300/dev/grfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: grfvar.h,v 1.6 1997/04/16 11:56:06 downsj Exp $ */ +/* $OpenBSD: grfvar.h,v 1.7 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: grfvar.h,v 1.10 1997/03/31 07:34:19 scottr Exp $ */ /* @@ -72,9 +72,9 @@ struct grfsw { int gd_swid; /* id to be returned by software */ char *gd_desc; /* description printed at config time */ /* boot time init routine */ - int (*gd_init) __P((struct grf_data *, int, caddr_t)); + int (*gd_init)(struct grf_data *, int, caddr_t); /* misc function routine */ - int (*gd_mode) __P((struct grf_data *, int, caddr_t)); + int (*gd_mode)(struct grf_data *, int, caddr_t); }; struct grf_softc { @@ -127,26 +127,26 @@ struct grfdev_attach_args { extern struct grf_data grf_cn; /* grf_data for console device */ /* grf.c prototypes */ -int grfmap __P((dev_t, caddr_t *, struct proc *)); -int grfunmap __P((dev_t, caddr_t, struct proc *)); -int grfon __P((dev_t)); -int grfoff __P((dev_t)); -int grfaddr __P((struct grf_softc *, int)); +int grfmap(dev_t, caddr_t *, struct proc *); +int grfunmap(dev_t, caddr_t, struct proc *); +int grfon(dev_t); +int grfoff(dev_t); +int grfaddr(struct grf_softc *, int); #ifdef COMPAT_HPUX -int hpuxgrfioctl __P((dev_t, int, caddr_t, int, struct proc *)); +int hpuxgrfioctl(dev_t, int, caddr_t, int, struct proc *); -int grflock __P((struct grf_data *, int)); -int grfunlock __P((struct grf_data *)); -int grfdevno __P((dev_t)); +int grflock(struct grf_data *, int); +int grfunlock(struct grf_data *); +int grfdevno(dev_t); -int iommap __P((dev_t, caddr_t *)); -int iounmmap __P((dev_t, caddr_t)); +int iommap(dev_t, caddr_t *); +int iounmmap(dev_t, caddr_t); -int grffindpid __P((struct grf_data *)); -void grfrmpid __P((struct grf_data *)); -int grflckmmap __P((dev_t, caddr_t *)); -int grflckunmmap __P((dev_t, caddr_t)); +int grffindpid(struct grf_data *); +void grfrmpid(struct grf_data *); +int grflckmmap(dev_t, caddr_t *); +int grflckunmmap(dev_t, caddr_t); #endif /* COMPAT_HPUX */ /* grf_subr.c prototypes */ diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c index 42d3e7d2fbf..a112a1c1c13 100644 --- a/sys/arch/hp300/dev/hd.c +++ b/sys/arch/hp300/dev/hd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hd.c,v 1.14 2001/09/20 17:02:30 mpech Exp $ */ +/* $OpenBSD: hd.c,v 1.15 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $ */ /* @@ -217,25 +217,25 @@ int numhdidentinfo = sizeof(hdidentinfo) / sizeof(hdidentinfo[0]); bdev_decl(hd); cdev_decl(hd); -int hdident __P((struct device *, struct hd_softc *, - struct hpibbus_attach_args *)); -void hdreset __P((struct hd_softc *)); -void hdustart __P((struct hd_softc *)); -int hdgetinfo __P((dev_t, struct hd_softc *, struct disklabel *, int)); -void hdrestart __P((void *)); -struct buf *hdfinish __P((struct hd_softc *, struct buf *)); - -void hdstart __P((void *)); -void hdinterupt __P((void *)); -void hdgo __P((void *)); -int hdstatus __P((struct hd_softc *)); -int hderror __P((int)); +int hdident(struct device *, struct hd_softc *, + struct hpibbus_attach_args *); +void hdreset(struct hd_softc *); +void hdustart(struct hd_softc *); +int hdgetinfo(dev_t, struct hd_softc *, struct disklabel *, int); +void hdrestart(void *); +struct buf *hdfinish(struct hd_softc *, struct buf *); + +void hdstart(void *); +void hdinterupt(void *); +void hdgo(void *); +int hdstatus(struct hd_softc *); +int hderror(int); #ifdef DEBUG -void hdprinterr __P((char *, short, char **)); +void hdprinterr(char *, short, char **); #endif -int hdmatch __P((struct device *, void *, void *)); -void hdattach __P((struct device *, struct device *, void *)); +int hdmatch(struct device *, void *, void *); +void hdattach(struct device *, struct device *, void *); struct cfattach hd_ca = { sizeof(struct hd_softc), hdmatch, hdattach diff --git a/sys/arch/hp300/dev/hil.c b/sys/arch/hp300/dev/hil.c index 9ca2a2061a7..4d70c185fd8 100644 --- a/sys/arch/hp300/dev/hil.c +++ b/sys/arch/hp300/dev/hil.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hil.c,v 1.14 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: hil.c,v 1.15 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: hil.c,v 1.34 1997/04/02 22:37:32 scottr Exp $ */ /* @@ -102,26 +102,26 @@ char hilin[] = "hilin"; cdev_decl(hil); -void hilinfo __P((int)); -void hilconfig __P((struct hil_softc *)); -void hilreset __P((struct hil_softc *)); -void hilbeep __P((struct hil_softc *, struct _hilbell *)); -int hiliddev __P((struct hil_softc *)); +void hilinfo(int); +void hilconfig(struct hil_softc *); +void hilreset(struct hil_softc *); +void hilbeep(struct hil_softc *, struct _hilbell *); +int hiliddev(struct hil_softc *); -void hilint __P((int)); -void hil_process_int __P((struct hil_softc *, u_char, u_char)); -void hilevent __P((struct hil_softc *)); -void hpuxhilevent __P((struct hil_softc *, struct hilloopdev *)); +void hilint(int); +void hil_process_int(struct hil_softc *, u_char, u_char); +void hilevent(struct hil_softc *); +void hpuxhilevent(struct hil_softc *, struct hilloopdev *); -int hilqalloc __P((struct hil_softc *, struct hilqinfo *, struct proc *)); -int hilqfree __P((struct hil_softc *, int, struct proc *)); -int hilqmap __P((struct hil_softc *, int, int, struct proc *)); -int hilqunmap __P((struct hil_softc *, int, int, struct proc *)); +int hilqalloc(struct hil_softc *, struct hilqinfo *, struct proc *); +int hilqfree(struct hil_softc *, int, struct proc *); +int hilqmap(struct hil_softc *, int, int, struct proc *); +int hilqunmap(struct hil_softc *, int, int, struct proc *); #ifdef DEBUG -void printhilpollbuf __P((struct hil_softc *)); -void printhilcmdbuf __P((struct hil_softc *)); -void hilreport __P((struct hil_softc *)); +void printhilpollbuf(struct hil_softc *); +void printhilcmdbuf(struct hil_softc *); +void hilreport(struct hil_softc *); #endif /* DEBUG */ void diff --git a/sys/arch/hp300/dev/hilvar.h b/sys/arch/hp300/dev/hilvar.h index c0fe74432db..23eaf2a9549 100644 --- a/sys/arch/hp300/dev/hilvar.h +++ b/sys/arch/hp300/dev/hilvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hilvar.h,v 1.4 1997/04/16 11:56:08 downsj Exp $ */ +/* $OpenBSD: hilvar.h,v 1.5 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: hilvar.h,v 1.14 1997/04/01 19:29:10 scottr Exp $ */ /* @@ -120,26 +120,26 @@ struct hil_softc { #define KBD_AR2 0x04 /* keyboard auto-repeat rate 2 */ #ifdef _KERNEL -void kbdbell __P((int)); -void kbdenable __P((int)); -void kbddisable __P((int)); -int kbdgetc __P((int *)); -void kbdcninit __P((void)); +void kbdbell(int); +void kbdenable(int); +void kbddisable(int); +int kbdgetc(int *); +void kbdcninit(void); -int kbdnmi __P((void)); +int kbdnmi(void); -void hilsoftinit __P((int, struct hil_dev *)); -void hilinit __P((int, struct hil_dev *)); +void hilsoftinit(int, struct hil_dev *); +void hilinit(int, struct hil_dev *); -void send_hil_cmd __P((struct hil_dev *, u_char, - u_char *, u_char, u_char *)); -void send_hildev_cmd __P((struct hil_softc *, char, char)); +void send_hil_cmd(struct hil_dev *, u_char, + u_char *, u_char, u_char *); +void send_hildev_cmd(struct hil_softc *, char, char); -void polloff __P((struct hil_dev *)); -void pollon __P((struct hil_dev *)); +void polloff(struct hil_dev *); +void pollon(struct hil_dev *); #ifdef COMPAT_HPUX -int hpuxhilioctl __P((dev_t, int, caddr_t, int)); -int hildevno __P((dev_t)); +int hpuxhilioctl(dev_t, int, caddr_t, int); +int hildevno(dev_t); #endif /* COMPAT_HPUX */ #endif /* _KERNEL */ diff --git a/sys/arch/hp300/dev/hpib.c b/sys/arch/hp300/dev/hpib.c index 234318413ca..1c0f75f8ff5 100644 --- a/sys/arch/hp300/dev/hpib.c +++ b/sys/arch/hp300/dev/hpib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hpib.c,v 1.8 1997/07/06 08:01:53 downsj Exp $ */ +/* $OpenBSD: hpib.c,v 1.9 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: hpib.c,v 1.16 1997/04/27 20:58:57 thorpej Exp $ */ /* @@ -54,8 +54,8 @@ #include <machine/cpu.h> #include <machine/hp300spu.h> -int hpibbusmatch __P((struct device *, void *, void *)); -void hpibbusattach __P((struct device *, struct device *, void *)); +int hpibbusmatch(struct device *, void *, void *); +void hpibbusattach(struct device *, struct device *, void *); struct cfattach hpibbus_ca = { sizeof(struct hpibbus_softc), hpibbusmatch, hpibbusattach @@ -65,15 +65,15 @@ struct cfdriver hpibbus_cd = { NULL, "hpibbus", DV_DULL }; -void hpibbus_attach_children __P((struct hpibbus_softc *)); -int hpibbussearch __P((struct device *, void *, void *)); -int hpibbusprint __P((void *, const char *)); +void hpibbus_attach_children(struct hpibbus_softc *); +int hpibbussearch(struct device *, void *, void *); +int hpibbusprint(void *, const char *); -int hpibbus_alloc __P((struct hpibbus_softc *, int, int)); -void hpibbus_free __P((struct hpibbus_softc *, int, int)); +int hpibbus_alloc(struct hpibbus_softc *, int, int); +void hpibbus_free(struct hpibbus_softc *, int, int); -void hpibstart __P((void *)); -void hpibdone __P((void *)); +void hpibstart(void *); +void hpibdone(void *); int hpibtimeout = 100000; /* # of status tests before we give up */ int hpibidtimeout = 10000; /* # of status tests for hpibid() calls */ @@ -363,7 +363,7 @@ hpibswait(unit, slave) { struct hpibbus_softc *sc = hpibbus_cd.cd_devs[unit]; int timo = hpibtimeout; - int mask, (*ppoll) __P((struct hpibbus_softc *)); + int mask, (*ppoll)(struct hpibbus_softc *); ppoll = sc->sc_ops->hpib_ppoll; mask = 0x80 >> slave; diff --git a/sys/arch/hp300/dev/hpibvar.h b/sys/arch/hp300/dev/hpibvar.h index e8f5336d8b0..220a55e2b3d 100644 --- a/sys/arch/hp300/dev/hpibvar.h +++ b/sys/arch/hp300/dev/hpibvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hpibvar.h,v 1.6 1997/04/16 11:56:09 downsj Exp $ */ +/* $OpenBSD: hpibvar.h,v 1.7 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: hpibvar.h,v 1.10 1997/03/31 07:34:25 scottr Exp $ */ /* @@ -77,17 +77,17 @@ struct hpibbus_softc; * is used by the indirect driver to call controller-specific functions. */ struct hpib_controller { - void (*hpib_reset) __P((struct hpibbus_softc *)); - int (*hpib_send) __P((struct hpibbus_softc *, - int, int, void *, int)); - int (*hpib_recv) __P((struct hpibbus_softc *, - int, int, void *, int)); - int (*hpib_ppoll) __P((struct hpibbus_softc *)); - void (*hpib_ppwatch) __P((void *)); - void (*hpib_go) __P((struct hpibbus_softc *, - int, int, void *, int, int, int)); - void (*hpib_done) __P((struct hpibbus_softc *)); - int (*hpib_intr) __P((void *)); + void (*hpib_reset)(struct hpibbus_softc *); + int (*hpib_send)(struct hpibbus_softc *, + int, int, void *, int); + int (*hpib_recv)(struct hpibbus_softc *, + int, int, void *, int); + int (*hpib_ppoll)(struct hpibbus_softc *); + void (*hpib_ppwatch)(void *); + void (*hpib_go)(struct hpibbus_softc *, + int, int, void *, int, int, int); + void (*hpib_done)(struct hpibbus_softc *); + int (*hpib_intr)(void *); }; /* @@ -131,9 +131,9 @@ struct hpibqueue { /* * Callbacks used to start and stop the slave driver. */ - void (*hq_start) __P((void *)); - void (*hq_go) __P((void *)); - void (*hq_intr) __P((void *)); + void (*hq_start)(void *); + void (*hq_go)(void *); + void (*hq_intr)(void *); }; struct dmaqueue; @@ -173,24 +173,24 @@ extern caddr_t internalhpib; extern int hpibtimeout; extern int hpibdmathresh; -void hpibreset __P((int)); -int hpibsend __P((int, int, int, void *, int)); -int hpibrecv __P((int, int, int, void *, int)); -int hpibustart __P((int)); -void hpibstart __P((void *)); -void hpibgo __P((int, int, int, void *, int, int, int)); -void hpibdone __P((void *)); -int hpibpptest __P((int, int)); -void hpibppclear __P((int)); -void hpibawait __P((int)); -int hpibswait __P((int, int)); -int hpibid __P((int, int)); - -int hpibreq __P((struct device *, struct hpibqueue *)); -void hpibfree __P((struct device *, struct hpibqueue *)); -int hpibbus_alloc __P((struct hpibbus_softc *, int, int)); -void hpibbus_free __P((struct hpibbus_softc *, int, int)); - -int hpibintr __P((void *)); -int hpibdevprint __P((void *, const char *)); +void hpibreset(int); +int hpibsend(int, int, int, void *, int); +int hpibrecv(int, int, int, void *, int); +int hpibustart(int); +void hpibstart(void *); +void hpibgo(int, int, int, void *, int, int, int); +void hpibdone(void *); +int hpibpptest(int, int); +void hpibppclear(int); +void hpibawait(int); +int hpibswait(int, int); +int hpibid(int, int); + +int hpibreq(struct device *, struct hpibqueue *); +void hpibfree(struct device *, struct hpibqueue *); +int hpibbus_alloc(struct hpibbus_softc *, int, int); +void hpibbus_free(struct hpibbus_softc *, int, int); + +int hpibintr(void *); +int hpibdevprint(void *, const char *); #endif diff --git a/sys/arch/hp300/dev/if_le.c b/sys/arch/hp300/dev/if_le.c index af6d92831e4..81937267e6c 100644 --- a/sys/arch/hp300/dev/if_le.c +++ b/sys/arch/hp300/dev/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.13 2001/08/26 00:15:37 miod Exp $ */ +/* $OpenBSD: if_le.c,v 1.14 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: if_le.c,v 1.43 1997/05/05 21:05:32 thorpej Exp $ */ /*- @@ -75,20 +75,20 @@ #include <hp300/hp300/leds.h> #endif -int lematch __P((struct device *, void *, void *)); -void leattach __P((struct device *, struct device *, void *)); +int lematch(struct device *, void *, void *); +void leattach(struct device *, struct device *, void *); struct cfattach le_ca = { sizeof(struct le_softc), lematch, leattach }; -int leintr __P((void *)); +int leintr(void *); /* offsets for: ID, REGS, MEM, NVRAM */ int lestd[] = { 0, 0x4000, 0x8000, 0xC008 }; -hide void lewrcsr __P((struct am7990_softc *, u_int16_t, u_int16_t)); -hide u_int16_t lerdcsr __P((struct am7990_softc *, u_int16_t)); +hide void lewrcsr(struct am7990_softc *, u_int16_t, u_int16_t); +hide u_int16_t lerdcsr(struct am7990_softc *, u_int16_t); hide void lewrcsr(sc, port, val) diff --git a/sys/arch/hp300/dev/intio.c b/sys/arch/hp300/dev/intio.c index 80b0401e8e0..10dd01ef14e 100644 --- a/sys/arch/hp300/dev/intio.c +++ b/sys/arch/hp300/dev/intio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intio.c,v 1.2 1997/02/03 04:47:36 downsj Exp $ */ +/* $OpenBSD: intio.c,v 1.3 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: intio.c,v 1.2 1997/01/30 09:18:54 thorpej Exp $ */ /*- @@ -47,10 +47,10 @@ #include <hp300/dev/intiovar.h> -int intiomatch __P((struct device *, void *, void *)); -void intioattach __P((struct device *, struct device *, void *)); -int intioprint __P((void *, const char *)); -int intiosearch __P((struct device *, void *, void *)); +int intiomatch(struct device *, void *, void *); +void intioattach(struct device *, struct device *, void *); +int intioprint(void *, const char *); +int intiosearch(struct device *, void *, void *); struct cfattach intio_ca = { sizeof(struct device), intiomatch, intioattach diff --git a/sys/arch/hp300/dev/ite.c b/sys/arch/hp300/dev/ite.c index 161259260c0..8bae218cee2 100644 --- a/sys/arch/hp300/dev/ite.c +++ b/sys/arch/hp300/dev/ite.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ite.c,v 1.13 2001/11/25 23:23:01 miod Exp $ */ +/* $OpenBSD: ite.c,v 1.14 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: ite.c,v 1.38 1997/03/31 07:37:25 scottr Exp $ */ /* @@ -86,8 +86,8 @@ int iteburst = 64; struct ite_data *kbd_ite = NULL; -int itematch __P((struct device *, void *, void *)); -void iteattach __P((struct device *, struct device *, void *)); +int itematch(struct device *, void *, void *); +void iteattach(struct device *, struct device *, void *); struct cfattach ite_ca = { sizeof(struct ite_softc), itematch, iteattach @@ -103,16 +103,16 @@ struct cfdriver ite_cd = { */ struct ite_data ite_cn; -void iteinit __P((struct ite_data *)); -void iteputchar __P((int, struct ite_data *)); -void itecheckwrap __P((struct ite_data *, struct itesw *)); -void ite_dchar __P((struct ite_data *, struct itesw *)); -void ite_ichar __P((struct ite_data *, struct itesw *)); -void ite_dline __P((struct ite_data *, struct itesw *)); -void ite_iline __P((struct ite_data *, struct itesw *)); -void ite_clrtoeol __P((struct ite_data *, struct itesw *, int, int)); -void ite_clrtoeos __P((struct ite_data *, struct itesw *)); -void itestart __P((struct tty *)); +void iteinit(struct ite_data *); +void iteputchar(int, struct ite_data *); +void itecheckwrap(struct ite_data *, struct itesw *); +void ite_dchar(struct ite_data *, struct itesw *); +void ite_ichar(struct ite_data *, struct itesw *); +void ite_dline(struct ite_data *, struct itesw *); +void ite_iline(struct ite_data *, struct itesw *); +void ite_clrtoeol(struct ite_data *, struct itesw *, int, int); +void ite_clrtoeos(struct ite_data *, struct itesw *); +void itestart(struct tty *); /* * Primary attribute buffer to be used by the first bitmapped console diff --git a/sys/arch/hp300/dev/itevar.h b/sys/arch/hp300/dev/itevar.h index 0ef7dcc62da..c5d7c652acf 100644 --- a/sys/arch/hp300/dev/itevar.h +++ b/sys/arch/hp300/dev/itevar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: itevar.h,v 1.9 1997/04/16 11:56:11 downsj Exp $ */ +/* $OpenBSD: itevar.h,v 1.10 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: itevar.h,v 1.14 1997/03/31 07:37:27 scottr Exp $ */ /* @@ -79,14 +79,14 @@ struct ite_data { }; struct itesw { - void (*ite_init) __P((struct ite_data *)); - void (*ite_deinit) __P((struct ite_data *)); - void (*ite_clear) __P((struct ite_data *, int, int, int, int)); - void (*ite_putc) __P((struct ite_data *, int, int, int, int)); - void (*ite_cursor) __P((struct ite_data *, int)); - void (*ite_scroll) __P((struct ite_data *, int, int, int, int)); - u_char (*ite_readbyte) __P((struct ite_data *, int)); - void (*ite_writeglyph) __P((struct ite_data *, u_char *, u_char *)); + void (*ite_init)(struct ite_data *); + void (*ite_deinit)(struct ite_data *); + void (*ite_clear)(struct ite_data *, int, int, int, int); + void (*ite_putc)(struct ite_data *, int, int, int, int); + void (*ite_cursor)(struct ite_data *, int); + void (*ite_scroll)(struct ite_data *, int, int, int, int); + u_char (*ite_readbyte)(struct ite_data *, int); + void (*ite_writeglyph)(struct ite_data *, u_char *, u_char *); }; struct ite_softc { @@ -200,18 +200,18 @@ extern struct itesw itesw[]; extern int nitesw; /* ite.c prototypes */ -void ite_attach_grf __P((int, int)); -int iteon __P((struct ite_data *, int)); -void iteoff __P((struct ite_data *, int)); -void itefilter __P((char, char)); -void itecninit __P((struct grf_data *, struct itesw *)); -int itecngetc __P((dev_t)); -void itecnputc __P((dev_t, int)); -int ite_major __P((void)); +void ite_attach_grf(int, int); +int iteon(struct ite_data *, int); +void iteoff(struct ite_data *, int); +void itefilter(char, char); +void itecninit(struct grf_data *, struct itesw *); +int itecngetc(dev_t); +void itecnputc(dev_t, int); +int ite_major(void); /* ite_subr.c prototypes */ -void ite_fontinfo __P((struct ite_data *)); -void ite_fontinit __P((struct ite_data *)); -u_char ite_readbyte __P((struct ite_data *, int)); -void ite_writeglyph __P((struct ite_data *, u_char *, u_char *)); +void ite_fontinfo(struct ite_data *); +void ite_fontinit(struct ite_data *); +u_char ite_readbyte(struct ite_data *, int); +void ite_writeglyph(struct ite_data *, u_char *, u_char *); #endif diff --git a/sys/arch/hp300/dev/mt.c b/sys/arch/hp300/dev/mt.c index d8bab8503d2..ff8104144bd 100644 --- a/sys/arch/hp300/dev/mt.c +++ b/sys/arch/hp300/dev/mt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mt.c,v 1.8 2002/02/15 20:45:30 nordin Exp $ */ +/* $OpenBSD: mt.c,v 1.9 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: mt.c,v 1.8 1997/03/31 07:37:29 scottr Exp $ */ /* @@ -94,8 +94,8 @@ int mtdebug = 0; #define B_CMD B_XXX /* command buf instead of data */ #define b_cmd b_blkno /* blkno holds cmd when B_CMD */ -int mtmatch __P((struct device *, void *, void *)); -void mtattach __P((struct device *, struct device *, void *)); +int mtmatch(struct device *, void *, void *); +void mtattach(struct device *, struct device *, void *); struct cfattach mt_ca = { sizeof(struct mt_softc), mtmatch, mtattach @@ -105,16 +105,16 @@ struct cfdriver mt_cd = { NULL, "mt", DV_TAPE }; -int mtident __P((struct mt_softc *, struct hpibbus_attach_args *)); -void mtustart __P((struct mt_softc *)); -int mtreaddsj __P((struct mt_softc *, int)); -int mtcommand __P((dev_t, int, int)); -void spl_mtintr __P((void *)); -void spl_mtstart __P((void *)); +int mtident(struct mt_softc *, struct hpibbus_attach_args *); +void mtustart(struct mt_softc *); +int mtreaddsj(struct mt_softc *, int); +int mtcommand(dev_t, int, int); +void spl_mtintr(void *); +void spl_mtstart(void *); -void mtstart __P((void *)); -void mtgo __P((void *)); -void mtintr __P((void *)); +void mtstart(void *); +void mtgo(void *); +void mtintr(void *); bdev_decl(mt); cdev_decl(mt); diff --git a/sys/arch/hp300/dev/nhpib.c b/sys/arch/hp300/dev/nhpib.c index b26b3e4800e..4d4be010427 100644 --- a/sys/arch/hp300/dev/nhpib.c +++ b/sys/arch/hp300/dev/nhpib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nhpib.c,v 1.10 2001/06/25 00:43:08 mickey Exp $ */ +/* $OpenBSD: nhpib.c,v 1.11 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: nhpib.c,v 1.17 1997/05/05 21:06:41 thorpej Exp $ */ /* @@ -83,18 +83,18 @@ static u_char sec_par[] = { 0370,0171,0172,0373,0174,0375,0376,0177 }; -void nhpibifc __P((struct nhpibdevice *)); -void nhpibreadtimo __P((void *)); -int nhpibwait __P((struct nhpibdevice *, int)); +void nhpibifc(struct nhpibdevice *); +void nhpibreadtimo(void *); +int nhpibwait(struct nhpibdevice *, int); -void nhpibreset __P((struct hpibbus_softc *)); -int nhpibsend __P((struct hpibbus_softc *, int, int, void *, int)); -int nhpibrecv __P((struct hpibbus_softc *, int, int, void *, int)); -int nhpibppoll __P((struct hpibbus_softc *)); -void nhpibppwatch __P((void *)); -void nhpibgo __P((struct hpibbus_softc *, int, int, void *, int, int, int)); -void nhpibdone __P((struct hpibbus_softc *)); -int nhpibintr __P((void *)); +void nhpibreset(struct hpibbus_softc *); +int nhpibsend(struct hpibbus_softc *, int, int, void *, int); +int nhpibrecv(struct hpibbus_softc *, int, int, void *, int); +int nhpibppoll(struct hpibbus_softc *); +void nhpibppwatch(void *); +void nhpibgo(struct hpibbus_softc *, int, int, void *, int, int, int); +void nhpibdone(struct hpibbus_softc *); +int nhpibintr(void *); /* * Our controller ops structure. @@ -118,8 +118,8 @@ struct nhpib_softc { struct timeout sc_watch_to; /* nhpibppwatch timeout */ }; -int nhpibmatch __P((struct device *, void *, void *)); -void nhpibattach __P((struct device *, struct device *, void *)); +int nhpibmatch(struct device *, void *, void *); +void nhpibattach(struct device *, struct device *, void *); struct cfattach nhpib_ca = { sizeof(struct nhpib_softc), nhpibmatch, nhpibattach diff --git a/sys/arch/hp300/dev/ppi.c b/sys/arch/hp300/dev/ppi.c index 21b93167729..720f80e5292 100644 --- a/sys/arch/hp300/dev/ppi.c +++ b/sys/arch/hp300/dev/ppi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ppi.c,v 1.8 2001/05/01 16:51:10 millert Exp $ */ +/* $OpenBSD: ppi.c,v 1.9 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: ppi.c,v 1.13 1997/04/02 22:37:33 scottr Exp $ */ /* @@ -76,8 +76,8 @@ struct ppi_softc { #define PPIF_TIMO 0x08 #define PPIF_DELAY 0x10 -int ppimatch __P((struct device *, void *, void *)); -void ppiattach __P((struct device *, struct device *, void *)); +int ppimatch(struct device *, void *, void *); +void ppiattach(struct device *, struct device *, void *); struct cfattach ppi_ca = { sizeof(struct ppi_softc), ppimatch, ppiattach @@ -87,13 +87,13 @@ struct cfdriver ppi_cd = { NULL, "ppi", DV_DULL }; -void ppistart __P((void *)); -void ppinoop __P((void *)); +void ppistart(void *); +void ppinoop(void *); -void ppitimo __P((void *)); -int ppirw __P((dev_t, struct uio *)); -int ppihztoms __P((int)); -int ppimstohz __P((int)); +void ppitimo(void *); +int ppirw(dev_t, struct uio *); +int ppihztoms(int); +int ppimstohz(int); bdev_decl(ppi); cdev_decl(ppi); diff --git a/sys/arch/hp300/dev/scsi.c b/sys/arch/hp300/dev/scsi.c index 98bd898d591..5a8c82740e1 100644 --- a/sys/arch/hp300/dev/scsi.c +++ b/sys/arch/hp300/dev/scsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsi.c,v 1.10 1997/07/06 08:01:55 downsj Exp $ */ +/* $OpenBSD: scsi.c,v 1.11 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: scsi.c,v 1.21 1997/05/05 21:08:26 thorpej Exp $ */ /* @@ -96,28 +96,28 @@ struct scsi_softc { #define SCSI_DATA_WAIT 10000 /* wait per data in/out step */ #define SCSI_INIT_WAIT 50000 /* wait per step (both) during init */ -static void scsiabort __P((int, struct scsi_softc *, - volatile struct scsidevice *, char *)); -static void scsierror __P((struct scsi_softc *, - volatile struct scsidevice *, u_char)); -static int issue_select __P((volatile struct scsidevice *, - u_char, u_char)); -static int wait_for_select __P((volatile struct scsidevice *)); -static int ixfer_start __P((volatile struct scsidevice *, - int, u_char, int)); -static int ixfer_out __P((volatile struct scsidevice *, int, u_char *)); -static void ixfer_in __P((volatile struct scsidevice *, int, u_char *)); -static int mxfer_in __P((volatile struct scsidevice *, - int, u_char *, u_char)); -static int scsiicmd __P((struct scsi_softc *, int, u_char *, int, - u_char *, int, u_char)); -static void finishxfer __P((struct scsi_softc *, - volatile struct scsidevice *, int)); - -int scsimatch __P((struct device *, void *, void *)); -void scsiattach __P((struct device *, struct device *, void *)); -void scsi_attach_children __P((struct scsi_softc *)); -int scsisubmatch __P((struct device *, void *, void *)); +static void scsiabort(int, struct scsi_softc *, + volatile struct scsidevice *, char *); +static void scsierror(struct scsi_softc *, + volatile struct scsidevice *, u_char); +static int issue_select(volatile struct scsidevice *, + u_char, u_char); +static int wait_for_select(volatile struct scsidevice *); +static int ixfer_start(volatile struct scsidevice *, + int, u_char, int); +static int ixfer_out(volatile struct scsidevice *, int, u_char *); +static void ixfer_in(volatile struct scsidevice *, int, u_char *); +static int mxfer_in(volatile struct scsidevice *, + int, u_char *, u_char); +static int scsiicmd(struct scsi_softc *, int, u_char *, int, + u_char *, int, u_char); +static void finishxfer(struct scsi_softc *, + volatile struct scsidevice *, int); + +int scsimatch(struct device *, void *, void *); +void scsiattach(struct device *, struct device *, void *); +void scsi_attach_children(struct scsi_softc *); +int scsisubmatch(struct device *, void *, void *); struct cfattach oscsi_ca = { sizeof(struct scsi_softc), scsimatch, scsiattach diff --git a/sys/arch/hp300/dev/scsivar.h b/sys/arch/hp300/dev/scsivar.h index 76ca923085c..2a8634fd733 100644 --- a/sys/arch/hp300/dev/scsivar.h +++ b/sys/arch/hp300/dev/scsivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scsivar.h,v 1.5 1997/04/16 11:56:15 downsj Exp $ */ +/* $OpenBSD: scsivar.h,v 1.6 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: scsivar.h,v 1.7 1997/03/31 07:40:05 scottr Exp $ */ /* @@ -55,9 +55,9 @@ struct scsiqueue { /* * Callbacks used to start and stop the target driver. */ - void (*sq_start) __P((void *)); - void (*sq_go) __P((void *)); - void (*sq_intr) __P((void *, int)); + void (*sq_start)(void *); + void (*sq_go)(void *); + void (*sq_intr)(void *, int); }; struct scsi_inquiry; @@ -71,25 +71,25 @@ struct oscsi_attach_args { }; #ifdef _KERNEL -int scsi_print __P((void *, const char *)); +int scsi_print(void *, const char *); -void scsi_delay __P((int)); -void scsistart __P((void *)); -void scsireset __P((int)); -int scsi_test_unit_rdy __P((int, int, int)); -int scsi_request_sense __P((int, int, int, u_char *, u_int)); -int scsi_immed_command __P((int, int, int, struct scsi_fmt_cdb *, - u_char *, u_int, int)); -int scsi_tt_read __P((int, int, int, u_char *, u_int, daddr_t, int)); -int scsi_tt_write __P((int, int, int, u_char *, u_int, daddr_t, int)); -int scsireq __P((struct device *, struct scsiqueue *)); -int scsiustart __P((int)); -void scsistart __P((void *)); -int scsigo __P((int, int, int, struct buf *, struct scsi_fmt_cdb *, int)); -void scsidone __P((void *)); -int scsiintr __P((void *)); -void scsifree __P((struct device *, struct scsiqueue *)); -int scsi_tt_oddio __P((int, int, int, u_char *, u_int, int, int)); -void scsi_str __P((char *, char *, size_t)); -int scsi_probe_device __P((int, int, int, struct scsi_inquiry *, int)); +void scsi_delay(int); +void scsistart(void *); +void scsireset(int); +int scsi_test_unit_rdy(int, int, int); +int scsi_request_sense(int, int, int, u_char *, u_int); +int scsi_immed_command(int, int, int, struct scsi_fmt_cdb *, + u_char *, u_int, int); +int scsi_tt_read(int, int, int, u_char *, u_int, daddr_t, int); +int scsi_tt_write(int, int, int, u_char *, u_int, daddr_t, int); +int scsireq(struct device *, struct scsiqueue *); +int scsiustart(int); +void scsistart(void *); +int scsigo(int, int, int, struct buf *, struct scsi_fmt_cdb *, int); +void scsidone(void *); +int scsiintr(void *); +void scsifree(struct device *, struct scsiqueue *); +int scsi_tt_oddio(int, int, int, u_char *, u_int, int, int); +void scsi_str(char *, char *, size_t); +int scsi_probe_device(int, int, int, struct scsi_inquiry *, int); #endif diff --git a/sys/arch/hp300/dev/sd.c b/sys/arch/hp300/dev/sd.c index 74fa53ad8b9..df542861022 100644 --- a/sys/arch/hp300/dev/sd.c +++ b/sys/arch/hp300/dev/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.23 2001/08/26 00:15:37 miod Exp $ */ +/* $OpenBSD: sd.c,v 1.24 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: sd.c,v 1.34 1997/07/10 18:14:10 kleink Exp $ */ /* @@ -73,8 +73,8 @@ extern int physio(); extern void TBIS(); */ -int sdmatch __P((struct device *, void *, void *)); -void sdattach __P((struct device *, struct device *, void *)); +int sdmatch(struct device *, void *, void *); +void sdattach(struct device *, struct device *, void *); struct cfattach sd_ca = { sizeof(struct sd_softc), sdmatch, sdattach @@ -122,22 +122,22 @@ static char legal_cmds[256] = { /* bdev_decl(sd); */ /* cdev_decl(sd); */ /* XXX we should use macros to do these... */ -int sdopen __P((dev_t, int, int, struct proc *)); -int sdclose __P((dev_t, int, int, struct proc *)); - -int sdioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); -int sdread __P((dev_t, struct uio *, int)); -void sdreset __P((struct sd_softc *)); -int sdwrite __P((dev_t, struct uio *, int)); - -void sdstrategy __P((struct buf *)); -int sddump __P((dev_t, daddr_t, caddr_t, size_t)); -int sdsize __P((dev_t)); - -static void sdgetgeom __P((struct sd_softc *)); -static void sdlblkstrat __P((struct buf *, int)); -static int sderror __P((struct sd_softc *, int)); -static void sdfinish __P((struct sd_softc *, struct buf *)); +int sdopen(dev_t, int, int, struct proc *); +int sdclose(dev_t, int, int, struct proc *); + +int sdioctl(dev_t, u_long, caddr_t, int, struct proc *); +int sdread(dev_t, struct uio *, int); +void sdreset(struct sd_softc *); +int sdwrite(dev_t, struct uio *, int); + +void sdstrategy(struct buf *); +int sddump(dev_t, daddr_t, caddr_t, size_t); +int sdsize(dev_t); + +static void sdgetgeom(struct sd_softc *); +static void sdlblkstrat(struct buf *, int); +static int sderror(struct sd_softc *, int); +static void sdfinish(struct sd_softc *, struct buf *); /* * Perform a mode-sense on page 0x04 (rigid geometry). diff --git a/sys/arch/hp300/dev/sdvar.h b/sys/arch/hp300/dev/sdvar.h index ee41b424efd..78813016d9f 100644 --- a/sys/arch/hp300/dev/sdvar.h +++ b/sys/arch/hp300/dev/sdvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sdvar.h,v 1.9 1998/10/04 01:02:25 millert Exp $ */ +/* $OpenBSD: sdvar.h,v 1.10 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: sdvar.h,v 1.7 1997/03/31 07:40:07 scottr Exp $ */ /* @@ -84,15 +84,15 @@ struct sd_softc { #ifdef _KERNEL /* sd.c */ -void sdustart __P((int)); +void sdustart(int); -void sdstart __P((void *)); -void sdgo __P((void *)); -void sdintr __P((void *, int)); +void sdstart(void *); +void sdgo(void *); +void sdintr(void *, int); -int sdgetcapacity __P((struct sd_softc *, dev_t)); -int sdgetinfo __P((dev_t, struct sd_softc *, struct disklabel *, int)); +int sdgetcapacity(struct sd_softc *, dev_t); +int sdgetinfo(dev_t, struct sd_softc *, struct disklabel *, int); /* sd_compat.c */ -void sdmakedisklabel __P((int, struct disklabel *)); +void sdmakedisklabel(int, struct disklabel *); #endif /* _KERNEL */ diff --git a/sys/arch/hp300/dev/st.c b/sys/arch/hp300/dev/st.c index 52f0d375855..1e6588bdaf5 100644 --- a/sys/arch/hp300/dev/st.c +++ b/sys/arch/hp300/dev/st.c @@ -1,4 +1,4 @@ -/* $OpenBSD: st.c,v 1.11 1999/09/18 22:48:28 downsj Exp $ */ +/* $OpenBSD: st.c,v 1.12 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: st.c,v 1.22 1997/04/02 22:37:38 scottr Exp $ */ /* @@ -165,26 +165,26 @@ int st_extti = 0x01; /* bitmask of unit numbers, do extra */ /* bdev_decl(st); */ /* cdev_decl(st); */ /* XXX we should use macros to do these... */ -int stopen __P((dev_t, int, int, struct proc *)); -int stclose __P((dev_t, int, int, struct proc *)); +int stopen(dev_t, int, int, struct proc *); +int stclose(dev_t, int, int, struct proc *); -int stioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); -int stread __P((dev_t, struct uio *, int)); -int stwrite __P((dev_t, struct uio *, int)); +int stioctl(dev_t, u_long, caddr_t, int, struct proc *); +int stread(dev_t, struct uio *, int); +int stwrite(dev_t, struct uio *, int); -void ststrategy __P((struct buf *)); -int stdump __P((dev_t)); +void ststrategy(struct buf *); +int stdump(dev_t); #ifdef DEBUG -void dumpxsense __P((struct st_xsense *)); -void prtmodsel __P((struct mode_select_data *, int)); -void prtmodstat __P((struct mode_sense *)); +void dumpxsense(struct st_xsense *); +void prtmodsel(struct mode_select_data *, int); +void prtmodstat(struct mode_sense *); #endif /* DEBUG */ -static void stfinish __P((struct st_softc *, struct buf *)); -static void sterror __P((struct st_softc *, int)); -static int stmatch __P((struct device *, void *, void *)); -static void stattach __P((struct device *, struct device *, void *)); +static void stfinish(struct st_softc *, struct buf *); +static void sterror(struct st_softc *, int); +static int stmatch(struct device *, void *, void *); +static void stattach(struct device *, struct device *, void *); struct cfattach st_ca = { sizeof(struct st_softc), stmatch, stattach diff --git a/sys/arch/hp300/dev/stvar.h b/sys/arch/hp300/dev/stvar.h index f8c5a881e97..81b2fc0bca9 100644 --- a/sys/arch/hp300/dev/stvar.h +++ b/sys/arch/hp300/dev/stvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stvar.h,v 1.3 1997/04/16 11:56:17 downsj Exp $ */ +/* $OpenBSD: stvar.h,v 1.4 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: stvar.h,v 1.6 1997/04/02 22:37:40 scottr Exp $ */ /* @@ -212,13 +212,13 @@ struct st_softc { #define STF_MOVED 0x0040 #ifdef _KERNEL -void stcommand __P((dev_t, u_int, int)); -void stustart __P((int)); +void stcommand(dev_t, u_int, int); +void stustart(int); -void ststart __P((void *)); -void stgo __P((void *)); -void stintr __P((void *, int)); +void ststart(void *); +void stgo(void *); +void stintr(void *, int); -void stxsense __P((int, int, int, struct st_softc *)); -void prtkey __P((struct st_softc *)); +void stxsense(int, int, int, struct st_softc *); +void prtkey(struct st_softc *); #endif /* _KERNEL */ diff --git a/sys/arch/hp300/hp300/autoconf.c b/sys/arch/hp300/hp300/autoconf.c index fcf6624ee5b..c5b8543b5f5 100644 --- a/sys/arch/hp300/hp300/autoconf.c +++ b/sys/arch/hp300/hp300/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.22 2002/02/04 19:38:18 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.23 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: autoconf.c,v 1.45 1999/04/10 17:31:02 kleink Exp $ */ /* @@ -165,26 +165,26 @@ ddlist_t dev_data_list; /* all dev_datas */ ddlist_t dev_data_list_hpib; /* hpib controller dev_datas */ ddlist_t dev_data_list_scsi; /* scsi controller dev_datas */ -void setroot __P((void)); -void swapconf __P((void)); -void findbootdev __P((void)); -void findbootdev_slave __P((ddlist_t *, int, int, int)); -void setbootdev __P((void)); +void setroot(void); +void swapconf(void); +void findbootdev(void); +void findbootdev_slave(ddlist_t *, int, int, int); +void setbootdev(void); -static struct dev_data *dev_data_lookup __P((struct device *)); -static void dev_data_insert __P((struct dev_data *, ddlist_t *)); +static struct dev_data *dev_data_lookup(struct device *); +static void dev_data_insert(struct dev_data *, ddlist_t *); -static struct device *parsedisk __P((char *str, int len, int defpart, - dev_t *devp)); -static struct device *getdisk __P((char *str, int len, int defpart, - dev_t *devp)); -static int findblkmajor __P((struct device *dv)); -static char *findblkname __P((int)); -static int getstr __P((char *cp, int size)); +static struct device *parsedisk(char *str, int len, int defpart, + dev_t *devp); +static struct device *getdisk(char *str, int len, int defpart, + dev_t *devp); +static int findblkmajor(struct device *dv); +static char *findblkname(int); +static int getstr(char *cp, int size); -int mainbusmatch __P((struct device *, void *, void *)); -void mainbusattach __P((struct device *, struct device *, void *)); -int mainbussearch __P((struct device *, void *, void *)); +int mainbusmatch(struct device *, void *, void *); +void mainbusattach(struct device *, struct device *, void *); +int mainbussearch(struct device *, void *, void *); struct cfattach mainbus_ca = { sizeof(struct device), mainbusmatch, mainbusattach @@ -1134,7 +1134,7 @@ dev_data_insert(dd, ddlist) */ void console_scan(func, arg) - int (*func) __P((int, caddr_t, void *)); + int (*func)(int, caddr_t, void *); void *arg; { int size, scode, sctop; diff --git a/sys/arch/hp300/hp300/clock.c b/sys/arch/hp300/hp300/clock.c index 2db918e4e2f..17d6239dc71 100644 --- a/sys/arch/hp300/hp300/clock.c +++ b/sys/arch/hp300/hp300/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.6 2000/01/14 09:09:47 downsj Exp $ */ +/* $OpenBSD: clock.c,v 1.7 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: clock.c,v 1.20 1997/04/27 20:43:38 thorpej Exp $ */ /* @@ -92,14 +92,14 @@ static int month_days[12] = { u_char bbc_registers[13]; struct hil_dev *bbcaddr = NULL; -void statintr __P((struct clockframe *)); +void statintr(struct clockframe *); -void hp300_calibrate_delay __P((void)); -struct bbc_tm *gmt_to_bbc __P((long)); -int bbc_to_gmt __P((u_long *)); -void read_bbc __P((void)); -u_char read_bbc_reg __P((int)); -u_char write_bbc_reg __P((int, u_int)); +void hp300_calibrate_delay(void); +struct bbc_tm *gmt_to_bbc(long); +int bbc_to_gmt(u_long *); +void read_bbc(void); +u_char read_bbc_reg(int); +u_char write_bbc_reg(int, u_int); /* * Machine-dependent clock routines. diff --git a/sys/arch/hp300/hp300/db_memrw.c b/sys/arch/hp300/hp300/db_memrw.c index 1a1a62c9405..67d075c5379 100644 --- a/sys/arch/hp300/hp300/db_memrw.c +++ b/sys/arch/hp300/hp300/db_memrw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_memrw.c,v 1.7 2001/11/06 19:53:14 miod Exp $ */ +/* $OpenBSD: db_memrw.c,v 1.8 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: db_memrw.c,v 1.5 1997/06/10 18:48:47 veego Exp $ */ /*- @@ -68,7 +68,7 @@ #include <ddb/db_access.h> -static void db_write_text __P((db_addr_t, size_t, char *)); +static void db_write_text(db_addr_t, size_t, char *); /* * Read bytes from kernel address space for debugger. diff --git a/sys/arch/hp300/hp300/disksubr.c b/sys/arch/hp300/hp300/disksubr.c index da4cd2a1cea..e73db840847 100644 --- a/sys/arch/hp300/hp300/disksubr.c +++ b/sys/arch/hp300/hp300/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.13 2000/10/18 21:00:34 mickey Exp $ */ +/* $OpenBSD: disksubr.c,v 1.14 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: disksubr.c,v 1.9 1997/04/01 03:12:13 scottr Exp $ */ /* @@ -67,7 +67,7 @@ dk_establish(dk, dev) char * readdisklabel(dev, strat, lp, osdep, spoofonly) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *osdep; int spoofonly; @@ -173,7 +173,7 @@ setdisklabel(olp, nlp, openmask, osdep) int writedisklabel(dev, strat, lp, osdep) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *osdep; { diff --git a/sys/arch/hp300/hp300/dkbad.c b/sys/arch/hp300/hp300/dkbad.c index 78edf5bfddb..d9eb4f4bb6a 100644 --- a/sys/arch/hp300/hp300/dkbad.c +++ b/sys/arch/hp300/hp300/dkbad.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dkbad.c,v 1.4 1999/07/20 03:23:05 csapuntz Exp $ */ +/* $OpenBSD: dkbad.c,v 1.5 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: dkbad.c,v 1.5 1997/04/01 03:12:15 scottr Exp $ */ /* @@ -41,7 +41,7 @@ #include <sys/buf.h> #include <sys/dkbad.h> -int isbad __P((struct dkbad *, int, int, int)); +int isbad(struct dkbad *, int, int, int); /* * Search the bad sector table looking for diff --git a/sys/arch/hp300/hp300/intr.c b/sys/arch/hp300/hp300/intr.c index 83bb9f239c3..5c70bbbf601 100644 --- a/sys/arch/hp300/hp300/intr.c +++ b/sys/arch/hp300/hp300/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.9 2001/11/06 19:53:14 miod Exp $ */ +/* $OpenBSD: intr.c,v 1.10 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: intr.c,v 1.5 1998/02/16 20:58:30 thorpej Exp $ */ /*- @@ -54,7 +54,7 @@ #include "ppp.h" #include "bridge.h" -void netintr __P((void)); +void netintr(void); #include <machine/cpu.h> #include <machine/intr.h> @@ -66,7 +66,7 @@ u_short hp300_bioipl, hp300_netipl, hp300_ttyipl, hp300_impipl; extern int intrcnt[]; /* from locore.s */ -void intr_computeipl __P((void)); +void intr_computeipl(void); void intr_init() @@ -161,7 +161,7 @@ intr_printlevels() */ void * intr_establish(func, arg, ipl, priority) - int (*func) __P((void *)); + int (*func)(void *); void *arg; int ipl; int priority; diff --git a/sys/arch/hp300/hp300/leds.h b/sys/arch/hp300/hp300/leds.h index 718e6206f7a..53fdd659b5d 100644 --- a/sys/arch/hp300/hp300/leds.h +++ b/sys/arch/hp300/hp300/leds.h @@ -1,4 +1,4 @@ -/* $OpenBSD: leds.h,v 1.1 1997/07/06 08:02:03 downsj Exp $ */ +/* $OpenBSD: leds.h,v 1.2 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: leds.h,v 1.1 1997/05/05 20:54:36 thorpej Exp $ */ /* @@ -51,6 +51,6 @@ #define LED_PULSE 0x10 /* heartbeat */ #if defined(_KERNEL) && !defined(_LOCORE) -void ledinit __P((void)); -void ledcontrol __P((int, int, int)); +void ledinit(void); +void ledcontrol(int, int, int); #endif diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c index 056666b2795..2c9728b00a6 100644 --- a/sys/arch/hp300/hp300/machdep.c +++ b/sys/arch/hp300/hp300/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.78 2002/02/24 23:33:47 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.79 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: machdep.c,v 1.121 1999/03/26 23:41:29 mycroft Exp $ */ /* @@ -153,20 +153,20 @@ extern struct emul emul_sunos; char extiospace[EXTENT_FIXED_STORAGE_SIZE(EIOMAPSIZE / 16)]; /* prototypes for local functions */ -caddr_t allocsys __P((caddr_t)); -void parityenable __P((void)); -int parityerror __P((struct frame *)); -int parityerrorfind __P((void)); -void identifycpu __P((void)); -void initcpu __P((void)); -void dumpmem __P((int *, int, int)); -char *hexstr __P((int, int)); +caddr_t allocsys(caddr_t); +void parityenable(void); +int parityerror(struct frame *); +int parityerrorfind(void); +void identifycpu(void); +void initcpu(void); +void dumpmem(int *, int, int); +char *hexstr(int, int); /* functions called from locore.s */ -void dumpsys __P((void)); -void hp300_init __P((void)); -void straytrap __P((int, u_short)); -void nmihand __P((struct frame)); +void dumpsys(void); +void hp300_init(void); +void straytrap(int, u_short); +void nmihand(struct frame); /* * Select code of console. Set to -1 if console is on @@ -866,7 +866,7 @@ dumpsys() { daddr_t blkno; /* current block to write */ /* dump routine */ - int (*dump) __P((dev_t, daddr_t, caddr_t, size_t)); + int (*dump)(dev_t, daddr_t, caddr_t, size_t); int pg; /* page being dumped */ paddr_t maddr; /* PA being dumped */ int error; /* error code from (*dump)() */ @@ -1237,8 +1237,7 @@ cpu_exec_aout_makecmds(p, epp) int error; struct exec *execp = epp->ep_hdr; #ifdef COMPAT_SUNOS - extern int sunos_exec_aout_makecmds - __P((struct proc *, struct exec_package *)); + extern int sunos_exec_aout_makecmds(struct proc *, struct exec_package *); #endif midmag = ntohl(execp->a_midmag); diff --git a/sys/arch/hp300/hp300/mem.c b/sys/arch/hp300/hp300/mem.c index e55ee87b723..ad6006cc4fa 100644 --- a/sys/arch/hp300/hp300/mem.c +++ b/sys/arch/hp300/hp300/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.18 2001/12/06 18:53:01 millert Exp $ */ +/* $OpenBSD: mem.c,v 1.19 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: mem.c,v 1.25 1999/03/27 00:30:06 mycroft Exp $ */ /* @@ -61,11 +61,11 @@ extern u_int lowram; extern char *extiobase; static caddr_t devzeropage; -int mmopen __P((dev_t, int, int)); -int mmclose __P((dev_t, int, int)); -int mmrw __P((dev_t, struct uio *, int)); -paddr_t mmmmap __P((dev_t, off_t, int)); -int mmioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); +int mmopen(dev_t, int, int); +int mmclose(dev_t, int, int); +int mmrw(dev_t, struct uio *, int); +paddr_t mmmmap(dev_t, off_t, int); +int mmioctl(dev_t, u_long, caddr_t, int, struct proc *); /*ARGSUSED*/ int diff --git a/sys/arch/hp300/hp300/swapgeneric.c b/sys/arch/hp300/hp300/swapgeneric.c index fa9f1e0e8a9..23394a1784d 100644 --- a/sys/arch/hp300/hp300/swapgeneric.c +++ b/sys/arch/hp300/hp300/swapgeneric.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapgeneric.c,v 1.2 1997/01/12 15:13:27 downsj Exp $ */ +/* $OpenBSD: swapgeneric.c,v 1.3 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: swapgeneric.c,v 1.15 1996/10/14 07:20:27 thorpej Exp $ */ /*- @@ -43,7 +43,7 @@ #include <sys/param.h> #include <sys/conf.h> -int (*mountroot) __P((void *)) = NULL; /* tells autoconf.c that we are "generic" */ +int (*mountroot)(void *) = NULL; /* tells autoconf.c that we are "generic" */ dev_t rootdev = NODEV; dev_t dumpdev = NODEV; diff --git a/sys/arch/hp300/hp300/trap.c b/sys/arch/hp300/hp300/trap.c index 8a0c7fb5299..62884a42eb1 100644 --- a/sys/arch/hp300/hp300/trap.c +++ b/sys/arch/hp300/hp300/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.35 2001/12/06 18:53:01 millert Exp $ */ +/* $OpenBSD: trap.c,v 1.36 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: trap.c,v 1.57 1998/02/16 20:58:31 thorpej Exp $ */ /* @@ -110,13 +110,13 @@ extern struct emul emul_hpux; extern struct emul emul_sunos; #endif -int writeback __P((struct frame *fp, int docachepush)); -void trap __P((int type, u_int code, u_int v, struct frame frame)); -void syscall __P((register_t code, struct frame frame)); +int writeback(struct frame *fp, int docachepush); +void trap(int type, u_int code, u_int v, struct frame frame); +void syscall(register_t code, struct frame frame); #ifdef DEBUG -void dumpssw __P((u_short)); -void dumpwb __P((int, u_short, u_int, u_int)); +void dumpssw(u_short); +void dumpwb(int, u_short, u_int, u_int); #endif int astpending; @@ -563,7 +563,7 @@ dopanic: case T_SSIR: /* software interrupt */ case T_SSIR|T_USER: if (ssir & SIR_NET) { - void netintr __P((void)); + void netintr(void); siroff(SIR_NET); uvmexp.softs++; netintr(); @@ -642,7 +642,7 @@ dopanic: #ifdef COMPAT_HPUX if (ISHPMMADDR(va)) { - int pmap_mapmulti __P((pmap_t, vaddr_t)); + int pmap_mapmulti(pmap_t, vaddr_t); vaddr_t bva; rv = pmap_mapmulti(map->pmap, va); diff --git a/sys/arch/hp300/include/autoconf.h b/sys/arch/hp300/include/autoconf.h index 038c42d50f0..b21ee54e212 100644 --- a/sys/arch/hp300/include/autoconf.h +++ b/sys/arch/hp300/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.6 2001/09/01 05:48:18 jason Exp $ */ +/* $OpenBSD: autoconf.h,v 1.7 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: autoconf.h,v 1.4 1997/04/01 03:03:56 scottr Exp $ */ /*- @@ -44,8 +44,8 @@ extern caddr_t conaddr; /* KVA of console device */ extern int convasize; /* size of mapping at conaddr */ extern int conforced; /* console has been forced */ -void hp300_cninit __P((void)); +void hp300_cninit(void); void console_scan __P((int (*)(int, caddr_t, void *), void *)); -caddr_t iomap __P((caddr_t, int)); -void iounmap __P((caddr_t, int)); +caddr_t iomap(caddr_t, int); +void iounmap(caddr_t, int); #endif /* _KERNEL */ diff --git a/sys/arch/hp300/include/cpu.h b/sys/arch/hp300/include/cpu.h index 15265f01607..90732e80c0d 100644 --- a/sys/arch/hp300/include/cpu.h +++ b/sys/arch/hp300/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.18 2002/01/10 21:10:46 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.19 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: cpu.h,v 1.28 1998/02/13 07:41:51 scottr Exp $ */ /* @@ -138,59 +138,59 @@ extern int astpending; /* need to trap before returning to user mode */ #ifdef _KERNEL extern char *intiobase, *intiolimit; -extern void (*vectab[]) __P((void)); +extern void (*vectab[])(void); struct frame; struct fpframe; struct pcb; /* locore.s functions */ -void m68881_save __P((struct fpframe *)); -void m68881_restore __P((struct fpframe *)); -void DCIA __P((void)); -void DCIS __P((void)); -void DCIU __P((void)); -void ICIA __P((void)); -void ICPA __P((void)); -void PCIA __P((void)); -void TBIA __P((void)); -void TBIS __P((vaddr_t)); -void TBIAS __P((void)); -void TBIAU __P((void)); +void m68881_save(struct fpframe *); +void m68881_restore(struct fpframe *); +void DCIA(void); +void DCIS(void); +void DCIU(void); +void ICIA(void); +void ICPA(void); +void PCIA(void); +void TBIA(void); +void TBIS(vaddr_t); +void TBIAS(void); +void TBIAU(void); #if defined(M68040) -void DCFA __P((void)); -void DCFP __P((paddr_t)); -void DCFL __P((paddr_t)); -void DCPL __P((paddr_t)); -void DCPP __P((paddr_t)); -void ICPL __P((paddr_t)); -void ICPP __P((paddr_t)); +void DCFA(void); +void DCFP(paddr_t); +void DCFL(paddr_t); +void DCPL(paddr_t); +void DCPP(paddr_t); +void ICPL(paddr_t); +void ICPP(paddr_t); #endif -int suline __P((caddr_t, caddr_t)); -void savectx __P((struct pcb *)); -void switch_exit __P((struct proc *)); -void proc_trampoline __P((void)); -void loadustp __P((int)); +int suline(caddr_t, caddr_t); +void savectx(struct pcb *); +void switch_exit(struct proc *); +void proc_trampoline(void); +void loadustp(int); -__dead void doboot __P((void)); -void ecacheon __P((void)); -void ecacheoff __P((void)); +__dead void doboot(void); +void ecacheon(void); +void ecacheoff(void); /* clock.c functions */ -void hp300_calibrate_delay __P((void)); +void hp300_calibrate_delay(void); /* machdep.c functions */ -int badaddr __P((caddr_t)); -int badbaddr __P((caddr_t)); -void dumpconf __P((void)); +int badaddr(caddr_t); +int badbaddr(caddr_t); +void dumpconf(void); /* sys_machdep.c functions */ -int cachectl __P((int, vaddr_t, int)); +int cachectl(int, vaddr_t, int); /* vm_machdep.c functions */ -void physaccess __P((caddr_t, caddr_t, int, int)); -void physunaccess __P((caddr_t, int)); -int kvtop __P((caddr_t)); +void physaccess(caddr_t, caddr_t, int, int); +void physunaccess(caddr_t, int); +int kvtop(caddr_t); /* what is this supposed to do? i.e. how is it different than startrtclock? */ #define enablertclock() diff --git a/sys/arch/hp300/include/hpux_machdep.h b/sys/arch/hp300/include/hpux_machdep.h index 221b5a026ed..18fabd545f5 100644 --- a/sys/arch/hp300/include/hpux_machdep.h +++ b/sys/arch/hp300/include/hpux_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hpux_machdep.h,v 1.6 1997/07/06 08:02:12 downsj Exp $ */ +/* $OpenBSD: hpux_machdep.h,v 1.7 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: hpux_machdep.h,v 1.8 1997/04/27 21:38:58 thorpej Exp $ */ /*- @@ -70,14 +70,14 @@ struct hpuxsigcontext { struct exec_package; struct exec_vmcmd; -int hpux_cpu_makecmds __P((struct proc *, struct exec_package *)); -int hpux_cpu_vmcmd __P((struct proc *, struct exec_vmcmd *)); -int hpux_cpu_sysconf_arch __P((void)); -int hpux_to_bsd_uoff __P((int *, int *, struct proc *)); +int hpux_cpu_makecmds(struct proc *, struct exec_package *); +int hpux_cpu_vmcmd(struct proc *, struct exec_vmcmd *); +int hpux_cpu_sysconf_arch(void); +int hpux_to_bsd_uoff(int *, int *, struct proc *); -void hpux_sendsig __P((sig_t, int, int, u_long, int, union sigval)); -void hpux_setregs __P((struct proc *, struct exec_package *, - u_long, register_t *)); +void hpux_sendsig(sig_t, int, int, u_long, int, union sigval); +void hpux_setregs(struct proc *, struct exec_package *, + u_long, register_t *); #endif /* _KERNEL */ #endif /* ! _MACHINE_HPUX_MACHDEP_H_ */ diff --git a/sys/arch/hp300/include/intr.h b/sys/arch/hp300/include/intr.h index 1fe9ba271f5..2ede3c194a8 100644 --- a/sys/arch/hp300/include/intr.h +++ b/sys/arch/hp300/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.6 2001/12/17 01:13:07 miod Exp $ */ +/* $OpenBSD: intr.h,v 1.7 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: intr.h,v 1.2 1997/07/24 05:43:08 scottr Exp $ */ /*- @@ -54,7 +54,7 @@ struct isr { LIST_ENTRY(isr) isr_link; - int (*isr_func) __P((void *)); + int (*isr_func)(void *); void *isr_arg; int isr_ipl; int isr_priority; @@ -174,14 +174,14 @@ extern volatile u_int8_t ssir; #define setsoftclock() siron(SIR_CLOCK) /* locore.s */ -int spl0 __P((void)); +int spl0(void); /* intr.c */ -void intr_init __P((void)); +void intr_init(void); void *intr_establish __P((int (*)(void *), void *, int, int)); -void intr_disestablish __P((void *)); -void intr_dispatch __P((int)); -void intr_printlevels __P((void)); +void intr_disestablish(void *); +void intr_dispatch(int); +void intr_printlevels(void); #endif /* _KERNEL */ #endif /* _HP300_INTR_H_ */ diff --git a/sys/arch/hp300/include/param.h b/sys/arch/hp300/include/param.h index 87e7e37202e..7e4987abbd1 100644 --- a/sys/arch/hp300/include/param.h +++ b/sys/arch/hp300/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.20 2002/01/10 21:10:46 miod Exp $ */ +/* $OpenBSD: param.h,v 1.21 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: param.h,v 1.35 1997/07/10 08:22:38 veego Exp $ */ /* @@ -82,7 +82,7 @@ #define delay(us) _delay((us) << 8) #define DELAY(us) delay(us) -void _delay __P((u_int)); +void _delay(u_int); #endif /* _KERNEL && !_LOCORE */ #endif /* !_MACHINE_PARAM_H_ */ diff --git a/sys/arch/hp300/include/pmap.h b/sys/arch/hp300/include/pmap.h index ead061df1cf..1c134b9078f 100644 --- a/sys/arch/hp300/include/pmap.h +++ b/sys/arch/hp300/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.13 2002/01/10 21:10:47 miod Exp $ */ +/* $OpenBSD: pmap.h,v 1.14 2002/03/14 01:26:31 millert Exp $ */ #ifndef _MACHINE_PMAP_H_ #define _MACHINE_PMAP_H_ @@ -6,7 +6,7 @@ #include <m68k/pmap_motorola.h> #ifdef _KERNEL -void pmap_init_md __P((void)); +void pmap_init_md(void); #define PMAP_INIT_MD() pmap_init_md() #endif diff --git a/sys/arch/hp300/stand/cdboot/conf.c b/sys/arch/hp300/stand/cdboot/conf.c index 8dc30a69698..a9d93545a27 100644 --- a/sys/arch/hp300/stand/cdboot/conf.c +++ b/sys/arch/hp300/stand/cdboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.1 1999/08/16 09:43:08 downsj Exp $ */ +/* $OpenBSD: conf.c,v 1.2 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: conf.c,v 1.12 1996/10/14 07:29:15 thorpej Exp $ */ /* @@ -49,15 +49,15 @@ int debug = 0; /* XXX */ /* * Device configuration */ -int sdstrategy __P((void *, int, daddr_t, size_t, void *, size_t *)); -int sdopen __P((struct open_file *, ...)); -int sdclose __P((struct open_file *)); +int sdstrategy(void *, int, daddr_t, size_t, void *, size_t *); +int sdopen(struct open_file *, ...); +int sdclose(struct open_file *); #define sdioctl noioctl #define xxstrategy \ - (int (*) __P((void *, int, daddr_t, size_t, void *, size_t *)))nullsys -#define xxopen (int (*) __P((struct open_file *, ...)))nodev -#define xxclose (int (*) __P((struct open_file *)))nullsys + (int (*)(void *, int, daddr_t, size_t, void *, size_t *))nullsys +#define xxopen (int (*)(struct open_file *, ...))nodev +#define xxclose (int (*)(struct open_file *))nullsys struct devsw devsw[] = { { "??", xxstrategy, xxopen, xxclose, noioctl }, /*0*/ @@ -71,7 +71,7 @@ int ndevs = (sizeof(devsw) / sizeof(devsw[0])); /* * Physical unit/lun detection. */ -int punitzero __P((int, int, int *)); +int punitzero(int, int, int *); int punitzero(ctlr, slave, punit) diff --git a/sys/arch/hp300/stand/common/ite.c b/sys/arch/hp300/stand/common/ite.c index 41ce3e30086..4336a687b8b 100644 --- a/sys/arch/hp300/stand/common/ite.c +++ b/sys/arch/hp300/stand/common/ite.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ite.c,v 1.1 1997/07/14 08:14:17 downsj Exp $ */ +/* $OpenBSD: ite.c,v 1.2 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: ite.c,v 1.12 1997/01/30 10:32:55 thorpej Exp $ */ /* @@ -59,7 +59,7 @@ #include "consdefs.h" #include "samachdep.h" -void ite_deinit_noop __P((struct ite_data *)); +void ite_deinit_noop(struct ite_data *); struct itesw itesw[] = { { GID_TOPCAT, diff --git a/sys/arch/hp300/stand/common/ite_dv.c b/sys/arch/hp300/stand/common/ite_dv.c index 60066d37c22..94b7b122aa5 100644 --- a/sys/arch/hp300/stand/common/ite_dv.c +++ b/sys/arch/hp300/stand/common/ite_dv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ite_dv.c,v 1.1 1997/07/14 08:14:18 downsj Exp $ */ +/* $OpenBSD: ite_dv.c,v 1.2 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: ite_dv.c,v 1.8 1996/03/03 04:23:35 thorpej Exp $ */ /* @@ -57,8 +57,8 @@ #define REGBASE ((struct dvboxfb *)(ip->regbase)) #define WINDOWMOVER dvbox_windowmove -void dvbox_windowmove __P((struct ite_data *, int, int, int, int, - int, int, int)); +void dvbox_windowmove(struct ite_data *, int, int, int, int, + int, int, int); void dvbox_init(ip) diff --git a/sys/arch/hp300/stand/common/ite_gb.c b/sys/arch/hp300/stand/common/ite_gb.c index d94cf3810c8..6e9155187a7 100644 --- a/sys/arch/hp300/stand/common/ite_gb.c +++ b/sys/arch/hp300/stand/common/ite_gb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ite_gb.c,v 1.1 1997/07/14 08:14:19 downsj Exp $ */ +/* $OpenBSD: ite_gb.c,v 1.2 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: ite_gb.c,v 1.8 1996/03/03 04:23:36 thorpej Exp $ */ /* @@ -57,8 +57,8 @@ #define REGBASE ((struct gboxfb *)(ip->regbase)) #define WINDOWMOVER gbox_windowmove -void gbox_windowmove __P((struct ite_data *, int, int, int, int, - int, int, int)); +void gbox_windowmove(struct ite_data *, int, int, int, int, + int, int, int); void gbox_init(ip) diff --git a/sys/arch/hp300/stand/common/ite_hy.c b/sys/arch/hp300/stand/common/ite_hy.c index 1aebd1b2c43..b2567975d1b 100644 --- a/sys/arch/hp300/stand/common/ite_hy.c +++ b/sys/arch/hp300/stand/common/ite_hy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ite_hy.c,v 1.1 1997/07/14 08:14:20 downsj Exp $ */ +/* $OpenBSD: ite_hy.c,v 1.2 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: ite_hy.c,v 1.3 1996/03/03 04:23:37 thorpej Exp $ */ /* @@ -61,9 +61,9 @@ #define charX(ip,c) \ (((c) % (ip)->cpl) * ((((ip)->ftwidth + 7) / 8) * 8) + (ip)->fontx) -void hyper_ite_fontinit __P((struct ite_data *)); -void hyper_windowmove __P((struct ite_data *, int, int, int, int, - int, int, int)); +void hyper_ite_fontinit(struct ite_data *); +void hyper_windowmove(struct ite_data *, int, int, int, int, + int, int, int); void hyper_init(ip) diff --git a/sys/arch/hp300/stand/common/ite_rb.c b/sys/arch/hp300/stand/common/ite_rb.c index a8c1f7375d4..ac44237c144 100644 --- a/sys/arch/hp300/stand/common/ite_rb.c +++ b/sys/arch/hp300/stand/common/ite_rb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ite_rb.c,v 1.1 1997/07/14 08:14:21 downsj Exp $ */ +/* $OpenBSD: ite_rb.c,v 1.2 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: ite_rb.c,v 1.8 1996/03/03 04:23:38 thorpej Exp $ */ /* @@ -58,8 +58,8 @@ #define REGBASE ((struct rboxfb *)(ip->regbase)) #define WINDOWMOVER rbox_windowmove -void rbox_windowmove __P((struct ite_data *, int, int, int, int, - int, int, int)); +void rbox_windowmove(struct ite_data *, int, int, int, int, + int, int, int); void rbox_init(ip) diff --git a/sys/arch/hp300/stand/common/ite_tc.c b/sys/arch/hp300/stand/common/ite_tc.c index e7800786fd2..52b9e374fc5 100644 --- a/sys/arch/hp300/stand/common/ite_tc.c +++ b/sys/arch/hp300/stand/common/ite_tc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ite_tc.c,v 1.1 1997/07/14 08:14:22 downsj Exp $ */ +/* $OpenBSD: ite_tc.c,v 1.2 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: ite_tc.c,v 1.8 1996/03/03 04:23:41 thorpej Exp $ */ /* @@ -58,8 +58,8 @@ #define REGBASE ((struct tcboxfb *)(ip->regbase)) #define WINDOWMOVER topcat_windowmove -void topcat_windowmove __P((struct ite_data *, int, int, int, int, - int, int, int)); +void topcat_windowmove(struct ite_data *, int, int, int, int, + int, int, int); void topcat_init(ip) diff --git a/sys/arch/hp300/stand/include/consdefs.h b/sys/arch/hp300/stand/include/consdefs.h index 81b81c49ce0..3dfcbf7af76 100644 --- a/sys/arch/hp300/stand/include/consdefs.h +++ b/sys/arch/hp300/stand/include/consdefs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: consdefs.h,v 1.1 1997/07/14 08:14:31 downsj Exp $ */ +/* $OpenBSD: consdefs.h,v 1.2 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: consdefs.h,v 1.2 1997/05/12 07:45:41 thorpej Exp $ */ /* @@ -44,26 +44,26 @@ extern int cons_scode; * Console routine prototypes. */ #ifdef ITECONSOLE -void iteprobe __P((struct consdev *)); -void iteinit __P((struct consdev *)); -int itegetchar __P((dev_t)); -void iteputchar __P((dev_t, int)); +void iteprobe(struct consdev *); +void iteinit(struct consdev *); +int itegetchar(dev_t); +void iteputchar(dev_t, int); #endif #ifdef DCACONSOLE -void dcaprobe __P((struct consdev *)); -void dcainit __P((struct consdev *)); -int dcagetchar __P((dev_t)); -void dcaputchar __P((dev_t, int)); +void dcaprobe(struct consdev *); +void dcainit(struct consdev *); +int dcagetchar(dev_t); +void dcaputchar(dev_t, int); #endif #ifdef APCICONSOLE -void apciprobe __P((struct consdev *)); -void apciinit __P((struct consdev *)); -int apcigetchar __P((dev_t)); -void apciputchar __P((dev_t, int)); +void apciprobe(struct consdev *); +void apciinit(struct consdev *); +int apcigetchar(dev_t); +void apciputchar(dev_t, int); #endif #ifdef DCMCONSOLE -void dcmprobe __P((struct consdev *)); -void dcminit __P((struct consdev *)); -int dcmgetchar __P((dev_t)); -void dcmputchar __P((dev_t, int)); +void dcmprobe(struct consdev *); +void dcminit(struct consdev *); +int dcmgetchar(dev_t); +void dcmputchar(dev_t, int); #endif diff --git a/sys/arch/hp300/stand/include/itevar.h b/sys/arch/hp300/stand/include/itevar.h index 7bf9c8abe52..3d7cea77c1d 100644 --- a/sys/arch/hp300/stand/include/itevar.h +++ b/sys/arch/hp300/stand/include/itevar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: itevar.h,v 1.1 1997/07/14 08:14:35 downsj Exp $ */ +/* $OpenBSD: itevar.h,v 1.2 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: itevar.h,v 1.1 1996/03/03 04:23:42 thorpej Exp $ */ /* @@ -83,14 +83,14 @@ struct ite_data { struct itesw { int ite_hwid; - void (*ite_init) __P((struct ite_data *)); - void (*ite_deinit) __P((struct ite_data *)); - void (*ite_clear) __P((struct ite_data *, int, int, int, int)); - void (*ite_putc) __P((struct ite_data *, int, int, int, int)); - void (*ite_cursor) __P((struct ite_data *, int)); - void (*ite_scroll) __P((struct ite_data *, int, int, int, int)); - u_char (*ite_readbyte) __P((struct ite_data *, int)); - void (*ite_writeglyph) __P((struct ite_data *, u_char *, u_char *)); + void (*ite_init)(struct ite_data *); + void (*ite_deinit)(struct ite_data *); + void (*ite_clear)(struct ite_data *, int, int, int, int); + void (*ite_putc)(struct ite_data *, int, int, int, int); + void (*ite_cursor)(struct ite_data *, int); + void (*ite_scroll)(struct ite_data *, int, int, int, int); + u_char (*ite_readbyte)(struct ite_data *, int); + void (*ite_writeglyph)(struct ite_data *, u_char *, u_char *); }; /* Flags */ @@ -195,38 +195,38 @@ extern int nitesw; /* * Prototypes. */ -u_char ite_readbyte __P((struct ite_data *, int)); -void ite_writeglyph __P((struct ite_data *, u_char *, u_char *)); +u_char ite_readbyte(struct ite_data *, int); +void ite_writeglyph(struct ite_data *, u_char *, u_char *); /* * Framebuffer-specific ITE prototypes. */ -void topcat_init __P((struct ite_data *)); -void topcat_clear __P((struct ite_data *, int, int, int, int)); -void topcat_putc __P((struct ite_data *, int, int, int, int)); -void topcat_cursor __P((struct ite_data *, int)); -void topcat_scroll __P((struct ite_data *, int, int, int, int)); - -void gbox_init __P((struct ite_data *)); -void gbox_clear __P((struct ite_data *, int, int, int, int)); -void gbox_putc __P((struct ite_data *, int, int, int, int)); -void gbox_cursor __P((struct ite_data *, int)); -void gbox_scroll __P((struct ite_data *, int, int, int, int)); - -void rbox_init __P((struct ite_data *)); -void rbox_clear __P((struct ite_data *, int, int, int, int)); -void rbox_putc __P((struct ite_data *, int, int, int, int)); -void rbox_cursor __P((struct ite_data *, int)); -void rbox_scroll __P((struct ite_data *, int, int, int, int)); - -void dvbox_init __P((struct ite_data *)); -void dvbox_clear __P((struct ite_data *, int, int, int, int)); -void dvbox_putc __P((struct ite_data *, int, int, int, int)); -void dvbox_cursor __P((struct ite_data *, int)); -void dvbox_scroll __P((struct ite_data *, int, int, int, int)); - -void hyper_init __P((struct ite_data *)); -void hyper_clear __P((struct ite_data *, int, int, int, int)); -void hyper_putc __P((struct ite_data *, int, int, int, int)); -void hyper_cursor __P((struct ite_data *, int)); -void hyper_scroll __P((struct ite_data *, int, int, int, int)); +void topcat_init(struct ite_data *); +void topcat_clear(struct ite_data *, int, int, int, int); +void topcat_putc(struct ite_data *, int, int, int, int); +void topcat_cursor(struct ite_data *, int); +void topcat_scroll(struct ite_data *, int, int, int, int); + +void gbox_init(struct ite_data *); +void gbox_clear(struct ite_data *, int, int, int, int); +void gbox_putc(struct ite_data *, int, int, int, int); +void gbox_cursor(struct ite_data *, int); +void gbox_scroll(struct ite_data *, int, int, int, int); + +void rbox_init(struct ite_data *); +void rbox_clear(struct ite_data *, int, int, int, int); +void rbox_putc(struct ite_data *, int, int, int, int); +void rbox_cursor(struct ite_data *, int); +void rbox_scroll(struct ite_data *, int, int, int, int); + +void dvbox_init(struct ite_data *); +void dvbox_clear(struct ite_data *, int, int, int, int); +void dvbox_putc(struct ite_data *, int, int, int, int); +void dvbox_cursor(struct ite_data *, int); +void dvbox_scroll(struct ite_data *, int, int, int, int); + +void hyper_init(struct ite_data *); +void hyper_clear(struct ite_data *, int, int, int, int); +void hyper_putc(struct ite_data *, int, int, int, int); +void hyper_cursor(struct ite_data *, int); +void hyper_scroll(struct ite_data *, int, int, int, int); diff --git a/sys/arch/hp300/stand/include/kbdvar.h b/sys/arch/hp300/stand/include/kbdvar.h index c4a3b8e845f..ab2b96ec854 100644 --- a/sys/arch/hp300/stand/include/kbdvar.h +++ b/sys/arch/hp300/stand/include/kbdvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kbdvar.h,v 1.1 1997/07/14 08:14:36 downsj Exp $ */ +/* $OpenBSD: kbdvar.h,v 1.2 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: kbdvar.h,v 1.1 1997/04/14 19:00:13 thorpej Exp $ */ /*- @@ -43,9 +43,9 @@ */ struct kbdsw { - int (*k_getc) __P((void)); /* get character */ - void (*k_nmi) __P((void)); /* handle non-maskable interrupt */ - int (*k_init) __P((void)); /* probe/initialize keyboard */ + int (*k_getc)(void); /* get character */ + void (*k_nmi)(void); /* handle non-maskable interrupt */ + int (*k_init)(void); /* probe/initialize keyboard */ }; #ifdef ITECONSOLE @@ -53,14 +53,14 @@ struct kbdsw { extern struct kbdsw kbdsw[]; #ifdef HIL_KEYBOARD -int hilkbd_getc __P((void)); -void hilkbd_nmi __P((void)); -int hilkbd_init __P((void)); +int hilkbd_getc(void); +void hilkbd_nmi(void); +int hilkbd_init(void); #endif #ifdef DOMAIN_KEYBOARD -int dnkbd_getc __P((void)); -void dnkbd_nmi __P((void)); -int dnkbd_init __P((void)); +int dnkbd_getc(void); +void dnkbd_nmi(void); +int dnkbd_init(void); #endif #endif /* ITECONSOLE */ diff --git a/sys/arch/hp300/stand/include/samachdep.h b/sys/arch/hp300/stand/include/samachdep.h index 2baca599694..5cb2b122494 100644 --- a/sys/arch/hp300/stand/include/samachdep.h +++ b/sys/arch/hp300/stand/include/samachdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: samachdep.h,v 1.2 1997/09/14 07:02:03 downsj Exp $ */ +/* $OpenBSD: samachdep.h,v 1.3 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: samachdep.h,v 1.3 1997/05/12 07:54:45 thorpej Exp $ */ /* @@ -69,7 +69,7 @@ extern u_int bootdev; extern char *getmachineid(); extern int userom; -extern void romputchar __P((int)); +extern void romputchar(int); #define DELAY(n) { register int N = cpuspeed * (n); while (--N > 0); } @@ -82,7 +82,7 @@ struct grfinfo { * Switch we use to set punit in devopen. */ struct punitsw { - int (*p_punit) __P((int, int, int *)); + int (*p_punit)(int, int, int *); }; extern struct punitsw punitsw[]; extern int npunit; diff --git a/sys/arch/hp300/stand/libsa/rawfs.c b/sys/arch/hp300/stand/libsa/rawfs.c index 275fef8a686..79b1853598c 100644 --- a/sys/arch/hp300/stand/libsa/rawfs.c +++ b/sys/arch/hp300/stand/libsa/rawfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rawfs.c,v 1.1 1997/07/14 08:14:48 downsj Exp $ */ +/* $OpenBSD: rawfs.c,v 1.2 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: rawfs.c,v 1.2 1996/10/06 19:07:53 thorpej Exp $ */ /* @@ -60,7 +60,7 @@ struct rawfs_file { }; static int -rawfs_get_block __P((struct open_file *)); +rawfs_get_block(struct open_file *); int rawfs_open(path, f) diff --git a/sys/arch/hp300/stand/libsa/rawfs.h b/sys/arch/hp300/stand/libsa/rawfs.h index c37ed16fb93..0838daab2f8 100644 --- a/sys/arch/hp300/stand/libsa/rawfs.h +++ b/sys/arch/hp300/stand/libsa/rawfs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rawfs.h,v 1.1 1997/07/14 08:14:49 downsj Exp $ */ +/* $OpenBSD: rawfs.h,v 1.2 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: rawfs.h,v 1.1 1996/06/26 17:44:36 thorpej Exp $ */ /* @@ -6,11 +6,11 @@ * No random access, only sequential read allowed. */ -int rawfs_open __P((char *path, struct open_file *f)); -int rawfs_close __P((struct open_file *f)); -int rawfs_read __P((struct open_file *f, void *buf, - u_int size, u_int *resid)); -int rawfs_write __P((struct open_file *f, void *buf, - u_int size, u_int *resid)); -off_t rawfs_seek __P((struct open_file *f, off_t offset, int where)); -int rawfs_stat __P((struct open_file *f, struct stat *sb)); +int rawfs_open(char *path, struct open_file *f); +int rawfs_close(struct open_file *f); +int rawfs_read(struct open_file *f, void *buf, + u_int size, u_int *resid); +int rawfs_write(struct open_file *f, void *buf, + u_int size, u_int *resid); +off_t rawfs_seek(struct open_file *f, off_t offset, int where); +int rawfs_stat(struct open_file *f, struct stat *sb); diff --git a/sys/arch/hp300/stand/uboot/conf.c b/sys/arch/hp300/stand/uboot/conf.c index 7a5b04b020d..88374a8eb1a 100644 --- a/sys/arch/hp300/stand/uboot/conf.c +++ b/sys/arch/hp300/stand/uboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.2 1997/09/14 07:02:05 downsj Exp $ */ +/* $OpenBSD: conf.c,v 1.3 2002/03/14 01:26:31 millert Exp $ */ /* $NetBSD: conf.c,v 1.12 1996/10/14 07:29:15 thorpej Exp $ */ /* @@ -58,30 +58,30 @@ int debug = 0; /* XXX */ /* * Device configuration */ -int netstrategy __P((void *, int, daddr_t, size_t, void *, size_t *)); -int netopen __P((struct open_file *, ...)); -int netclose __P((struct open_file *)); +int netstrategy(void *, int, daddr_t, size_t, void *, size_t *); +int netopen(struct open_file *, ...); +int netclose(struct open_file *); #define netioctl noioctl -int ctstrategy __P((void *, int, daddr_t, size_t, void *, size_t *)); -int ctopen __P((struct open_file *, ...)); -int ctclose __P((struct open_file *)); +int ctstrategy(void *, int, daddr_t, size_t, void *, size_t *); +int ctopen(struct open_file *, ...); +int ctclose(struct open_file *); #define ctioctl noioctl -int hdstrategy __P((void *, int, daddr_t, size_t, void *, size_t *)); -int hdopen __P((struct open_file *, ...)); -int hdclose __P((struct open_file *)); +int hdstrategy(void *, int, daddr_t, size_t, void *, size_t *); +int hdopen(struct open_file *, ...); +int hdclose(struct open_file *); #define hdioctl noioctl -int sdstrategy __P((void *, int, daddr_t, size_t, void *, size_t *)); -int sdopen __P((struct open_file *, ...)); -int sdclose __P((struct open_file *)); +int sdstrategy(void *, int, daddr_t, size_t, void *, size_t *); +int sdopen(struct open_file *, ...); +int sdclose(struct open_file *); #define sdioctl noioctl #define xxstrategy \ - (int (*) __P((void *, int, daddr_t, size_t, void *, size_t *)))nullsys -#define xxopen (int (*) __P((struct open_file *, ...)))nodev -#define xxclose (int (*) __P((struct open_file *)))nullsys + (int (*)(void *, int, daddr_t, size_t, void *, size_t *))nullsys +#define xxopen (int (*)(struct open_file *, ...))nodev +#define xxclose (int (*)(struct open_file *))nullsys /* * Note: "le" isn't a major offset. @@ -107,7 +107,7 @@ int n_netif_drivers = (sizeof(netif_drivers) / sizeof(netif_drivers[0])); /* * Physical unit/lun detection. */ -int punitzero __P((int, int, int *)); +int punitzero(int, int, int *); int punitzero(ctlr, slave, punit) @@ -118,7 +118,7 @@ punitzero(ctlr, slave, punit) return (0); } -extern int ctpunit __P((int, int, int *)); +extern int ctpunit(int, int, int *); #define xxpunit punitzero #define hdpunit punitzero #define sdpunit punitzero diff --git a/sys/arch/hppa/dev/asp.c b/sys/arch/hppa/dev/asp.c index 54d6997711d..d8a5824c6e5 100644 --- a/sys/arch/hppa/dev/asp.c +++ b/sys/arch/hppa/dev/asp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asp.c,v 1.5 2000/02/09 05:04:22 mickey Exp $ */ +/* $OpenBSD: asp.c,v 1.6 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1998,1999 Michael Shalayeff @@ -126,8 +126,8 @@ struct asp_softc { /* ASP "Primary Controller" HPA */ #define ASP_CHPA 0xF0800000 -int aspmatch __P((struct device *, void *, void *)); -void aspattach __P((struct device *, struct device *, void *)); +int aspmatch(struct device *, void *, void *); +void aspattach(struct device *, struct device *, void *); struct cfattach asp_ca = { sizeof(struct asp_softc), aspmatch, aspattach @@ -137,10 +137,10 @@ struct cfdriver asp_cd = { NULL, "asp", DV_DULL }; -void asp_intr_establish __P((void *v, u_int32_t mask)); -void asp_intr_disestablish __P((void *v, u_int32_t mask)); -u_int32_t asp_intr_check __P((void *v)); -void asp_intr_ack __P((void *v, u_int32_t mask)); +void asp_intr_establish(void *v, u_int32_t mask); +void asp_intr_disestablish(void *v, u_int32_t mask); +u_int32_t asp_intr_check(void *v); +void asp_intr_ack(void *v, u_int32_t mask); int aspmatch(parent, cfdata, aux) diff --git a/sys/arch/hppa/dev/clock.c b/sys/arch/hppa/dev/clock.c index 28d6dc09eb0..267c8acf97c 100644 --- a/sys/arch/hppa/dev/clock.c +++ b/sys/arch/hppa/dev/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.12 2002/02/01 19:03:18 mickey Exp $ */ +/* $OpenBSD: clock.c,v 1.13 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1998,1999 Michael Shalayeff @@ -54,7 +54,7 @@ struct timeval time; -void startrtclock __P((void)); +void startrtclock(void); void cpu_initclocks() diff --git a/sys/arch/hppa/dev/cpu.c b/sys/arch/hppa/dev/cpu.c index 34de02dd1e7..13275ebe9a3 100644 --- a/sys/arch/hppa/dev/cpu.c +++ b/sys/arch/hppa/dev/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.12 2002/03/06 20:24:03 mickey Exp $ */ +/* $OpenBSD: cpu.c,v 1.13 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1998-2002 Michael Shalayeff @@ -49,8 +49,8 @@ struct cpu_softc { void *sc_ih; }; -int cpumatch __P((struct device *, void *, void *)); -void cpuattach __P((struct device *, struct device *, void *)); +int cpumatch(struct device *, void *, void *); +void cpuattach(struct device *, struct device *, void *); struct cfattach cpu_ca = { sizeof(struct cpu_softc), cpumatch, cpuattach diff --git a/sys/arch/hppa/dev/lasi.c b/sys/arch/hppa/dev/lasi.c index e42a7ce7438..96e9e3a1f7f 100644 --- a/sys/arch/hppa/dev/lasi.c +++ b/sys/arch/hppa/dev/lasi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lasi.c,v 1.7 2002/02/12 06:42:26 mickey Exp $ */ +/* $OpenBSD: lasi.c,v 1.8 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1998-2002 Michael Shalayeff @@ -72,9 +72,9 @@ struct lasi_softc { struct gsc_attach_args ga; /* for deferred attach */ }; -int lasimatch __P((struct device *, void *, void *)); -void lasiattach __P((struct device *, struct device *, void *)); -void lasi_gsc_attach __P((struct device *)); +int lasimatch(struct device *, void *, void *); +void lasiattach(struct device *, struct device *, void *); +void lasi_gsc_attach(struct device *); struct cfattach lasi_ca = { sizeof(struct lasi_softc), lasimatch, lasiattach @@ -84,11 +84,11 @@ struct cfdriver lasi_cd = { NULL, "lasi", DV_DULL }; -void lasi_intr_establish __P((void *v, u_int32_t mask)); -void lasi_intr_disestablish __P((void *v, u_int32_t mask)); -u_int32_t lasi_intr_check __P((void *v)); -void lasi_intr_ack __P((void *v, u_int32_t mask)); -void lasi_cold_hook __P((int on)); +void lasi_intr_establish(void *v, u_int32_t mask); +void lasi_intr_disestablish(void *v, u_int32_t mask); +u_int32_t lasi_intr_check(void *v); +void lasi_intr_ack(void *v, u_int32_t mask); +void lasi_cold_hook(int on); int @@ -154,7 +154,7 @@ lasiattach(parent, self, aux) if (sc->sc_dev.dv_unit) config_defer(self, lasi_gsc_attach); else { - extern void (*cold_hook) __P((int)); + extern void (*cold_hook)(int); lasi_gsc_attach(self); cold_hook = lasi_cold_hook; diff --git a/sys/arch/hppa/dev/mem.c b/sys/arch/hppa/dev/mem.c index 7dbaf43027a..2032abbb72c 100644 --- a/sys/arch/hppa/dev/mem.c +++ b/sys/arch/hppa/dev/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.8 2002/02/28 22:18:03 mickey Exp $ */ +/* $OpenBSD: mem.c,v 1.9 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1998,1999 Michael Shalayeff @@ -106,8 +106,8 @@ struct mem_softc { volatile struct vi_trs *sc_vp; }; -int memmatch __P((struct device *, void *, void *)); -void memattach __P((struct device *, struct device *, void *)); +int memmatch(struct device *, void *, void *); +void memattach(struct device *, struct device *, void *); struct cfattach mem_ca = { sizeof(struct mem_softc), memmatch, memattach diff --git a/sys/arch/hppa/dev/mongoose.c b/sys/arch/hppa/dev/mongoose.c index 055e1164f97..c2c2ad77ab1 100644 --- a/sys/arch/hppa/dev/mongoose.c +++ b/sys/arch/hppa/dev/mongoose.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mongoose.c,v 1.8 2002/02/05 04:26:06 mickey Exp $ */ +/* $OpenBSD: mongoose.c,v 1.9 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1998,1999 Michael Shalayeff @@ -167,7 +167,7 @@ struct mongoose_ctrl { struct hppa_isa_iv { const char *iv_name; - int (*iv_handler) __P((void *arg)); + int (*iv_handler)(void *arg); void *iv_arg; int iv_pri; @@ -206,9 +206,9 @@ union mongoose_attach_args { struct isabus_attach_args mongoose_isa; }; -int mgmatch __P((struct device *, void *, void *)); -void mgattach __P((struct device *, struct device *, void *)); -int mgprint __P((void *aux, const char *pnp)); +int mgmatch(struct device *, void *, void *); +void mgattach(struct device *, struct device *, void *); +int mgprint(void *aux, const char *pnp); struct cfattach mongoose_ca = { sizeof(struct mongoose_softc), mgmatch, mgattach @@ -251,7 +251,7 @@ mg_isa_attach_hook(struct device *parent, struct device *self, void * mg_intr_establish(void *v, int irq, int type, int pri, - int (*handler) __P((void *)), void *arg, char *name) + int (*handler)(void *), void *arg, char *name) { struct hppa_isa_iv *iv; struct mongoose_softc *sc = v; diff --git a/sys/arch/hppa/dev/pdc.c b/sys/arch/hppa/dev/pdc.c index 91f5ce305ea..1c10c234214 100644 --- a/sys/arch/hppa/dev/pdc.c +++ b/sys/arch/hppa/dev/pdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pdc.c,v 1.22 2002/03/06 23:06:23 miod Exp $ */ +/* $OpenBSD: pdc.c,v 1.23 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1998-2002 Michael Shalayeff @@ -59,8 +59,8 @@ pz_device_t *pz_kbd, *pz_cons; hppa_hpa_t conaddr; int conunit; -int pdcmatch __P((struct device *, void *, void*)); -void pdcattach __P((struct device *, struct device *, void *)); +int pdcmatch(struct device *, void *, void*); +void pdcattach(struct device *, struct device *, void *); struct cfattach pdc_ca = { sizeof(pdcsoftc_t), pdcmatch, pdcattach @@ -70,10 +70,10 @@ struct cfdriver pdc_cd = { NULL, "pdc", DV_DULL }; -void pdcstart __P((struct tty *tp)); -void pdctimeout __P((void *v)); -int pdcparam __P((struct tty *tp, struct termios *)); -int pdccnlookc __P((dev_t dev, int *cp)); +void pdcstart(struct tty *tp); +void pdctimeout(void *v); +int pdcparam(struct tty *tp, struct termios *); +int pdccnlookc(dev_t dev, int *cp); /* serial console speed table */ static int pdc_speeds[] = { diff --git a/sys/arch/hppa/dev/sti_sgc.c b/sys/arch/hppa/dev/sti_sgc.c index 6c27011f7ed..08ae51f64ab 100644 --- a/sys/arch/hppa/dev/sti_sgc.c +++ b/sys/arch/hppa/dev/sti_sgc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sti_sgc.c,v 1.8 2002/01/25 21:37:15 mickey Exp $ */ +/* $OpenBSD: sti_sgc.c,v 1.9 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 2000 Michael Shalayeff @@ -57,8 +57,8 @@ #define STI_MEMSIZE 0x1000000 -int sti_sgc_probe __P((struct device *, void *, void *)); -void sti_sgc_attach __P((struct device *, struct device *, void *)); +int sti_sgc_probe(struct device *, void *, void *); +void sti_sgc_attach(struct device *, struct device *, void *); struct cfattach sti_sgc_ca = { sizeof(struct sti_softc), sti_sgc_probe, sti_sgc_attach diff --git a/sys/arch/hppa/dev/viper.h b/sys/arch/hppa/dev/viper.h index 33ebdf55cce..2165ac35ed7 100644 --- a/sys/arch/hppa/dev/viper.h +++ b/sys/arch/hppa/dev/viper.h @@ -1,4 +1,4 @@ -/* $OpenBSD: viper.h,v 1.3 2002/02/25 17:03:53 mickey Exp $ */ +/* $OpenBSD: viper.h,v 1.4 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1991,1994 The University of Utah and @@ -213,6 +213,6 @@ struct vn_supr { u_int vns_zaddr; /* Z Buffer Address (RO) */ }; -void viper_setintrwnd __P((u_int32_t mask)); -void viper_eisa_en __P((void)); +void viper_setintrwnd(u_int32_t mask); +void viper_eisa_en(void); diff --git a/sys/arch/hppa/dev/wax.c b/sys/arch/hppa/dev/wax.c index fdfbecfb244..1ce046f4fb3 100644 --- a/sys/arch/hppa/dev/wax.c +++ b/sys/arch/hppa/dev/wax.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wax.c,v 1.1 1998/11/23 03:04:10 mickey Exp $ */ +/* $OpenBSD: wax.c,v 1.2 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -44,8 +44,8 @@ struct wax_softc { struct device sc_dv; }; -int waxmatch __P((struct device *, void *, void *)); -void waxattach __P((struct device *, struct device *, void *)); +int waxmatch(struct device *, void *, void *); +void waxattach(struct device *, struct device *, void *); struct cfattach wax_ca = { sizeof(struct wax_softc), waxmatch, waxattach diff --git a/sys/arch/hppa/eisa/eisa_machdep.h b/sys/arch/hppa/eisa/eisa_machdep.h index c82331adf43..69c8883675e 100644 --- a/sys/arch/hppa/eisa/eisa_machdep.h +++ b/sys/arch/hppa/eisa/eisa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: eisa_machdep.h,v 1.2 2000/04/18 20:55:02 mickey Exp $ */ +/* $OpenBSD: eisa_machdep.h,v 1.3 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -39,13 +39,13 @@ typedef int eisa_intr_handle_t; struct hppa_eisa_chipset { void *ec_v; - void (*ec_attach_hook) __P((struct device *, struct device *, - struct eisabus_attach_args *)); - int (*ec_intr_map) __P((void *, u_int, int *)); - const char *(*ec_intr_string) __P((void *, int)); + void (*ec_attach_hook)(struct device *, struct device *, + struct eisabus_attach_args *); + int (*ec_intr_map)(void *, u_int, int *); + const char *(*ec_intr_string)(void *, int); void *(*ec_intr_establish) __P((void *, int, int, int, int (*)(void *), void *, char *)); - void (*ec_intr_disestablish) __P((void *, void *)); + void (*ec_intr_disestablish)(void *, void *); }; #if 0 diff --git a/sys/arch/hppa/gsc/com_gsc.c b/sys/arch/hppa/gsc/com_gsc.c index 4ec58bd5233..b296c86119e 100644 --- a/sys/arch/hppa/gsc/com_gsc.c +++ b/sys/arch/hppa/gsc/com_gsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_gsc.c,v 1.11 2002/02/05 04:09:41 mickey Exp $ */ +/* $OpenBSD: com_gsc.c,v 1.12 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1998-2002 Michael Shalayeff @@ -50,8 +50,8 @@ struct com_gsc_regs { u_int8_t reset; }; -int com_gsc_probe __P((struct device *, void *, void *)); -void com_gsc_attach __P((struct device *, struct device *, void *)); +int com_gsc_probe(struct device *, void *, void *); +void com_gsc_attach(struct device *, struct device *, void *); struct cfattach com_gsc_ca = { sizeof(struct com_softc), com_gsc_probe, com_gsc_attach diff --git a/sys/arch/hppa/gsc/fdc_gsc.c b/sys/arch/hppa/gsc/fdc_gsc.c index cb647fee625..de7201513ec 100644 --- a/sys/arch/hppa/gsc/fdc_gsc.c +++ b/sys/arch/hppa/gsc/fdc_gsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fdc_gsc.c,v 1.1 1998/09/30 04:45:46 mickey Exp $ */ +/* $OpenBSD: fdc_gsc.c,v 1.2 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -46,8 +46,8 @@ #include <hppa/dev/cpudevs.h> /* controller driver configuration */ -int fdc_gsc_probe __P((struct device *, void *, void *)); -void fdc_gsc_attach __P((struct device *, struct device *, void *)); +int fdc_gsc_probe(struct device *, void *, void *); +void fdc_gsc_attach(struct device *, struct device *, void *); struct cfattach fdc_gsc_ca = { sizeof(struct fdc_softc), fdc_gsc_probe, fdc_gsc_attach diff --git a/sys/arch/hppa/gsc/gscbus.c b/sys/arch/hppa/gsc/gscbus.c index 61382c167b1..17f05725776 100644 --- a/sys/arch/hppa/gsc/gscbus.c +++ b/sys/arch/hppa/gsc/gscbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gscbus.c,v 1.18 2002/02/06 20:12:43 mickey Exp $ */ +/* $OpenBSD: gscbus.c,v 1.19 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -85,8 +85,8 @@ #include <hppa/gsc/gscbusvar.h> -int gscmatch __P((struct device *, void *, void *)); -void gscattach __P((struct device *, struct device *, void *)); +int gscmatch(struct device *, void *, void *); +void gscattach(struct device *, struct device *, void *); struct cfattach gsc_ca = { sizeof(struct gsc_softc), gscmatch, gscattach @@ -96,26 +96,26 @@ struct cfdriver gsc_cd = { NULL, "gsc", DV_DULL }; -int gsc_dmamap_create __P((void *, bus_size_t, int, - bus_size_t, bus_size_t, int, bus_dmamap_t *)); -void gsc_dmamap_destroy __P((void *, bus_dmamap_t)); -int gsc_dmamap_load __P((void *, bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); -int gsc_dmamap_load_mbuf __P((void *, bus_dmamap_t, struct mbuf *, int)); -int gsc_dmamap_load_uio __P((void *, bus_dmamap_t, struct uio *, int)); -int gsc_dmamap_load_raw __P((void *, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int)); -void gsc_dmamap_unload __P((void *, bus_dmamap_t)); -void gsc_dmamap_sync __P((void *, bus_dmamap_t, bus_addr_t, bus_size_t, - int)); - -int gsc_dmamem_alloc __P((void *, bus_size_t, bus_size_t, - bus_size_t, bus_dma_segment_t *, int, int *, int)); -void gsc_dmamem_free __P((void *, bus_dma_segment_t *, int)); -int gsc_dmamem_map __P((void *, bus_dma_segment_t *, - int, size_t, caddr_t *, int)); -void gsc_dmamem_unmap __P((void *, caddr_t, size_t)); -paddr_t gsc_dmamem_mmap __P((void *, bus_dma_segment_t *, int, off_t, int, int)); +int gsc_dmamap_create(void *, bus_size_t, int, + bus_size_t, bus_size_t, int, bus_dmamap_t *); +void gsc_dmamap_destroy(void *, bus_dmamap_t); +int gsc_dmamap_load(void *, bus_dmamap_t, void *, + bus_size_t, struct proc *, int); +int gsc_dmamap_load_mbuf(void *, bus_dmamap_t, struct mbuf *, int); +int gsc_dmamap_load_uio(void *, bus_dmamap_t, struct uio *, int); +int gsc_dmamap_load_raw(void *, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int); +void gsc_dmamap_unload(void *, bus_dmamap_t); +void gsc_dmamap_sync(void *, bus_dmamap_t, bus_addr_t, bus_size_t, + int); + +int gsc_dmamem_alloc(void *, bus_size_t, bus_size_t, + bus_size_t, bus_dma_segment_t *, int, int *, int); +void gsc_dmamem_free(void *, bus_dma_segment_t *, int); +int gsc_dmamem_map(void *, bus_dma_segment_t *, + int, size_t, caddr_t *, int); +void gsc_dmamem_unmap(void *, caddr_t, size_t); +paddr_t gsc_dmamem_mmap(void *, bus_dma_segment_t *, int, off_t, int, int); int gscmatch(parent, cfdata, aux) @@ -189,7 +189,7 @@ gsc_intr_establish(sc, pri, irq, handler, arg, dv) struct gsc_softc *sc; int pri; int irq; - int (*handler) __P((void *v)); + int (*handler)(void *v); void *arg; struct device *dv; { diff --git a/sys/arch/hppa/gsc/gscbusvar.h b/sys/arch/hppa/gsc/gscbusvar.h index 27e879f3a23..1435f820729 100644 --- a/sys/arch/hppa/gsc/gscbusvar.h +++ b/sys/arch/hppa/gsc/gscbusvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: gscbusvar.h,v 1.5 2002/02/16 02:24:05 mickey Exp $ */ +/* $OpenBSD: gscbusvar.h,v 1.6 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -34,10 +34,10 @@ struct gscbus_ic { enum {gsc_unknown = 0, gsc_lasi, gsc_wax, gsc_asp} gsc_type; void *gsc_dv; - void (*gsc_intr_establish) __P((void *v, u_int32_t mask)); - void (*gsc_intr_disestablish) __P((void *v, u_int32_t mask)); - u_int32_t (*gsc_intr_check) __P((void *v)); - void (*gsc_intr_ack) __P((void *v, u_int32_t mask)); + void (*gsc_intr_establish)(void *v, u_int32_t mask); + void (*gsc_intr_disestablish)(void *v, u_int32_t mask); + u_int32_t (*gsc_intr_check)(void *v); + void (*gsc_intr_ack)(void *v, u_int32_t mask); }; struct gsc_attach_args { @@ -56,7 +56,7 @@ struct gsc_attach_args { struct gscbus_intr { int pri; - int (*handler) __P((void *)); + int (*handler)(void *); void *arg; struct evcnt evcnt; }; @@ -75,10 +75,10 @@ struct gsc_softc { }; void *gsc_intr_establish __P((struct gsc_softc *sc, int pri, int irq, - int (*handler) __P((void *v)), void *arg, + int (*handler)(void *v), void *arg, struct device *name)); -void gsc_intr_disestablish __P((struct gsc_softc *sc, void *v)); -int gsc_intr __P((void *)); +void gsc_intr_disestablish(struct gsc_softc *sc, void *v); +int gsc_intr(void *); -int gscprint __P((void *, const char *)); +int gscprint(void *, const char *); diff --git a/sys/arch/hppa/gsc/if_ie_gsc.c b/sys/arch/hppa/gsc/if_ie_gsc.c index 24b737af37a..c37b285d2d7 100644 --- a/sys/arch/hppa/gsc/if_ie_gsc.c +++ b/sys/arch/hppa/gsc/if_ie_gsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie_gsc.c,v 1.9 2002/02/11 21:20:51 mickey Exp $ */ +/* $OpenBSD: if_ie_gsc.c,v 1.10 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1998,1999 Michael Shalayeff @@ -73,8 +73,8 @@ struct ie_gsc_regs { #define IE_SIZE 0x8000 -int ie_gsc_probe __P((struct device *, void *, void *)); -void ie_gsc_attach __P((struct device *, struct device *, void *)); +int ie_gsc_probe(struct device *, void *, void *); +void ie_gsc_attach(struct device *, struct device *, void *); struct cfattach ie_gsc_ca = { sizeof(struct ie_softc), ie_gsc_probe, ie_gsc_attach @@ -87,18 +87,18 @@ static int ie_gsc_media[] = { static char mem[IE_SIZE+16]; -void ie_gsc_reset __P((struct ie_softc *sc, int what)); -void ie_gsc_attend __P((struct ie_softc *sc)); -void ie_gsc_run __P((struct ie_softc *sc)); -void ie_gsc_port __P((struct ie_softc *sc, u_int)); +void ie_gsc_reset(struct ie_softc *sc, int what); +void ie_gsc_attend(struct ie_softc *sc); +void ie_gsc_run(struct ie_softc *sc); +void ie_gsc_port(struct ie_softc *sc, u_int); #ifdef USELEDS -int ie_gsc_intrhook __P((struct ie_softc *sc, int what)); +int ie_gsc_intrhook(struct ie_softc *sc, int what); #endif -u_int16_t ie_gsc_read16 __P((struct ie_softc *sc, int offset)); -void ie_gsc_write16 __P((struct ie_softc *sc, int offset, u_int16_t v)); -void ie_gsc_write24 __P((struct ie_softc *sc, int offset, int addr)); -void ie_gsc_memcopyin __P((struct ie_softc *sc, void *p, int offset, size_t)); -void ie_gsc_memcopyout __P((struct ie_softc *sc, const void *p, int, size_t)); +u_int16_t ie_gsc_read16(struct ie_softc *sc, int offset); +void ie_gsc_write16(struct ie_softc *sc, int offset, u_int16_t v); +void ie_gsc_write24(struct ie_softc *sc, int offset, int addr); +void ie_gsc_memcopyin(struct ie_softc *sc, void *p, int offset, size_t); +void ie_gsc_memcopyout(struct ie_softc *sc, const void *p, int, size_t); void diff --git a/sys/arch/hppa/gsc/lpt_gsc.c b/sys/arch/hppa/gsc/lpt_gsc.c index 12e2903d1d5..1d37e6d121d 100644 --- a/sys/arch/hppa/gsc/lpt_gsc.c +++ b/sys/arch/hppa/gsc/lpt_gsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpt_gsc.c,v 1.6 2000/07/21 17:41:06 mickey Exp $ */ +/* $OpenBSD: lpt_gsc.c,v 1.7 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -68,8 +68,8 @@ #define LPTGSC_OFFSET 0x800 -int lpt_gsc_probe __P((struct device *, void *, void *)); -void lpt_gsc_attach __P((struct device *, struct device *, void *)); +int lpt_gsc_probe(struct device *, void *, void *); +void lpt_gsc_attach(struct device *, struct device *, void *); struct cfattach lpt_gsc_ca = { sizeof(struct lpt_softc), lpt_gsc_probe, lpt_gsc_attach diff --git a/sys/arch/hppa/gsc/siop_gsc.c b/sys/arch/hppa/gsc/siop_gsc.c index d2843111938..6a88e029007 100644 --- a/sys/arch/hppa/gsc/siop_gsc.c +++ b/sys/arch/hppa/gsc/siop_gsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siop_gsc.c,v 1.1 1998/11/04 17:01:35 mickey Exp $ */ +/* $OpenBSD: siop_gsc.c,v 1.2 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -47,8 +47,8 @@ #include <hppa/dev/cpudevs.h> -int ncr53c7xx_gsc_probe __P((struct device *, void *, void *)); -void ncr53c7xx_gsc_attach __P((struct device *, struct device *, void *)); +int ncr53c7xx_gsc_probe(struct device *, void *, void *); +void ncr53c7xx_gsc_attach(struct device *, struct device *, void *); struct cfattach ncr_ca = { sizeof(struct ncr53c7xx_softc), diff --git a/sys/arch/hppa/hppa/autoconf.c b/sys/arch/hppa/hppa/autoconf.c index 897a9d2ed83..464e9de3977 100644 --- a/sys/arch/hppa/hppa/autoconf.c +++ b/sys/arch/hppa/hppa/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.17 2002/02/12 06:42:26 mickey Exp $ */ +/* $OpenBSD: autoconf.c,v 1.18 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1998-2001 Michael Shalayeff @@ -61,13 +61,13 @@ #include <hppa/dev/cpudevs.h> -void setroot __P((void)); -void swapconf __P((void)); -void dumpconf __P((void)); +void setroot(void); +void swapconf(void); +void dumpconf(void); -static int findblkmajor __P((struct device *dv)); +static int findblkmajor(struct device *dv); -void (*cold_hook) __P((int)); /* see below */ +void (*cold_hook)(int); /* see below */ register_t kpsw = PSW_Q | PSW_P | PSW_C | PSW_D; /* @@ -75,7 +75,7 @@ register_t kpsw = PSW_Q | PSW_P | PSW_C | PSW_D; */ #ifdef USELEDS struct timeout heartbeat_tmo; -void heartbeat __P((void *)); +void heartbeat(void *); extern int hz; #endif diff --git a/sys/arch/hppa/hppa/db_disasm.c b/sys/arch/hppa/hppa/db_disasm.c index f95c01f6879..b9eb7496568 100644 --- a/sys/arch/hppa/hppa/db_disasm.c +++ b/sys/arch/hppa/hppa/db_disasm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_disasm.c,v 1.10 2002/02/04 21:20:32 mickey Exp $ */ +/* $OpenBSD: db_disasm.c,v 1.11 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -900,44 +900,44 @@ struct majoropcode { /*##################### Globals - Imports ##################################*/ /* Disassembly functions */ -int fcoprDasm __P((int w, u_int op1, u_int)); -char *edDCond __P((u_int cond)); -char *unitDCond __P((u_int cond)); -char *addDCond __P((u_int cond)); -char *subDCond __P((u_int cond)); -int blDasm __P((const struct inst *i, OFS ofs, int w)); -int ldDasm __P((const struct inst *, OFS, int)); -int stDasm __P((const struct inst *i, OFS, int)); -int addDasm __P((const struct inst *i, OFS, int)); -int unitDasm __P((const struct inst *i, OFS, int)); -int iaDasm __P((const struct inst *i, OFS, int)); -int shdDasm __P((const struct inst *i, OFS, int)); -int extrDasm __P((const struct inst *i, OFS, int)); -int vextrDasm __P((const struct inst *i, OFS, int)); -int depDasm __P((const struct inst *i, OFS, int)); -int vdepDasm __P((const struct inst *i, OFS, int)); -int depiDasm __P((const struct inst *i, OFS, int)); -int vdepiDasm __P((const struct inst *i, OFS, int)); -int limmDasm __P((const struct inst *i, OFS, int)); -int brkDasm __P((const struct inst *i, OFS, int)); -int lpkDasm __P((const struct inst *i, OFS, int)); -int fmpyaddDasm __P((const struct inst *i, OFS, int)); -int fmpysubDasm __P((const struct inst *i, OFS, int)); -int floatDasm __P((const struct inst *i, OFS, int)); -int coprDasm __P((const struct inst *i, OFS, int)); -int diagDasm __P((const struct inst *i, OFS, int)); -int scDasm __P((const struct inst *i, OFS, int)); -int mmgtDasm __P((const struct inst *i, OFS, int)); -int ldxDasm __P((const struct inst *i, OFS, int)); -int stsDasm __P((const struct inst *i, OFS, int)); -int stbysDasm __P((const struct inst *i, OFS, int)); -int brDasm __P((const struct inst *i, OFS, int)); -int bvDasm __P((const struct inst *i, OFS, int)); -int beDasm __P((const struct inst *i, OFS, int)); -int cbDasm __P((const struct inst *i,OFS ofs, int)); -int cbiDasm __P((const struct inst *i,OFS ofs, int)); -int bbDasm __P((const struct inst *i,OFS ofs, int)); -int ariDasm __P((const struct inst *i, OFS, int)); +int fcoprDasm(int w, u_int op1, u_int); +char *edDCond(u_int cond); +char *unitDCond(u_int cond); +char *addDCond(u_int cond); +char *subDCond(u_int cond); +int blDasm(const struct inst *i, OFS ofs, int w); +int ldDasm(const struct inst *, OFS, int); +int stDasm(const struct inst *i, OFS, int); +int addDasm(const struct inst *i, OFS, int); +int unitDasm(const struct inst *i, OFS, int); +int iaDasm(const struct inst *i, OFS, int); +int shdDasm(const struct inst *i, OFS, int); +int extrDasm(const struct inst *i, OFS, int); +int vextrDasm(const struct inst *i, OFS, int); +int depDasm(const struct inst *i, OFS, int); +int vdepDasm(const struct inst *i, OFS, int); +int depiDasm(const struct inst *i, OFS, int); +int vdepiDasm(const struct inst *i, OFS, int); +int limmDasm(const struct inst *i, OFS, int); +int brkDasm(const struct inst *i, OFS, int); +int lpkDasm(const struct inst *i, OFS, int); +int fmpyaddDasm(const struct inst *i, OFS, int); +int fmpysubDasm(const struct inst *i, OFS, int); +int floatDasm(const struct inst *i, OFS, int); +int coprDasm(const struct inst *i, OFS, int); +int diagDasm(const struct inst *i, OFS, int); +int scDasm(const struct inst *i, OFS, int); +int mmgtDasm(const struct inst *i, OFS, int); +int ldxDasm(const struct inst *i, OFS, int); +int stsDasm(const struct inst *i, OFS, int); +int stbysDasm(const struct inst *i, OFS, int); +int brDasm(const struct inst *i, OFS, int); +int bvDasm(const struct inst *i, OFS, int); +int beDasm(const struct inst *i, OFS, int); +int cbDasm(const struct inst *i,OFS ofs, int); +int cbiDasm(const struct inst *i,OFS ofs, int); +int bbDasm(const struct inst *i,OFS ofs, int); +int ariDasm(const struct inst *i, OFS, int); /*##################### Globals - Exports ##################################*/ /*##################### Local Variables ####################################*/ diff --git a/sys/arch/hppa/hppa/db_interface.c b/sys/arch/hppa/hppa/db_interface.c index 8c71d74b467..66e6a8b5072 100644 --- a/sys/arch/hppa/hppa/db_interface.c +++ b/sys/arch/hppa/hppa/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.16 2001/03/22 23:31:45 mickey Exp $ */ +/* $OpenBSD: db_interface.c,v 1.17 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1999-2000 Michael Shalayeff @@ -51,7 +51,7 @@ #include <dev/cons.h> -void kdbprinttrap __P((int, int)); +void kdbprinttrap(int, int); extern label_t *db_recover; extern int db_active; diff --git a/sys/arch/hppa/hppa/disksubr.c b/sys/arch/hppa/hppa/disksubr.c index 0394d8b26bd..adaefeb50d3 100644 --- a/sys/arch/hppa/hppa/disksubr.c +++ b/sys/arch/hppa/hppa/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.7 2002/02/19 02:46:39 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.8 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -73,20 +73,20 @@ #define b_cylin b_resid #if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL) -void swapdisklabel __P((struct disklabel *d)); -char *readbsdlabel __P((struct buf *, void (*) __P((struct buf *)), int, int, +void swapdisklabel(struct disklabel *d); +char *readbsdlabel __P((struct buf *, void (*)(struct buf *), int, int, int, int, struct disklabel *, int)); #endif #if defined(DISKLABEL_I386) || defined(DISKLABEL_ALL) -char *readdoslabel __P((struct buf *, void (*) __P((struct buf *)), +char *readdoslabel __P((struct buf *, void (*)(struct buf *), struct disklabel *, struct cpu_disklabel *, int *, int *, int)); #endif #if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL) -char *readamigalabel __P((struct buf *, void (*) __P((struct buf *)), +char *readamigalabel __P((struct buf *, void (*)(struct buf *), struct disklabel *, struct cpu_disklabel *, int)); #endif #if defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL) -char *readliflabel __P((struct buf *, void (*) __P((struct buf *)), +char *readliflabel __P((struct buf *, void (*)(struct buf *), struct disklabel *, struct cpu_disklabel *, int *, int *, int)); #endif @@ -154,7 +154,7 @@ swapdisklabel(dlp) char * readbsdlabel(bp, strat, cyl, sec, off, endian, lp, spoofonly) struct buf *bp; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); int cyl, sec, off, endian; struct disklabel *lp; int spoofonly; @@ -238,7 +238,7 @@ readbsdlabel(bp, strat, cyl, sec, off, endian, lp, spoofonly) char * readdisklabel(dev, strat, lp, osdep, spoofonly) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *osdep; int spoofonly; @@ -346,7 +346,7 @@ done: char * readdoslabel(bp, strat, lp, osdep, partoffp, cylp, spoofonly) struct buf *bp; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *osdep; int *partoffp; @@ -577,7 +577,7 @@ donot: char * readamigalabel(bp, strat, lp, osdep, spoofonly) struct buf *bp; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *osdep; int spoofonly; @@ -594,7 +594,7 @@ readamigalabel(bp, strat, lp, osdep, spoofonly) char * readliflabel (bp, strat, lp, osdep, partoffp, cylp, spoofonly) struct buf *bp; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *osdep; int *partoffp; @@ -725,7 +725,7 @@ setdisklabel(olp, nlp, openmask, osdep) int writedisklabel(dev, strat, lp, osdep) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *osdep; { diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c index df159898f11..ebacbf7c8ab 100644 --- a/sys/arch/hppa/hppa/machdep.c +++ b/sys/arch/hppa/hppa/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.60 2002/02/20 19:33:01 mickey Exp $ */ +/* $OpenBSD: machdep.c,v 1.61 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1999-2002 Michael Shalayeff @@ -153,12 +153,12 @@ int cpu_model_hpux; /* contains HPUX_SYSCONF_CPU* kind of value */ /* * exported methods for cpus */ -int (*cpu_desidhash) __P((void)); -int (*cpu_hpt_init) __P((vaddr_t hpt, vsize_t hptsize)); -int (*cpu_ibtlb_ins) __P((int i, pa_space_t sp, vaddr_t va, paddr_t pa, - vsize_t sz, u_int prot)); -int (*cpu_dbtlb_ins) __P((int i, pa_space_t sp, vaddr_t va, paddr_t pa, - vsize_t sz, u_int prot)); +int (*cpu_desidhash)(void); +int (*cpu_hpt_init)(vaddr_t hpt, vsize_t hptsize); +int (*cpu_ibtlb_ins)(int i, pa_space_t sp, vaddr_t va, paddr_t pa, + vsize_t sz, u_int prot); +int (*cpu_dbtlb_ins)(int i, pa_space_t sp, vaddr_t va, paddr_t pa, + vsize_t sz, u_int prot); dev_t bootdev; int totalphysmem, resvmem, physmem, esym; @@ -175,11 +175,11 @@ struct vm_map *phys_map = NULL; /* Virtual page frame for /dev/mem (see mem.c) */ vaddr_t vmmap; -void delay_init __P((void)); -static __inline void fall __P((int, int, int, int, int)); -void dumpsys __P((void)); -void hpmc_dump __P((void)); -void hppa_user2frame __P((struct trapframe *sf, struct trapframe *tf)); +void delay_init(void); +static __inline void fall(int, int, int, int, int); +void dumpsys(void); +void hpmc_dump(void); +void hppa_user2frame(struct trapframe *sf, struct trapframe *tf); /* * wide used hardware params @@ -202,37 +202,37 @@ extern const u_int itlb_x[], dtlb_x[], dtlbna_x[], tlbd_x[]; extern const u_int itlb_s[], dtlb_s[], dtlbna_s[], tlbd_s[]; extern const u_int itlb_t[], dtlb_t[], dtlbna_t[], tlbd_t[]; extern const u_int itlb_l[], dtlb_l[], dtlbna_l[], tlbd_l[]; -int iibtlb_s __P((int i, pa_space_t sp, vaddr_t va, paddr_t pa, - vsize_t sz, u_int prot)); -int idbtlb_s __P((int i, pa_space_t sp, vaddr_t va, paddr_t pa, - vsize_t sz, u_int prot)); -int ibtlb_t __P((int i, pa_space_t sp, vaddr_t va, paddr_t pa, - vsize_t sz, u_int prot)); -int ibtlb_l __P((int i, pa_space_t sp, vaddr_t va, paddr_t pa, - vsize_t sz, u_int prot)); -int ibtlb_g __P((int i, pa_space_t sp, vaddr_t va, paddr_t pa, - vsize_t sz, u_int prot)); -int pbtlb_g __P((int i)); -int hpti_l __P((vaddr_t, vsize_t)); -int hpti_g __P((vaddr_t, vsize_t)); -int desidhash_x __P((void)); -int desidhash_s __P((void)); -int desidhash_t __P((void)); -int desidhash_l __P((void)); -int desidhash_g __P((void)); +int iibtlb_s(int i, pa_space_t sp, vaddr_t va, paddr_t pa, + vsize_t sz, u_int prot); +int idbtlb_s(int i, pa_space_t sp, vaddr_t va, paddr_t pa, + vsize_t sz, u_int prot); +int ibtlb_t(int i, pa_space_t sp, vaddr_t va, paddr_t pa, + vsize_t sz, u_int prot); +int ibtlb_l(int i, pa_space_t sp, vaddr_t va, paddr_t pa, + vsize_t sz, u_int prot); +int ibtlb_g(int i, pa_space_t sp, vaddr_t va, paddr_t pa, + vsize_t sz, u_int prot); +int pbtlb_g(int i); +int hpti_l(vaddr_t, vsize_t); +int hpti_g(vaddr_t, vsize_t); +int desidhash_x(void); +int desidhash_s(void); +int desidhash_t(void); +int desidhash_l(void); +int desidhash_g(void); const struct hppa_cpu_typed { char name[8]; enum hppa_cpu_type type; int arch; int features; - int (*desidhash) __P((void)); + int (*desidhash)(void); const u_int *itlbh, *dtlbh, *dtlbnah, *tlbdh; - int (*dbtlbins) __P((int i, pa_space_t sp, vaddr_t va, paddr_t pa, - vsize_t sz, u_int prot)); - int (*ibtlbins) __P((int i, pa_space_t sp, vaddr_t va, paddr_t pa, - vsize_t sz, u_int prot)); - int (*btlbprg) __P((int i)); - int (*hptinit) __P((vaddr_t hpt, vsize_t hptsize)); + int (*dbtlbins)(int i, pa_space_t sp, vaddr_t va, paddr_t pa, + vsize_t sz, u_int prot); + int (*ibtlbins)(int i, pa_space_t sp, vaddr_t va, paddr_t pa, + vsize_t sz, u_int prot); + int (*btlbprg)(int i); + int (*hptinit)(vaddr_t hpt, vsize_t hptsize); } cpu_types[] = { #ifdef HP7000_CPU { "PCX", hpcx, 0x10, 0, @@ -1035,7 +1035,7 @@ dumpsys() int psize, bytes, i, n; register caddr_t maddr; register daddr_t blkno; - register int (*dump) __P((dev_t, daddr_t, caddr_t, size_t)); + register int (*dump)(dev_t, daddr_t, caddr_t, size_t); register int error; /* Save registers diff --git a/sys/arch/hppa/hppa/mainbus.c b/sys/arch/hppa/hppa/mainbus.c index cd0214c7259..37bbbac9a95 100644 --- a/sys/arch/hppa/hppa/mainbus.c +++ b/sys/arch/hppa/hppa/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.27 2002/02/21 06:17:19 mickey Exp $ */ +/* $OpenBSD: mainbus.c,v 1.28 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1998-2001 Michael Shalayeff @@ -54,8 +54,8 @@ struct mainbus_softc { hppa_hpa_t sc_hpa; }; -int mbmatch __P((struct device *, void *, void *)); -void mbattach __P((struct device *, struct device *, void *)); +int mbmatch(struct device *, void *, void *); +void mbattach(struct device *, struct device *, void *); struct cfattach mainbus_ca = { sizeof(struct mainbus_softc), mbmatch, mbattach @@ -422,19 +422,19 @@ mbus_sm_8(void *v, bus_space_handle_t h, bus_size_t o, u_int64_t vv, bus_size_t *(volatile u_int64_t *)h = vv; } -void mbus_rrm_2 __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int16_t*a, bus_size_t c)); -void mbus_rrm_4 __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int32_t*a, bus_size_t c)); -void mbus_rrm_8 __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int64_t*a, bus_size_t c)); +void mbus_rrm_2(void *v, bus_space_handle_t h, + bus_size_t o, u_int16_t*a, bus_size_t c); +void mbus_rrm_4(void *v, bus_space_handle_t h, + bus_size_t o, u_int32_t*a, bus_size_t c); +void mbus_rrm_8(void *v, bus_space_handle_t h, + bus_size_t o, u_int64_t*a, bus_size_t c); -void mbus_wrm_2 __P((void *v, bus_space_handle_t h, - bus_size_t o, const u_int16_t *a, bus_size_t c)); -void mbus_wrm_4 __P((void *v, bus_space_handle_t h, - bus_size_t o, const u_int32_t *a, bus_size_t c)); -void mbus_wrm_8 __P((void *v, bus_space_handle_t h, - bus_size_t o, const u_int64_t *a, bus_size_t c)); +void mbus_wrm_2(void *v, bus_space_handle_t h, + bus_size_t o, const u_int16_t *a, bus_size_t c); +void mbus_wrm_4(void *v, bus_space_handle_t h, + bus_size_t o, const u_int32_t *a, bus_size_t c); +void mbus_wrm_8(void *v, bus_space_handle_t h, + bus_size_t o, const u_int64_t *a, bus_size_t c); void mbus_rr_1(void *v, bus_space_handle_t h, bus_size_t o, u_int8_t *a, bus_size_t c) @@ -500,19 +500,19 @@ mbus_wr_8(void *v, bus_space_handle_t h, bus_size_t o, const u_int64_t *a, bus_s *((volatile u_int64_t *)h)++ = *(a++); } -void mbus_rrr_2 __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int16_t *a, bus_size_t c)); -void mbus_rrr_4 __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int32_t *a, bus_size_t c)); -void mbus_rrr_8 __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int64_t *a, bus_size_t c)); +void mbus_rrr_2(void *v, bus_space_handle_t h, + bus_size_t o, u_int16_t *a, bus_size_t c); +void mbus_rrr_4(void *v, bus_space_handle_t h, + bus_size_t o, u_int32_t *a, bus_size_t c); +void mbus_rrr_8(void *v, bus_space_handle_t h, + bus_size_t o, u_int64_t *a, bus_size_t c); -void mbus_wrr_2 __P((void *v, bus_space_handle_t h, - bus_size_t o, const u_int16_t *a, bus_size_t c)); -void mbus_wrr_4 __P((void *v, bus_space_handle_t h, - bus_size_t o, const u_int32_t *a, bus_size_t c)); -void mbus_wrr_8 __P((void *v, bus_space_handle_t h, - bus_size_t o, const u_int64_t *a, bus_size_t c)); +void mbus_wrr_2(void *v, bus_space_handle_t h, + bus_size_t o, const u_int16_t *a, bus_size_t c); +void mbus_wrr_4(void *v, bus_space_handle_t h, + bus_size_t o, const u_int32_t *a, bus_size_t c); +void mbus_wrr_8(void *v, bus_space_handle_t h, + bus_size_t o, const u_int64_t *a, bus_size_t c); void mbus_sr_1(void *v, bus_space_handle_t h, bus_size_t o, u_int8_t vv, bus_size_t c) @@ -592,8 +592,8 @@ mbus_cp_8(void *v, bus_space_handle_t h1, bus_size_t o1, /* ugly typecast macro */ -#define crr(n) ((void (*) __P((void *, bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t)))(n)) -#define cwr(n) ((void (*) __P((void *, bus_space_handle_t, bus_size_t, const u_int8_t *, bus_size_t)))(n)) +#define crr(n) ((void (*)(void *, bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t))(n)) +#define cwr(n) ((void (*)(void *, bus_space_handle_t, bus_size_t, const u_int8_t *, bus_size_t))(n)) const struct hppa_bus_space_tag hppa_bustag = { NULL, diff --git a/sys/arch/hppa/hppa/pmap.c b/sys/arch/hppa/hppa/pmap.c index d2d6775d0fb..aeb1b1ff72e 100644 --- a/sys/arch/hppa/hppa/pmap.c +++ b/sys/arch/hppa/hppa/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.60 2002/02/21 06:12:30 mickey Exp $ */ +/* $OpenBSD: pmap.c,v 1.61 2002/03/14 01:26:31 millert Exp $ */ /* * Copyright (c) 1998-2001 Michael Shalayeff @@ -204,12 +204,12 @@ TAILQ_HEAD(, pv_page) pv_page_freelist; u_int pv_nfree; #ifdef PMAPDEBUG -void pmap_hptdump __P((int sp)); +void pmap_hptdump(int sp); #endif u_int kern_prot[8], user_prot[8]; -void pmap_pinit __P((pmap_t)); +void pmap_pinit(pmap_t); #define pmap_sid(pmap, va) \ (((va & 0xc0000000) != 0xc0000000)? pmap->pmap_space : HPPA_SID_KERNEL) diff --git a/sys/arch/hppa/hppa/swapgeneric.c b/sys/arch/hppa/hppa/swapgeneric.c index d2bbed8e9a8..91ec0fe2245 100644 --- a/sys/arch/hppa/hppa/swapgeneric.c +++ b/sys/arch/hppa/hppa/swapgeneric.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapgeneric.c,v 1.1 1998/10/30 18:55:51 mickey Exp $ */ +/* $OpenBSD: swapgeneric.c,v 1.2 2002/03/14 01:26:32 millert Exp $ */ /*- * Copyright (c) 1994 @@ -42,7 +42,7 @@ #include <sys/param.h> #include <sys/conf.h> -int (*mountroot) __P((void *)) = NULL; /* tells autoconf.c that we are "generic" */ +int (*mountroot)(void *) = NULL; /* tells autoconf.c that we are "generic" */ dev_t rootdev = NODEV; dev_t dumpdev = NODEV; diff --git a/sys/arch/hppa/hppa/trap.c b/sys/arch/hppa/hppa/trap.c index b8d3801fcf8..e74257bedb6 100644 --- a/sys/arch/hppa/hppa/trap.c +++ b/sys/arch/hppa/hppa/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.38 2002/02/07 13:54:16 mickey Exp $ */ +/* $OpenBSD: trap.c,v 1.39 2002/03/14 01:26:32 millert Exp $ */ /* * Copyright (c) 1998-2001 Michael Shalayeff @@ -99,9 +99,9 @@ int trap_types = sizeof(trap_type)/sizeof(trap_type[0]); u_int32_t sir; int want_resched, astpending; -void pmap_hptdump __P((void)); -void cpu_intr __P((struct trapframe *frame)); -void syscall __P((struct trapframe *frame, int *args)); +void pmap_hptdump(void); +void cpu_intr(struct trapframe *frame); +void syscall(struct trapframe *frame, int *args); static __inline void userret (struct proc *p, register_t pc, u_quad_t oticks) @@ -547,14 +547,14 @@ syscall(frame, args) struct cpu_intr_vector { struct evcnt evcnt; int pri; - int (*handler) __P((void *)); + int (*handler)(void *); void *arg; } cpu_intr_vectors[CPU_NINTS]; void * cpu_intr_establish(pri, irq, handler, arg, dv) int pri, irq; - int (*handler) __P((void *)); + int (*handler)(void *); void *arg; struct device *dv; { diff --git a/sys/arch/hppa/include/autoconf.h b/sys/arch/hppa/include/autoconf.h index 06c9bcf905f..f926ce872ba 100644 --- a/sys/arch/hppa/include/autoconf.h +++ b/sys/arch/hppa/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.12 2002/02/12 06:42:26 mickey Exp $ */ +/* $OpenBSD: autoconf.h,v 1.13 2002/03/14 01:26:32 millert Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -58,19 +58,19 @@ struct hppa_mod_info { const char *mi_name; }; -extern void (*cold_hook) __P((int)); +extern void (*cold_hook)(int); #define HPPA_COLD_COLD 0 #define HPPA_COLD_HOT 1 #define HPPA_COLD_OFF 2 struct device; -const char *hppa_mod_info __P((int, int)); -void pdc_scanbus __P((struct device *, struct confargs *, int bus, int)); -int mbprint __P((void *, const char *)); -int mbsubmatch __P((struct device *, void *, void *)); -void *cpu_intr_establish __P((int pri, int, int (*handler) __P((void *)), +const char *hppa_mod_info(int, int); +void pdc_scanbus(struct device *, struct confargs *, int bus, int); +int mbprint(void *, const char *); +int mbsubmatch(struct device *, void *, void *); +void *cpu_intr_establish __P((int pri, int, int (*handler)(void *), void *arg, struct device *name)); -int clock_intr __P((void *)); +int clock_intr(void *); -void dumpconf __P((void)); +void dumpconf(void); diff --git a/sys/arch/hppa/include/bus.h b/sys/arch/hppa/include/bus.h index ab30eddd3d0..b5a0377eeff 100644 --- a/sys/arch/hppa/include/bus.h +++ b/sys/arch/hppa/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.18 2002/03/07 18:08:08 jason Exp $ */ +/* $OpenBSD: bus.h,v 1.19 2002/03/14 01:26:32 millert Exp $ */ /* * Copyright (c) 1998,1999 Michael Shalayeff @@ -47,121 +47,121 @@ typedef u_long bus_space_handle_t; struct hppa_bus_space_tag { void *hbt_cookie; - int (*hbt_map) __P((void *v, bus_addr_t addr, bus_size_t size, - int cacheable, bus_space_handle_t *bshp)); - void (*hbt_unmap) __P((void *v, bus_space_handle_t bsh, - bus_size_t size)); - int (*hbt_subregion) __P((void *v, bus_space_handle_t bsh, + int (*hbt_map)(void *v, bus_addr_t addr, bus_size_t size, + int cacheable, bus_space_handle_t *bshp); + void (*hbt_unmap)(void *v, bus_space_handle_t bsh, + bus_size_t size); + int (*hbt_subregion)(void *v, bus_space_handle_t bsh, bus_size_t offset, bus_size_t size, - bus_space_handle_t *nbshp)); - int (*hbt_alloc) __P((void *v, bus_addr_t rstart, bus_addr_t rend, + bus_space_handle_t *nbshp); + int (*hbt_alloc)(void *v, bus_addr_t rstart, bus_addr_t rend, bus_size_t size, bus_size_t align, bus_size_t boundary, int cacheable, - bus_addr_t *addrp, bus_space_handle_t *bshp)); - void (*hbt_free) __P((void *, bus_space_handle_t, bus_size_t)); - void (*hbt_barrier) __P((void *v, bus_space_handle_t h, - bus_size_t o, bus_size_t l, int op)); - - u_int8_t (*hbt_r1) __P((void *, bus_space_handle_t, bus_size_t)); - u_int16_t (*hbt_r2) __P((void *, bus_space_handle_t, bus_size_t)); - u_int32_t (*hbt_r4) __P((void *, bus_space_handle_t, bus_size_t)); - u_int64_t (*hbt_r8) __P((void *, bus_space_handle_t, bus_size_t)); - - void (*hbt_w1)__P((void *, bus_space_handle_t, bus_size_t, u_int8_t)); - void (*hbt_w2)__P((void *, bus_space_handle_t, bus_size_t, u_int16_t)); - void (*hbt_w4)__P((void *, bus_space_handle_t, bus_size_t, u_int32_t)); - void (*hbt_w8)__P((void *, bus_space_handle_t, bus_size_t, u_int64_t)); - - void (*hbt_rm_1) __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int8_t *a, bus_size_t c)); - void (*hbt_rm_2) __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int16_t *a, bus_size_t c)); - void (*hbt_rm_4) __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int32_t *a, bus_size_t c)); - void (*hbt_rm_8) __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int64_t *a, bus_size_t c)); - - void (*hbt_wm_1) __P((void *v, bus_space_handle_t h, bus_size_t o, - const u_int8_t *a, bus_size_t c)); - void (*hbt_wm_2) __P((void *v, bus_space_handle_t h, bus_size_t o, - const u_int16_t *a, bus_size_t c)); - void (*hbt_wm_4) __P((void *v, bus_space_handle_t h, bus_size_t o, - const u_int32_t *a, bus_size_t c)); - void (*hbt_wm_8) __P((void *v, bus_space_handle_t h, bus_size_t o, - const u_int64_t *a, bus_size_t c)); - - void (*hbt_sm_1) __P((void *v, bus_space_handle_t h, bus_size_t o, - u_int8_t vv, bus_size_t c)); - void (*hbt_sm_2) __P((void *v, bus_space_handle_t h, bus_size_t o, - u_int16_t vv, bus_size_t c)); - void (*hbt_sm_4) __P((void *v, bus_space_handle_t h, bus_size_t o, - u_int32_t vv, bus_size_t c)); - void (*hbt_sm_8) __P((void *v, bus_space_handle_t h, bus_size_t o, - u_int64_t vv, bus_size_t c)); - - void (*hbt_rrm_2) __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int8_t *a, bus_size_t c)); - void (*hbt_rrm_4) __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int8_t *a, bus_size_t c)); - void (*hbt_rrm_8) __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int8_t *a, bus_size_t c)); - - void (*hbt_wrm_2) __P((void *v, bus_space_handle_t h, - bus_size_t o, const u_int8_t *a, bus_size_t c)); - void (*hbt_wrm_4) __P((void *v, bus_space_handle_t h, - bus_size_t o, const u_int8_t *a, bus_size_t c)); - void (*hbt_wrm_8) __P((void *v, bus_space_handle_t h, - bus_size_t o, const u_int8_t *a, bus_size_t c)); - - void (*hbt_rr_1) __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int8_t *a, bus_size_t c)); - void (*hbt_rr_2) __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int16_t *a, bus_size_t c)); - void (*hbt_rr_4) __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int32_t *a, bus_size_t c)); - void (*hbt_rr_8) __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int64_t *a, bus_size_t c)); - - void (*hbt_wr_1) __P((void *v, bus_space_handle_t h, - bus_size_t o, const u_int8_t *a, bus_size_t c)); - void (*hbt_wr_2) __P((void *v, bus_space_handle_t h, - bus_size_t o, const u_int16_t *a, bus_size_t c)); - void (*hbt_wr_4) __P((void *v, bus_space_handle_t h, - bus_size_t o, const u_int32_t *a, bus_size_t c)); - void (*hbt_wr_8) __P((void *v, bus_space_handle_t h, - bus_size_t o, const u_int64_t *a, bus_size_t c)); - - void (*hbt_rrr_2) __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int8_t *a, bus_size_t c)); - void (*hbt_rrr_4) __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int8_t *a, bus_size_t c)); - void (*hbt_rrr_8) __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int8_t *a, bus_size_t c)); - - void (*hbt_wrr_2) __P((void *v, bus_space_handle_t h, - bus_size_t o, const u_int8_t *a, bus_size_t c)); - void (*hbt_wrr_4) __P((void *v, bus_space_handle_t h, - bus_size_t o, const u_int8_t *a, bus_size_t c)); - void (*hbt_wrr_8) __P((void *v, bus_space_handle_t h, - bus_size_t o, const u_int8_t *a, bus_size_t c)); - - void (*hbt_sr_1) __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int8_t vv, bus_size_t c)); - void (*hbt_sr_2) __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int16_t vv, bus_size_t c)); - void (*hbt_sr_4) __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int32_t vv, bus_size_t c)); - void (*hbt_sr_8) __P((void *v, bus_space_handle_t h, - bus_size_t o, u_int64_t vv, bus_size_t c)); - - void (*hbt_cp_1) __P((void *v, bus_space_handle_t h1, bus_size_t o1, - bus_space_handle_t h2, bus_size_t o2, bus_size_t c)); - void (*hbt_cp_2) __P((void *v, bus_space_handle_t h1, bus_size_t o1, - bus_space_handle_t h2, bus_size_t o2, bus_size_t c)); - void (*hbt_cp_4) __P((void *v, bus_space_handle_t h1, bus_size_t o1, - bus_space_handle_t h2, bus_size_t o2, bus_size_t c)); - void (*hbt_cp_8) __P((void *v, bus_space_handle_t h1, bus_size_t o1, - bus_space_handle_t h2, bus_size_t o2, bus_size_t c)); + bus_addr_t *addrp, bus_space_handle_t *bshp); + void (*hbt_free)(void *, bus_space_handle_t, bus_size_t); + void (*hbt_barrier)(void *v, bus_space_handle_t h, + bus_size_t o, bus_size_t l, int op); + + u_int8_t (*hbt_r1)(void *, bus_space_handle_t, bus_size_t); + u_int16_t (*hbt_r2)(void *, bus_space_handle_t, bus_size_t); + u_int32_t (*hbt_r4)(void *, bus_space_handle_t, bus_size_t); + u_int64_t (*hbt_r8)(void *, bus_space_handle_t, bus_size_t); + + void (*hbt_w1)(void *, bus_space_handle_t, bus_size_t, u_int8_t); + void (*hbt_w2)(void *, bus_space_handle_t, bus_size_t, u_int16_t); + void (*hbt_w4)(void *, bus_space_handle_t, bus_size_t, u_int32_t); + void (*hbt_w8)(void *, bus_space_handle_t, bus_size_t, u_int64_t); + + void (*hbt_rm_1)(void *v, bus_space_handle_t h, + bus_size_t o, u_int8_t *a, bus_size_t c); + void (*hbt_rm_2)(void *v, bus_space_handle_t h, + bus_size_t o, u_int16_t *a, bus_size_t c); + void (*hbt_rm_4)(void *v, bus_space_handle_t h, + bus_size_t o, u_int32_t *a, bus_size_t c); + void (*hbt_rm_8)(void *v, bus_space_handle_t h, + bus_size_t o, u_int64_t *a, bus_size_t c); + + void (*hbt_wm_1)(void *v, bus_space_handle_t h, bus_size_t o, + const u_int8_t *a, bus_size_t c); + void (*hbt_wm_2)(void *v, bus_space_handle_t h, bus_size_t o, + const u_int16_t *a, bus_size_t c); + void (*hbt_wm_4)(void *v, bus_space_handle_t h, bus_size_t o, + const u_int32_t *a, bus_size_t c); + void (*hbt_wm_8)(void *v, bus_space_handle_t h, bus_size_t o, + const u_int64_t *a, bus_size_t c); + + void (*hbt_sm_1)(void *v, bus_space_handle_t h, bus_size_t o, + u_int8_t vv, bus_size_t c); + void (*hbt_sm_2)(void *v, bus_space_handle_t h, bus_size_t o, + u_int16_t vv, bus_size_t c); + void (*hbt_sm_4)(void *v, bus_space_handle_t h, bus_size_t o, + u_int32_t vv, bus_size_t c); + void (*hbt_sm_8)(void *v, bus_space_handle_t h, bus_size_t o, + u_int64_t vv, bus_size_t c); + + void (*hbt_rrm_2)(void *v, bus_space_handle_t h, + bus_size_t o, u_int8_t *a, bus_size_t c); + void (*hbt_rrm_4)(void *v, bus_space_handle_t h, + bus_size_t o, u_int8_t *a, bus_size_t c); + void (*hbt_rrm_8)(void *v, bus_space_handle_t h, + bus_size_t o, u_int8_t *a, bus_size_t c); + + void (*hbt_wrm_2)(void *v, bus_space_handle_t h, + bus_size_t o, const u_int8_t *a, bus_size_t c); + void (*hbt_wrm_4)(void *v, bus_space_handle_t h, + bus_size_t o, const u_int8_t *a, bus_size_t c); + void (*hbt_wrm_8)(void *v, bus_space_handle_t h, + bus_size_t o, const u_int8_t *a, bus_size_t c); + + void (*hbt_rr_1)(void *v, bus_space_handle_t h, + bus_size_t o, u_int8_t *a, bus_size_t c); + void (*hbt_rr_2)(void *v, bus_space_handle_t h, + bus_size_t o, u_int16_t *a, bus_size_t c); + void (*hbt_rr_4)(void *v, bus_space_handle_t h, + bus_size_t o, u_int32_t *a, bus_size_t c); + void (*hbt_rr_8)(void *v, bus_space_handle_t h, + bus_size_t o, u_int64_t *a, bus_size_t c); + + void (*hbt_wr_1)(void *v, bus_space_handle_t h, + bus_size_t o, const u_int8_t *a, bus_size_t c); + void (*hbt_wr_2)(void *v, bus_space_handle_t h, + bus_size_t o, const u_int16_t *a, bus_size_t c); + void (*hbt_wr_4)(void *v, bus_space_handle_t h, + bus_size_t o, const u_int32_t *a, bus_size_t c); + void (*hbt_wr_8)(void *v, bus_space_handle_t h, + bus_size_t o, const u_int64_t *a, bus_size_t c); + + void (*hbt_rrr_2)(void *v, bus_space_handle_t h, + bus_size_t o, u_int8_t *a, bus_size_t c); + void (*hbt_rrr_4)(void *v, bus_space_handle_t h, + bus_size_t o, u_int8_t *a, bus_size_t c); + void (*hbt_rrr_8)(void *v, bus_space_handle_t h, + bus_size_t o, u_int8_t *a, bus_size_t c); + + void (*hbt_wrr_2)(void *v, bus_space_handle_t h, + bus_size_t o, const u_int8_t *a, bus_size_t c); + void (*hbt_wrr_4)(void *v, bus_space_handle_t h, + bus_size_t o, const u_int8_t *a, bus_size_t c); + void (*hbt_wrr_8)(void *v, bus_space_handle_t h, + bus_size_t o, const u_int8_t *a, bus_size_t c); + + void (*hbt_sr_1)(void *v, bus_space_handle_t h, + bus_size_t o, u_int8_t vv, bus_size_t c); + void (*hbt_sr_2)(void *v, bus_space_handle_t h, + bus_size_t o, u_int16_t vv, bus_size_t c); + void (*hbt_sr_4)(void *v, bus_space_handle_t h, + bus_size_t o, u_int32_t vv, bus_size_t c); + void (*hbt_sr_8)(void *v, bus_space_handle_t h, + bus_size_t o, u_int64_t vv, bus_size_t c); + + void (*hbt_cp_1)(void *v, bus_space_handle_t h1, bus_size_t o1, + bus_space_handle_t h2, bus_size_t o2, bus_size_t c); + void (*hbt_cp_2)(void *v, bus_space_handle_t h1, bus_size_t o1, + bus_space_handle_t h2, bus_size_t o2, bus_size_t c); + void (*hbt_cp_4)(void *v, bus_space_handle_t h1, bus_size_t o1, + bus_space_handle_t h2, bus_size_t o2, bus_size_t c); + void (*hbt_cp_8)(void *v, bus_space_handle_t h1, bus_size_t o1, + bus_space_handle_t h2, bus_size_t o2, bus_size_t c); }; typedef const struct hppa_bus_space_tag *bus_space_tag_t; extern const struct hppa_bus_space_tag hppa_bustag; @@ -338,32 +338,32 @@ struct hppa_bus_dma_tag { /* * DMA mapping methods. */ - int (*_dmamap_create) __P((void *, bus_size_t, int, - bus_size_t, bus_size_t, int, bus_dmamap_t *)); - void (*_dmamap_destroy) __P((void *, bus_dmamap_t)); - int (*_dmamap_load) __P((void *, bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); - int (*_dmamap_load_mbuf) __P((void *, bus_dmamap_t, - struct mbuf *, int)); - int (*_dmamap_load_uio) __P((void *, bus_dmamap_t, - struct uio *, int)); - int (*_dmamap_load_raw) __P((void *, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int)); - void (*_dmamap_unload) __P((void *, bus_dmamap_t)); - void (*_dmamap_sync) __P((void *, bus_dmamap_t, bus_addr_t, - bus_size_t, int)); + int (*_dmamap_create)(void *, bus_size_t, int, + bus_size_t, bus_size_t, int, bus_dmamap_t *); + void (*_dmamap_destroy)(void *, bus_dmamap_t); + int (*_dmamap_load)(void *, bus_dmamap_t, void *, + bus_size_t, struct proc *, int); + int (*_dmamap_load_mbuf)(void *, bus_dmamap_t, + struct mbuf *, int); + int (*_dmamap_load_uio)(void *, bus_dmamap_t, + struct uio *, int); + int (*_dmamap_load_raw)(void *, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int); + void (*_dmamap_unload)(void *, bus_dmamap_t); + void (*_dmamap_sync)(void *, bus_dmamap_t, bus_addr_t, + bus_size_t, int); /* * DMA memory utility functions. */ - int (*_dmamem_alloc) __P((void *, bus_size_t, bus_size_t, - bus_size_t, bus_dma_segment_t *, int, int *, int)); - void (*_dmamem_free) __P((void *, bus_dma_segment_t *, int)); - int (*_dmamem_map) __P((void *, bus_dma_segment_t *, - int, size_t, caddr_t *, int)); - void (*_dmamem_unmap) __P((void *, caddr_t, size_t)); - paddr_t (*_dmamem_mmap) __P((void *, bus_dma_segment_t *, - int, off_t, int, int)); + int (*_dmamem_alloc)(void *, bus_size_t, bus_size_t, + bus_size_t, bus_dma_segment_t *, int, int *, int); + void (*_dmamem_free)(void *, bus_dma_segment_t *, int); + int (*_dmamem_map)(void *, bus_dma_segment_t *, + int, size_t, caddr_t *, int); + void (*_dmamem_unmap)(void *, caddr_t, size_t); + paddr_t (*_dmamem_mmap)(void *, bus_dma_segment_t *, + int, off_t, int, int); }; #define bus_dmamap_create(t, s, n, m, b, f, p) \ diff --git a/sys/arch/hppa/include/conf.h b/sys/arch/hppa/include/conf.h index 987e5db6e2a..c4ea83d576f 100644 --- a/sys/arch/hppa/include/conf.h +++ b/sys/arch/hppa/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.2 1998/10/30 19:16:33 mickey Exp $ */ +/* $OpenBSD: conf.h,v 1.3 2002/03/14 01:26:32 millert Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -38,8 +38,8 @@ struct tty; struct termios; cdev_decl(pdc); -int pdcparam __P((struct tty *, struct termios *)); -void pdcstart __P((struct tty *)); +int pdcparam(struct tty *, struct termios *); +void pdcstart(struct tty *); cdev_decl(fd); bdev_decl(fd); diff --git a/sys/arch/hppa/include/cpu.h b/sys/arch/hppa/include/cpu.h index 0717e74778a..3dae3c6d2aa 100644 --- a/sys/arch/hppa/include/cpu.h +++ b/sys/arch/hppa/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.27 2002/02/16 02:41:15 mickey Exp $ */ +/* $OpenBSD: cpu.h,v 1.28 2002/03/14 01:26:32 millert Exp $ */ /* * Copyright (c) 2000-2001 Michael Shalayeff @@ -125,20 +125,20 @@ extern int want_resched; #define DELAY(x) delay(x) -extern int (*cpu_desidhash) __P((void)); - -void delay __P((u_int us)); -void hppa_init __P((paddr_t start)); -void trap __P((int type, struct trapframe *frame)); -int spcopy __P((pa_space_t ssp, const void *src, - pa_space_t dsp, void *dst, size_t size)); -int spstrcpy __P((pa_space_t ssp, const void *src, - pa_space_t dsp, void *dst, size_t size, size_t *rsize)); -int copy_on_fault __P((void)); -void switch_trampoline __P((void)); -void switch_exit __P((struct proc *p)); -int cpu_dumpsize __P((void)); -int cpu_dump __P((void)); +extern int (*cpu_desidhash)(void); + +void delay(u_int us); +void hppa_init(paddr_t start); +void trap(int type, struct trapframe *frame); +int spcopy(pa_space_t ssp, const void *src, + pa_space_t dsp, void *dst, size_t size); +int spstrcpy(pa_space_t ssp, const void *src, + pa_space_t dsp, void *dst, size_t size, size_t *rsize); +int copy_on_fault(void); +void switch_trampoline(void); +void switch_exit(struct proc *p); +int cpu_dumpsize(void); +int cpu_dump(void); #endif /* diff --git a/sys/arch/hppa/include/cpufunc.h b/sys/arch/hppa/include/cpufunc.h index 560b2d34dad..b967a53614d 100644 --- a/sys/arch/hppa/include/cpufunc.h +++ b/sys/arch/hppa/include/cpufunc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpufunc.h,v 1.17 2000/05/15 17:22:40 mickey Exp $ */ +/* $OpenBSD: cpufunc.h,v 1.18 2002/03/14 01:26:32 millert Exp $ */ /* * Copyright (c) 1998,2000 Michael Shalayeff @@ -218,14 +218,14 @@ ledctl(int on, int off, int toggle) #endif #ifdef _KERNEL -void ficache __P((pa_space_t sp, vaddr_t va, vsize_t size)); -void fdcache __P((pa_space_t sp, vaddr_t va, vsize_t size)); -void pdcache __P((pa_space_t sp, vaddr_t va, vsize_t size)); -void fcacheall __P((void)); -void ptlball __P((void)); -int btlb_insert __P((pa_space_t space, vaddr_t va, paddr_t pa, - vsize_t *lenp, u_int prot)); -hppa_hpa_t cpu_gethpa __P((int n)); +void ficache(pa_space_t sp, vaddr_t va, vsize_t size); +void fdcache(pa_space_t sp, vaddr_t va, vsize_t size); +void pdcache(pa_space_t sp, vaddr_t va, vsize_t size); +void fcacheall(void); +void ptlball(void); +int btlb_insert(pa_space_t space, vaddr_t va, paddr_t pa, + vsize_t *lenp, u_int prot); +hppa_hpa_t cpu_gethpa(int n); #endif #endif /* _MACHINE_CPUFUNC_H_ */ diff --git a/sys/arch/hppa/include/db_machdep.h b/sys/arch/hppa/include/db_machdep.h index bf497044a8e..d4003aa932a 100644 --- a/sys/arch/hppa/include/db_machdep.h +++ b/sys/arch/hppa/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.6 2001/11/06 19:53:14 miod Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.7 2002/03/14 01:26:32 millert Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -93,7 +93,7 @@ static __inline int inst_trap_return(u_int ins) { #define db_clear_single_step(r) ((r)->tf_flags |= 0) #define db_set_single_step(r) ((r)->tf_flags |= 0) -int db_valid_breakpoint __P((db_addr_t)); -int kdb_trap __P((int, int, db_regs_t *)); +int db_valid_breakpoint(db_addr_t); +int kdb_trap(int, int, db_regs_t *); #endif /* _MACHINE_DB_MACHDEP_H_ */ diff --git a/sys/arch/hppa/include/iomod.h b/sys/arch/hppa/include/iomod.h index 88d599665ee..17cc3e47ed2 100644 --- a/sys/arch/hppa/include/iomod.h +++ b/sys/arch/hppa/include/iomod.h @@ -1,4 +1,4 @@ -/* $OpenBSD: iomod.h,v 1.9 2001/12/02 04:10:25 mickey Exp $ */ +/* $OpenBSD: iomod.h,v 1.10 2002/03/14 01:26:32 millert Exp $ */ /* * Copyright (c) 2000 Michael Shalayeff @@ -151,10 +151,10 @@ struct pagezero { /* [0x000] Initialize Vectors */ int ivec_special; /* must be zero */ - int (*ivec_mempf)__P((void)); /* powerfail recovery software */ - int (*ivec_toc)__P((void)); /* exec'd after Transfer Of Control */ + int (*ivec_mempf)(void); /* powerfail recovery software */ + int (*ivec_toc)(void); /* exec'd after Transfer Of Control */ u_int ivec_toclen; /* bytes of ivec_toc code */ - int (*ivec_rendz)__P((void)); /* exec'd after Rendezvous Signal */ + int (*ivec_rendz)(void); /* exec'd after Rendezvous Signal */ u_int ivec_mempflen; /* bytes of ivec_mempf code */ u_int ivec_resv[2]; /* (reserved) */ u_int ivec_mbz; /* must be zero */ @@ -212,7 +212,7 @@ struct pagezero { struct boot_err mem_be[8]; /* boot errors (see above) */ u_int mem_free; /* first free phys. memory location */ u_int mem_hpa; /* HPA of CPU */ - int (*mem_pdc)__P((void)); /* PDC entry point */ + int (*mem_pdc)(void); /* PDC entry point */ u_int mem_10msec; /* # of Interval Timer ticks in 10msec*/ /* [0x390] Initial Memory Module */ diff --git a/sys/arch/hppa/include/pdc.h b/sys/arch/hppa/include/pdc.h index 09ca3ec7dec..26487be741c 100644 --- a/sys/arch/hppa/include/pdc.h +++ b/sys/arch/hppa/include/pdc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pdc.h,v 1.18 2002/02/08 21:15:35 miod Exp $ */ +/* $OpenBSD: pdc.h,v 1.19 2002/03/14 01:26:32 millert Exp $ */ /* * Copyright (c) 1990 mt Xinu, Inc. All rights reserved. @@ -262,8 +262,8 @@ struct iomod; -typedef int (*pdcio_t) __P((int, int, ...)); -typedef int (*iodcio_t) __P((struct iomod *, int, ...)); +typedef int (*pdcio_t)(int, int, ...); +typedef int (*iodcio_t)(struct iomod *, int, ...); /* * Commonly used PDC calls and the structures they return. @@ -629,14 +629,14 @@ struct consdev; extern int kernelmapped; -void pdc_init __P((void)); -int pdc_call __P((iodcio_t, int, ...)); +void pdc_init(void); +int pdc_call(iodcio_t, int, ...); -void pdccnprobe __P((struct consdev *)); -void pdccninit __P((struct consdev *)); -int pdccngetc __P((dev_t)); -void pdccnputc __P((dev_t, int)); -void pdccnpollc __P((dev_t, int)); +void pdccnprobe(struct consdev *); +void pdccninit(struct consdev *); +int pdccngetc(dev_t); +void pdccnputc(dev_t, int); +void pdccnpollc(dev_t, int); #endif #endif /* !(_LOCORE) */ diff --git a/sys/arch/hppa/include/pmap.h b/sys/arch/hppa/include/pmap.h index b9924dbda60..872c71e20d0 100644 --- a/sys/arch/hppa/include/pmap.h +++ b/sys/arch/hppa/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.17 2002/02/21 06:12:31 mickey Exp $ */ +/* $OpenBSD: pmap.h,v 1.18 2002/03/14 01:26:32 millert Exp $ */ /* * Copyright (c) 1998,1999 Michael Shalayeff @@ -149,7 +149,7 @@ struct pv_page { #define KERNEL_DATA_PROT (TLB_AR_KRW | (KERNEL_ACCESS_ID << 1)) #ifdef _KERNEL -extern void gateway_page __P((void)); +extern void gateway_page(void); #define PMAP_STEAL_MEMORY /* we have some memory to steal */ @@ -194,7 +194,7 @@ pmap_prot(struct pmap *pmap, int prot) return (pmap == kernel_pmap? kern_prot: user_prot)[prot]; } -void pmap_bootstrap __P((vaddr_t *, vaddr_t *)); +void pmap_bootstrap(vaddr_t *, vaddr_t *); #endif /* _KERNEL */ #endif /* _MACHINE_PMAP_H_ */ diff --git a/sys/arch/hppa/isa/isa_machdep.h b/sys/arch/hppa/isa/isa_machdep.h index 77d81f39d0d..e87d4d776de 100644 --- a/sys/arch/hppa/isa/isa_machdep.h +++ b/sys/arch/hppa/isa/isa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.h,v 1.2 1999/05/05 02:36:54 todd Exp $ */ +/* $OpenBSD: isa_machdep.h,v 1.3 2002/03/14 01:26:32 millert Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -40,12 +40,12 @@ typedef struct hppa_isa_chipset *isa_chipset_tag_t; struct hppa_isa_chipset { void *ic_v; - void (*ic_attach_hook) __P((struct device *, struct device *, - struct isabus_attach_args *)); + void (*ic_attach_hook)(struct device *, struct device *, + struct isabus_attach_args *); void *(*ic_intr_establish) __P((void *, int, int, int, int (*)(void *), void *, char *)); - void (*ic_intr_disestablish) __P((void *, void *)); - int (*ic_intr_check) __P((void *, int, int)); + void (*ic_intr_disestablish)(void *, void *); + int (*ic_intr_check)(void *, int, int); }; /* diff --git a/sys/arch/hppa/spmath/cnv_float.h b/sys/arch/hppa/spmath/cnv_float.h index 0a8dc1ad84d..785da4c797a 100644 --- a/sys/arch/hppa/spmath/cnv_float.h +++ b/sys/arch/hppa/spmath/cnv_float.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cnv_float.h,v 1.5 2001/03/29 03:58:17 mickey Exp $ */ +/* $OpenBSD: cnv_float.h,v 1.6 2002/03/14 01:26:32 millert Exp $ */ /* * Copyright 1996 1995 by Open Software Foundation, Inc. @@ -414,20 +414,20 @@ return(NOEXCEPTION); \ } -int sgl_to_sgl_fcnvfx __P((sgl_floating_point *, sgl_floating_point *, unsigned int *)); -int sgl_to_dbl_fcnvfx __P((sgl_floating_point *, dbl_integer *, unsigned int *)); -int dbl_to_sgl_fcnvfx __P((dbl_floating_point *, int *, unsigned int *)); -int dbl_to_dbl_fcnvfx __P((dbl_floating_point *, dbl_integer *, unsigned int *)); +int sgl_to_sgl_fcnvfx(sgl_floating_point *, sgl_floating_point *, unsigned int *); +int sgl_to_dbl_fcnvfx(sgl_floating_point *, dbl_integer *, unsigned int *); +int dbl_to_sgl_fcnvfx(dbl_floating_point *, int *, unsigned int *); +int dbl_to_dbl_fcnvfx(dbl_floating_point *, dbl_integer *, unsigned int *); -int sgl_to_sgl_fcnvfxt __P((sgl_floating_point *, int *, unsigned int *)); -int sgl_to_dbl_fcnvfxt __P((sgl_floating_point *, dbl_integer *, unsigned int *)); -int dbl_to_sgl_fcnvfxt __P((dbl_floating_point *, int *, unsigned int *)); -int dbl_to_dbl_fcnvfxt __P((dbl_floating_point *, dbl_integer *, unsigned int *)); +int sgl_to_sgl_fcnvfxt(sgl_floating_point *, int *, unsigned int *); +int sgl_to_dbl_fcnvfxt(sgl_floating_point *, dbl_integer *, unsigned int *); +int dbl_to_sgl_fcnvfxt(dbl_floating_point *, int *, unsigned int *); +int dbl_to_dbl_fcnvfxt(dbl_floating_point *, dbl_integer *, unsigned int *); -int sgl_to_sgl_fcnvxf __P((int *, sgl_floating_point *, unsigned int *)); -int sgl_to_dbl_fcnvxf __P((int *, dbl_floating_point *, unsigned int *)); -int dbl_to_sgl_fcnvxf __P((dbl_integer *, sgl_floating_point *, unsigned int *)); -int dbl_to_dbl_fcnvxf __P((dbl_integer *, dbl_floating_point *, unsigned int *)); +int sgl_to_sgl_fcnvxf(int *, sgl_floating_point *, unsigned int *); +int sgl_to_dbl_fcnvxf(int *, dbl_floating_point *, unsigned int *); +int dbl_to_sgl_fcnvxf(dbl_integer *, sgl_floating_point *, unsigned int *); +int dbl_to_dbl_fcnvxf(dbl_integer *, dbl_floating_point *, unsigned int *); diff --git a/sys/arch/hppa/spmath/dbl_float.h b/sys/arch/hppa/spmath/dbl_float.h index c378a65eecd..ee30283eb53 100644 --- a/sys/arch/hppa/spmath/dbl_float.h +++ b/sys/arch/hppa/spmath/dbl_float.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dbl_float.h,v 1.5 2001/03/29 03:58:17 mickey Exp $ */ +/* $OpenBSD: dbl_float.h,v 1.6 2002/03/14 01:26:32 millert Exp $ */ /* * Copyright 1996 1995 by Open Software Foundation, Inc. @@ -552,17 +552,17 @@ } -int dbl_fadd __P((dbl_floating_point *, dbl_floating_point*, dbl_floating_point*, unsigned int *)); -int dbl_fcmp __P((dbl_floating_point *, dbl_floating_point*, unsigned int, unsigned int *)); -int dbl_fdiv __P((dbl_floating_point *, dbl_floating_point *, dbl_floating_point *, unsigned int *)); -int dbl_fmpy __P((dbl_floating_point *, dbl_floating_point *, dbl_floating_point*, unsigned int *)); -int dbl_frem __P((dbl_floating_point *, dbl_floating_point *, dbl_floating_point*, unsigned int *)); -int dbl_fsqrt __P((dbl_floating_point *, dbl_floating_point *, unsigned int *)); -int dbl_fsub __P((dbl_floating_point *, dbl_floating_point *, dbl_floating_point*, unsigned int *)); +int dbl_fadd(dbl_floating_point *, dbl_floating_point*, dbl_floating_point*, unsigned int *); +int dbl_fcmp(dbl_floating_point *, dbl_floating_point*, unsigned int, unsigned int *); +int dbl_fdiv(dbl_floating_point *, dbl_floating_point *, dbl_floating_point *, unsigned int *); +int dbl_fmpy(dbl_floating_point *, dbl_floating_point *, dbl_floating_point*, unsigned int *); +int dbl_frem(dbl_floating_point *, dbl_floating_point *, dbl_floating_point*, unsigned int *); +int dbl_fsqrt(dbl_floating_point *, dbl_floating_point *, unsigned int *); +int dbl_fsub(dbl_floating_point *, dbl_floating_point *, dbl_floating_point*, unsigned int *); -dbl_floating_point dbl_setoverflow __P((unsigned int)); +dbl_floating_point dbl_setoverflow(unsigned int); -int sgl_to_dbl_fcnvff __P((sgl_floating_point *, dbl_floating_point *, unsigned int *)); -int dbl_to_sgl_fcnvff __P((dbl_floating_point *, sgl_floating_point *, unsigned int *)); +int sgl_to_dbl_fcnvff(sgl_floating_point *, dbl_floating_point *, unsigned int *); +int dbl_to_sgl_fcnvff(dbl_floating_point *, sgl_floating_point *, unsigned int *); -int dbl_frnd __P((dbl_floating_point *, dbl_floating_point *, unsigned int *)); +int dbl_frnd(dbl_floating_point *, dbl_floating_point *, unsigned int *); diff --git a/sys/arch/hppa/spmath/md.h b/sys/arch/hppa/spmath/md.h index 14215032c4f..9e7624a2732 100644 --- a/sys/arch/hppa/spmath/md.h +++ b/sys/arch/hppa/spmath/md.h @@ -1,4 +1,4 @@ -/* $OpenBSD: md.h,v 1.4 2001/03/29 03:58:18 mickey Exp $ */ +/* $OpenBSD: md.h,v 1.5 2002/03/14 01:26:32 millert Exp $ */ /* * Copyright 1996 1995 by Open Software Foundation, Inc. @@ -86,21 +86,21 @@ struct md_state { resultlo; /* low word of result */ }; -void divsfm __P((int, int, struct mdsfu_register *)); -void divsfr __P((int, int, struct mdsfu_register *)); -void divsim __P((int, int, struct mdsfu_register *)); -void divsir __P((int, int, struct mdsfu_register *)); +void divsfm(int, int, struct mdsfu_register *); +void divsfr(int, int, struct mdsfu_register *); +void divsim(int, int, struct mdsfu_register *); +void divsir(int, int, struct mdsfu_register *); -void divu __P((int, int, int, struct mdsfu_register *)); -void divufr __P((unsigned int, unsigned int, struct mdsfu_register *)); -void divuir __P((unsigned int, unsigned int, struct mdsfu_register *)); +void divu(int, int, int, struct mdsfu_register *); +void divufr(unsigned int, unsigned int, struct mdsfu_register *); +void divuir(unsigned int, unsigned int, struct mdsfu_register *); -void mpyaccs __P((int, int, struct mdsfu_register *)); -void mpyaccu __P((unsigned int, unsigned int, struct mdsfu_register *)); -void mpys __P((int, int, struct mdsfu_register *)); -void mpyscv __P((int, int, struct mdsfu_register *)); -void mpyu __P((unsigned int, unsigned int, struct mdsfu_register *)); -void mpyucv __P((unsigned int, unsigned int, struct mdsfu_register *)); +void mpyaccs(int, int, struct mdsfu_register *); +void mpyaccu(unsigned int, unsigned int, struct mdsfu_register *); +void mpys(int, int, struct mdsfu_register *); +void mpyscv(int, int, struct mdsfu_register *); +void mpyu(unsigned int, unsigned int, struct mdsfu_register *); +void mpyucv(unsigned int, unsigned int, struct mdsfu_register *); -int impys __P((int *, int *, struct mdsfu_register *)); -int impyu __P((int *, int *, struct mdsfu_register *)); +int impys(int *, int *, struct mdsfu_register *); +int impyu(int *, int *, struct mdsfu_register *); diff --git a/sys/arch/hppa/spmath/quad_float.h b/sys/arch/hppa/spmath/quad_float.h index c441b8a3a71..d382958148f 100644 --- a/sys/arch/hppa/spmath/quad_float.h +++ b/sys/arch/hppa/spmath/quad_float.h @@ -1,4 +1,4 @@ -/* $OpenBSD: quad_float.h,v 1.5 2001/03/29 03:58:19 mickey Exp $ */ +/* $OpenBSD: quad_float.h,v 1.6 2002/03/14 01:26:32 millert Exp $ */ /* * Copyright 1996 1995 by Open Software Foundation, Inc. @@ -99,4 +99,4 @@ Qallp4(rightp4) = Qallp4(leftp4) XOR Qallp4(rightp4) \ Qallp4(leftp4) = Qallp4(leftp4) XOR Qallp4(rightp4) -int quad_frnd __P((quad_floating_point *, quad_floating_point *, unsigned int *)); +int quad_frnd(quad_floating_point *, quad_floating_point *, unsigned int *); diff --git a/sys/arch/hppa/spmath/sgl_float.h b/sys/arch/hppa/spmath/sgl_float.h index 5081f68f056..0ba5e639f9c 100644 --- a/sys/arch/hppa/spmath/sgl_float.h +++ b/sys/arch/hppa/spmath/sgl_float.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sgl_float.h,v 1.5 2001/03/29 03:58:19 mickey Exp $ */ +/* $OpenBSD: sgl_float.h,v 1.6 2002/03/14 01:26:32 millert Exp $ */ /* * Copyright 1996 1995 by Open Software Foundation, Inc. @@ -333,13 +333,13 @@ Sgl_setzero(opnd); \ } -sgl_floating_point sgl_setoverflow __P((unsigned int)); -int sgl_fadd __P((sgl_floating_point *, sgl_floating_point *, sgl_floating_point *, unsigned int *)); -int sgl_fcmp __P((sgl_floating_point *, sgl_floating_point *, unsigned int, unsigned int *)); -int sgl_fdiv __P((sgl_floating_point *, sgl_floating_point *, sgl_floating_point *, unsigned int *)); -int sgl_fmpy __P((sgl_floating_point *, sgl_floating_point *, sgl_floating_point *, unsigned int *)); -int sgl_frem __P((sgl_floating_point *, sgl_floating_point *, sgl_floating_point *, unsigned int *)); -int sgl_fsqrt __P((sgl_floating_point *, sgl_floating_point *, unsigned int *)); -int sgl_fsub __P((sgl_floating_point *, sgl_floating_point *, sgl_floating_point *, unsigned int *)); -int sgl_frnd __P((sgl_floating_point *, sgl_floating_point *, unsigned int *)); +sgl_floating_point sgl_setoverflow(unsigned int); +int sgl_fadd(sgl_floating_point *, sgl_floating_point *, sgl_floating_point *, unsigned int *); +int sgl_fcmp(sgl_floating_point *, sgl_floating_point *, unsigned int, unsigned int *); +int sgl_fdiv(sgl_floating_point *, sgl_floating_point *, sgl_floating_point *, unsigned int *); +int sgl_fmpy(sgl_floating_point *, sgl_floating_point *, sgl_floating_point *, unsigned int *); +int sgl_frem(sgl_floating_point *, sgl_floating_point *, sgl_floating_point *, unsigned int *); +int sgl_fsqrt(sgl_floating_point *, sgl_floating_point *, unsigned int *); +int sgl_fsub(sgl_floating_point *, sgl_floating_point *, sgl_floating_point *, unsigned int *); +int sgl_frnd(sgl_floating_point *, sgl_floating_point *, unsigned int *); diff --git a/sys/arch/hppa/stand/libsa/cmd_hppa.c b/sys/arch/hppa/stand/libsa/cmd_hppa.c index 2e45ca0bbba..6ddee6e3f1f 100644 --- a/sys/arch/hppa/stand/libsa/cmd_hppa.c +++ b/sys/arch/hppa/stand/libsa/cmd_hppa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd_hppa.c,v 1.2 2002/03/06 23:09:44 miod Exp $ */ +/* $OpenBSD: cmd_hppa.c,v 1.3 2002/03/14 01:26:32 millert Exp $ */ /* * Copyright (c) 2002 Miodrag Vallat @@ -90,19 +90,19 @@ struct consoledev graphics[MAX_GRAPHICS]; int walked; -void bus_walk __P((int)); -void register_device __P((struct consoledev *, int, - struct device_path *, struct iodc_data *, int, int)); +void bus_walk(int); +void register_device(struct consoledev *, int, + struct device_path *, struct iodc_data *, int, int); -int Xconsole __P((void)); -void print_console __P((void)); -int set_graphics __P((struct device_path *, int, char *)); -int set_serial __P((struct device_path *, int, char *)); -int set_console __P((struct device_path *)); +int Xconsole(void); +void print_console(void); +int set_graphics(struct device_path *, int, char *); +int set_serial(struct device_path *, int, char *); +int set_console(struct device_path *); -int Xkeyboard __P((void)); -void print_keyboard __P((void)); -int set_keyboard __P((struct device_path *)); +int Xkeyboard(void); +void print_keyboard(void); +int set_keyboard(struct device_path *); struct cmd_table cmd_machine[] = { { "console", CMDT_CMD, Xconsole }, diff --git a/sys/arch/hppa/stand/libsa/dev_hppa.h b/sys/arch/hppa/stand/libsa/dev_hppa.h index f4c6e75cb40..73ccf9352cd 100644 --- a/sys/arch/hppa/stand/libsa/dev_hppa.h +++ b/sys/arch/hppa/stand/libsa/dev_hppa.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dev_hppa.h,v 1.3 1999/04/20 20:01:01 mickey Exp $ */ +/* $OpenBSD: dev_hppa.h,v 1.4 2002/03/14 01:26:32 millert Exp $ */ #define IOPGSHIFT 11 @@ -39,5 +39,5 @@ extern pdcio_t pdc; extern int pdcbuf[]; /* PDC returns, pdc.c */ extern struct pz_device ctdev; /* cartridge tape (boot) device path */ -int iodc_rw __P((char *, u_int, u_int, int func, struct pz_device *)); +int iodc_rw(char *, u_int, u_int, int func, struct pz_device *); diff --git a/sys/arch/hppa/stand/libsa/exec_hppa.c b/sys/arch/hppa/stand/libsa/exec_hppa.c index bd79e411352..9b28dad76bf 100644 --- a/sys/arch/hppa/stand/libsa/exec_hppa.c +++ b/sys/arch/hppa/stand/libsa/exec_hppa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_hppa.c,v 1.7 1999/05/06 02:13:15 mickey Exp $ */ +/* $OpenBSD: exec_hppa.c,v 1.8 2002/03/14 01:26:32 millert Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -45,7 +45,7 @@ #include <machine/pdc.h> #include "dev_hppa.h" -typedef void (*startfuncp) __P((int, int, int, int, int, int, caddr_t)) +typedef void (*startfuncp)(int, int, int, int, int, int, caddr_t) __attribute__ ((noreturn)); void diff --git a/sys/arch/hppa/stand/libsa/libsa.h b/sys/arch/hppa/stand/libsa/libsa.h index a08bbd0beb6..158c7a5d9a4 100644 --- a/sys/arch/hppa/stand/libsa/libsa.h +++ b/sys/arch/hppa/stand/libsa/libsa.h @@ -1,4 +1,4 @@ -/* $OpenBSD: libsa.h,v 1.8 2002/03/02 09:36:43 miod Exp $ */ +/* $OpenBSD: libsa.h,v 1.9 2002/03/14 01:26:32 millert Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -40,47 +40,47 @@ extern dev_t bootdev; -void pdc_init __P((void)); +void pdc_init(void); struct pz_device; -struct pz_device *pdc_findev __P((int, int)); +struct pz_device *pdc_findev(int, int); -int iodcstrategy __P((void *, int, daddr_t, size_t, void *, size_t *)); +int iodcstrategy(void *, int, daddr_t, size_t, void *, size_t *); -int ctopen __P((struct open_file *, ...)); -int ctclose __P((struct open_file *)); +int ctopen(struct open_file *, ...); +int ctclose(struct open_file *); -int dkopen __P((struct open_file *, ...)); -int dkclose __P((struct open_file *)); +int dkopen(struct open_file *, ...); +int dkclose(struct open_file *); -int lfopen __P((struct open_file *, ...)); -int lfstrategy __P((void *, int, daddr_t, size_t, void *, size_t *)); -int lfclose __P((struct open_file *)); +int lfopen(struct open_file *, ...); +int lfstrategy(void *, int, daddr_t, size_t, void *, size_t *); +int lfclose(struct open_file *); -void ite_probe __P((struct consdev *)); -void ite_init __P((struct consdev *)); -int ite_getc __P((dev_t)); -void ite_putc __P((dev_t, int)); -void ite_pollc __P((dev_t, int)); +void ite_probe(struct consdev *); +void ite_init(struct consdev *); +int ite_getc(dev_t); +void ite_putc(dev_t, int); +void ite_pollc(dev_t, int); -void machdep __P((void)); -void devboot __P((dev_t, char *)); -void fcacheall __P((void)); +void machdep(void); +void devboot(dev_t, char *); +void fcacheall(void); -int lif_open __P((char *path, struct open_file *f)); -int lif_close __P((struct open_file *f)); -int lif_read __P((struct open_file *f, void *buf, - size_t size, size_t *resid)); -int lif_write __P((struct open_file *f, void *buf, - size_t size, size_t *resid)); -off_t lif_seek __P((struct open_file *f, off_t offset, int where)); -int lif_stat __P((struct open_file *f, struct stat *sb)); -int lif_readdir __P((struct open_file *f, char *name)); +int lif_open(char *path, struct open_file *f); +int lif_close(struct open_file *f); +int lif_read(struct open_file *f, void *buf, + size_t size, size_t *resid); +int lif_write(struct open_file *f, void *buf, + size_t size, size_t *resid); +off_t lif_seek(struct open_file *f, off_t offset, int where); +int lif_stat(struct open_file *f, struct stat *sb); +int lif_readdir(struct open_file *f, char *name); union x_header; struct x_param; -int som_probe __P((int, union x_header *)); -int som_load __P((int, struct x_param *)); -int som_ldsym __P((int, struct x_param *)); +int som_probe(int, union x_header *); +int som_load(int, struct x_param *); +int som_ldsym(int, struct x_param *); extern int debug; diff --git a/sys/arch/hppa/stand/mkboot/mkboot.c b/sys/arch/hppa/stand/mkboot/mkboot.c index cfa12d5a0a0..26cb8cb7ef4 100644 --- a/sys/arch/hppa/stand/mkboot/mkboot.c +++ b/sys/arch/hppa/stand/mkboot/mkboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkboot.c,v 1.9 2001/05/17 00:57:55 pvalchev Exp $ */ +/* $OpenBSD: mkboot.c,v 1.10 2002/03/14 01:26:32 millert Exp $ */ /* * Copyright (c) 1990, 1993 @@ -43,7 +43,7 @@ static char copyright[] = #endif /* not lint */ #ifndef lint -static char rcsid[] = "$OpenBSD: mkboot.c,v 1.9 2001/05/17 00:57:55 pvalchev Exp $"; +static char rcsid[] = "$OpenBSD: mkboot.c,v 1.10 2002/03/14 01:26:32 millert Exp $"; #endif /* not lint */ #endif @@ -71,11 +71,11 @@ static char rcsid[] = "$OpenBSD: mkboot.c,v 1.9 2001/05/17 00:57:55 pvalchev Exp #include <stdio.h> #include <ctype.h> -int putfile __P((char *, int)); -void __dead usage __P((void)); -void bcddate __P((char *, char *)); -char *lifname __P((char *)); -int cksum __P((int, int *, int)); +int putfile(char *, int); +void __dead usage(void); +void bcddate(char *, char *); +char *lifname(char *); +int cksum(int, int *, int); char *to_file; int loadpoint, verbose; diff --git a/sys/arch/i386/eisa/eisa_machdep.c b/sys/arch/i386/eisa/eisa_machdep.c index eae0803e813..15e1bf6bdd1 100644 --- a/sys/arch/i386/eisa/eisa_machdep.c +++ b/sys/arch/i386/eisa/eisa_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eisa_machdep.c,v 1.4 2001/07/04 08:57:45 niklas Exp $ */ +/* $OpenBSD: eisa_machdep.c,v 1.5 2002/03/14 01:26:32 millert Exp $ */ /* $NetBSD: eisa_machdep.c,v 1.6 1997/06/06 23:12:52 thorpej Exp $ */ /*- @@ -167,7 +167,7 @@ void * eisa_intr_establish(ec, ih, type, level, func, arg, what) eisa_chipset_tag_t ec; eisa_intr_handle_t ih; - int type, level, (*func) __P((void *)); + int type, level, (*func)(void *); void *arg; char *what; { diff --git a/sys/arch/i386/eisa/eisa_machdep.h b/sys/arch/i386/eisa/eisa_machdep.h index 2ac1f5810c3..b1746e33ed8 100644 --- a/sys/arch/i386/eisa/eisa_machdep.h +++ b/sys/arch/i386/eisa/eisa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: eisa_machdep.h,v 1.3 1998/01/20 18:40:13 niklas Exp $ */ +/* $OpenBSD: eisa_machdep.h,v 1.4 2002/03/14 01:26:32 millert Exp $ */ /* $NetBSD: eisa_machdep.h,v 1.4 1997/06/06 23:12:52 thorpej Exp $ */ /* @@ -54,13 +54,13 @@ typedef int eisa_intr_handle_t; /* * Functions provided to machine-independent EISA code. */ -void eisa_attach_hook __P((struct device *, struct device *, - struct eisabus_attach_args *)); -int eisa_maxslots __P((eisa_chipset_tag_t)); -int eisa_intr_map __P((eisa_chipset_tag_t, u_int, - eisa_intr_handle_t *)); -const char *eisa_intr_string __P((eisa_chipset_tag_t, eisa_intr_handle_t)); +void eisa_attach_hook(struct device *, struct device *, + struct eisabus_attach_args *); +int eisa_maxslots(eisa_chipset_tag_t); +int eisa_intr_map(eisa_chipset_tag_t, u_int, + eisa_intr_handle_t *); +const char *eisa_intr_string(eisa_chipset_tag_t, eisa_intr_handle_t); void *eisa_intr_establish __P((eisa_chipset_tag_t, eisa_intr_handle_t, int, int, int (*)(void *), void *, char *)); -void eisa_intr_disestablish __P((eisa_chipset_tag_t, void *)); +void eisa_intr_disestablish(eisa_chipset_tag_t, void *); diff --git a/sys/arch/i386/i386/apm.c b/sys/arch/i386/i386/apm.c index 32b81af91ae..236b226745e 100644 --- a/sys/arch/i386/i386/apm.c +++ b/sys/arch/i386/i386/apm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apm.c,v 1.51 2002/01/16 20:50:16 miod Exp $ */ +/* $OpenBSD: apm.c,v 1.52 2002/03/14 01:26:32 millert Exp $ */ /*- * Copyright (c) 1998-2001 Michael Shalayeff. All rights reserved. @@ -94,15 +94,15 @@ struct apm_softc { #define SCFLAG_OWRITE 0x0000002 #define SCFLAG_OPEN (SCFLAG_OREAD|SCFLAG_OWRITE) -int apmprobe __P((struct device *, void *, void *)); -void apmattach __P((struct device *, struct device *, void *)); +int apmprobe(struct device *, void *, void *); +void apmattach(struct device *, struct device *, void *); struct cfattach apm_ca = { sizeof(struct apm_softc), apmprobe, apmattach }; -void filt_apmrdetach __P((struct knote *kn)); -int filt_apmread __P((struct knote *kn, long hint)); +void filt_apmrdetach(struct knote *kn); +int filt_apmread(struct knote *kn, long hint); struct filterops apmread_filtops = { 1, NULL, filt_apmrdetach, filt_apmread}; @@ -160,25 +160,25 @@ struct apmregs { u_int32_t dx; }; -int apmcall __P((u_int, u_int, struct apmregs *)); -void apm_power_print __P((struct apm_softc *, struct apmregs *)); -int apm_handle_event __P((struct apm_softc *, struct apmregs *)); -void apm_set_ver __P((struct apm_softc *)); -int apm_periodic_check __P((struct apm_softc *)); -void apm_thread_create __P((void *v)); -void apm_thread __P((void *)); -void apm_disconnect __P((struct apm_softc *)); -void apm_perror __P((const char *, struct apmregs *)); -void apm_powmgt_enable __P((int onoff)); -void apm_powmgt_engage __P((int onoff, u_int devid)); -/* void apm_devpowmgt_enable __P((int onoff, u_int devid)); */ -int apm_record_event __P((struct apm_softc *sc, u_int type)); -const char *apm_err_translate __P((int code)); +int apmcall(u_int, u_int, struct apmregs *); +void apm_power_print(struct apm_softc *, struct apmregs *); +int apm_handle_event(struct apm_softc *, struct apmregs *); +void apm_set_ver(struct apm_softc *); +int apm_periodic_check(struct apm_softc *); +void apm_thread_create(void *v); +void apm_thread(void *); +void apm_disconnect(struct apm_softc *); +void apm_perror(const char *, struct apmregs *); +void apm_powmgt_enable(int onoff); +void apm_powmgt_engage(int onoff, u_int devid); +/* void apm_devpowmgt_enable(int onoff, u_int devid); */ +int apm_record_event(struct apm_softc *sc, u_int type); +const char *apm_err_translate(int code); #define apm_get_powstat(r) apmcall(APM_POWER_STATUS, APM_DEV_ALLDEVS, r) -void apm_standby __P((void)); -void apm_suspend __P((void)); -void apm_resume __P((struct apm_softc *, struct apmregs *)); +void apm_standby(void); +void apm_suspend(void); +void apm_resume(struct apm_softc *, struct apmregs *); static int __inline apm_get_event(struct apmregs *r) diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c index 5f51e92398f..db2839eb7e8 100644 --- a/sys/arch/i386/i386/autoconf.c +++ b/sys/arch/i386/i386/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.42 2002/01/09 23:08:34 nordin Exp $ */ +/* $OpenBSD: autoconf.c,v 1.43 2002/03/14 01:26:32 millert Exp $ */ /* $NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $ */ /*- @@ -65,13 +65,13 @@ #include <dev/cons.h> -int findblkmajor __P((struct device *dv)); -char *findblkname __P((int)); +int findblkmajor(struct device *dv); +char *findblkname(int); -void rootconf __P((void)); -void swapconf __P((void)); -void setroot __P((void)); -void diskconf __P((void)); +void rootconf(void); +void swapconf(void); +void setroot(void); +void diskconf(void); /* * The following several variables are related to diff --git a/sys/arch/i386/i386/bios.c b/sys/arch/i386/i386/bios.c index 59516efacc8..14c711811ae 100644 --- a/sys/arch/i386/i386/bios.c +++ b/sys/arch/i386/i386/bios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bios.c,v 1.47 2001/11/06 19:53:14 miod Exp $ */ +/* $OpenBSD: bios.c,v 1.48 2002/03/14 01:26:32 millert Exp $ */ /* * Copyright (c) 1997-2001 Michael Shalayeff @@ -69,9 +69,9 @@ struct bios_softc { struct device sc_dev; }; -int biosprobe __P((struct device *, void *, void *)); -void biosattach __P((struct device *, struct device *, void *)); -int bios_print __P((void *, const char *)); +int biosprobe(struct device *, void *, void *); +void biosattach(struct device *, struct device *, void *); +int bios_print(void *, const char *); struct cfattach bios_ca = { sizeof(struct bios_softc), biosprobe, biosattach @@ -94,7 +94,7 @@ bios_memmap_t *bios_memmap; u_int32_t bios_cksumlen; struct bios32_entry bios32_entry; -bios_diskinfo_t *bios_getdiskinfo __P((dev_t)); +bios_diskinfo_t *bios_getdiskinfo(dev_t); int biosprobe(parent, match, aux) @@ -370,7 +370,7 @@ bios32_service(service, e, ei) bios32_entry_info_t ei; { extern union descriptor *dynamic_gdt; - extern int gdt_get_slot __P((void)); + extern int gdt_get_slot(void); u_long pa, endpa; vaddr_t va, sva; diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index cf31d323725..2ee931f3b8f 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.87 2002/01/23 04:48:02 ericj Exp $ */ +/* $OpenBSD: conf.c,v 1.88 2002/03/14 01:26:32 millert Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -485,8 +485,8 @@ blktochr(dev) * disk driver name -> bdev major number table, which follows. * Note: floppies are not included as those are differentiated by the BIOS. */ -int findblkmajor __P((struct device *dv)); -dev_t dev_rawpart __P((struct device *)); /* XXX */ +int findblkmajor(struct device *dv); +dev_t dev_rawpart(struct device *); /* XXX */ dev_t dev_rawpart(dv) diff --git a/sys/arch/i386/i386/db_disasm.c b/sys/arch/i386/i386/db_disasm.c index 43e36e23929..1adc5cb1f3f 100644 --- a/sys/arch/i386/i386/db_disasm.c +++ b/sys/arch/i386/i386/db_disasm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_disasm.c,v 1.6 2001/07/04 08:57:46 niklas Exp $ */ +/* $OpenBSD: db_disasm.c,v 1.7 2002/03/14 01:26:32 millert Exp $ */ /* $NetBSD: db_disasm.c,v 1.11 1996/05/03 19:41:58 christos Exp $ */ /* @@ -858,9 +858,9 @@ int db_lengths[] = { } while (0) -db_addr_t db_read_address __P((db_addr_t, int, int, struct i_addr *)); -void db_print_address __P((char *, int, struct i_addr *)); -db_addr_t db_disasm_esc __P((db_addr_t, int, int, int, char *)); +db_addr_t db_read_address(db_addr_t, int, int, struct i_addr *); +void db_print_address(char *, int, struct i_addr *); +db_addr_t db_disasm_esc(db_addr_t, int, int, int, char *); /* * Read address at location and return updated location. diff --git a/sys/arch/i386/i386/db_interface.c b/sys/arch/i386/i386/db_interface.c index a88160028a1..edaa3d6fd42 100644 --- a/sys/arch/i386/i386/db_interface.c +++ b/sys/arch/i386/i386/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.10 2002/02/18 23:26:18 mickey Exp $ */ +/* $OpenBSD: db_interface.c,v 1.11 2002/03/14 01:26:32 millert Exp $ */ /* $NetBSD: db_interface.c,v 1.22 1996/05/03 19:42:00 christos Exp $ */ /* @@ -56,7 +56,7 @@ extern int trap_types; int db_active = 0; -void kdbprinttrap __P((int, int)); +void kdbprinttrap(int, int); /* * Print trap reason. diff --git a/sys/arch/i386/i386/db_trace.c b/sys/arch/i386/i386/db_trace.c index d841bec0513..7113b111aa1 100644 --- a/sys/arch/i386/i386/db_trace.c +++ b/sys/arch/i386/i386/db_trace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_trace.c,v 1.4 1997/03/21 02:10:42 niklas Exp $ */ +/* $OpenBSD: db_trace.c,v 1.5 2002/03/14 01:26:32 millert Exp $ */ /* $NetBSD: db_trace.c,v 1.18 1996/05/03 19:42:01 christos Exp $ */ /* @@ -81,9 +81,9 @@ db_addr_t db_syscall_symbol_value = 0; db_addr_t db_kdintr_symbol_value = 0; boolean_t db_trace_symbols_found = FALSE; -void db_find_trace_symbols __P((void)); -int db_numargs __P((struct i386_frame *)); -void db_nextframe __P((struct i386_frame **, db_addr_t *, int *, int)); +void db_find_trace_symbols(void); +int db_numargs(struct i386_frame *); +void db_nextframe(struct i386_frame **, db_addr_t *, int *, int); void db_find_trace_symbols() diff --git a/sys/arch/i386/i386/disksubr.c b/sys/arch/i386/i386/disksubr.c index 50ab3bbdf7b..cf51d7435a4 100644 --- a/sys/arch/i386/i386/disksubr.c +++ b/sys/arch/i386/i386/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.41 2002/02/19 02:46:40 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.42 2002/03/14 01:26:32 millert Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -74,7 +74,7 @@ dk_establish(dk, dev) char * readdisklabel(dev, strat, lp, osdep, spoofonly) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); register struct disklabel *lp; struct cpu_disklabel *osdep; int spoofonly; @@ -397,7 +397,7 @@ setdisklabel(olp, nlp, openmask, osdep) int writedisklabel(dev, strat, lp, osdep) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); register struct disklabel *lp; struct cpu_disklabel *osdep; { diff --git a/sys/arch/i386/i386/dkcsum.c b/sys/arch/i386/i386/dkcsum.c index 4f97fe5e662..24f4af430b1 100644 --- a/sys/arch/i386/i386/dkcsum.c +++ b/sys/arch/i386/i386/dkcsum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dkcsum.c,v 1.9 1999/09/12 19:44:04 weingart Exp $ */ +/* $OpenBSD: dkcsum.c,v 1.10 2002/03/14 01:26:32 millert Exp $ */ /*- * Copyright (c) 1997 Niklas Hallqvist. All rights reserved. @@ -51,7 +51,7 @@ #define b_cylin b_resid -dev_t dev_rawpart __P((struct device *)); /* XXX */ +dev_t dev_rawpart(struct device *); /* XXX */ extern u_int32_t bios_cksumlen; extern bios_diskinfo_t *bios_diskinfo; diff --git a/sys/arch/i386/i386/gdt.c b/sys/arch/i386/i386/gdt.c index e40401e4e6b..0cecf82c3e2 100644 --- a/sys/arch/i386/i386/gdt.c +++ b/sys/arch/i386/i386/gdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gdt.c,v 1.18 2002/01/09 23:08:34 nordin Exp $ */ +/* $OpenBSD: gdt.c,v 1.19 2002/03/14 01:26:32 millert Exp $ */ /* $NetBSD: gdt.c,v 1.8 1996/05/03 19:42:06 christos Exp $ */ /*- @@ -59,13 +59,13 @@ int gdt_flags; #define GDT_LOCKED 0x1 #define GDT_WANTED 0x2 -static __inline void gdt_lock __P((void)); -static __inline void gdt_unlock __P((void)); -void gdt_compact __P((void)); -void gdt_grow __P((void)); -void gdt_shrink __P((void)); -int gdt_get_slot __P((void)); -void gdt_put_slot __P((int)); +static __inline void gdt_lock(void); +static __inline void gdt_unlock(void); +void gdt_compact(void); +void gdt_grow(void); +void gdt_shrink(void); +int gdt_get_slot(void); +void gdt_put_slot(int); /* * Lock and unlock the GDT, to avoid races in case gdt_{ge,pu}t_slot() sleep diff --git a/sys/arch/i386/i386/i686_mem.c b/sys/arch/i386/i386/i686_mem.c index 96ce9ce5205..be862ff0e90 100644 --- a/sys/arch/i386/i386/i686_mem.c +++ b/sys/arch/i386/i386/i686_mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i686_mem.c,v 1.3 1999/11/24 01:43:32 deraadt Exp $ */ +/* $OpenBSD: i686_mem.c,v 1.4 2002/03/14 01:26:32 millert Exp $ */ /*- * Copyright (c) 1999 Michael Smith <msmith@freebsd.org> * All rights reserved. @@ -60,11 +60,11 @@ char *mem_owner_bios = "BIOS"; #define mrcopyflags(curr, new) (((curr) & ~MDF_ATTRMASK) | ((new) & MDF_ATTRMASK)) -void i686_mrinit __P((struct mem_range_softc *sc)); -int i686_mrset __P((struct mem_range_softc *sc, +void i686_mrinit(struct mem_range_softc *sc); +int i686_mrset(struct mem_range_softc *sc, struct mem_range_desc *mrd, - int *arg)); -void i686_mrAPinit __P((struct mem_range_softc *sc)); + int *arg); +void i686_mrAPinit(struct mem_range_softc *sc); struct mem_range_ops i686_mrops = { i686_mrinit, @@ -75,20 +75,20 @@ struct mem_range_ops i686_mrops = { /* XXX for AP startup hook */ u_int64_t mtrrcap, mtrrdef; -struct mem_range_desc *mem_range_match __P((struct mem_range_softc *sc, - struct mem_range_desc *mrd)); -void i686_mrfetch __P((struct mem_range_softc *sc)); -int i686_mtrrtype __P((int flags)); -void i686_mrstore __P((struct mem_range_softc *sc)); -void i686_mrstoreone __P((void *arg)); -struct mem_range_desc *i686_mtrrfixsearch __P((struct mem_range_softc *sc, - u_int64_t addr)); -int i686_mrsetlow __P((struct mem_range_softc *sc, +struct mem_range_desc *mem_range_match(struct mem_range_softc *sc, + struct mem_range_desc *mrd); +void i686_mrfetch(struct mem_range_softc *sc); +int i686_mtrrtype(int flags); +void i686_mrstore(struct mem_range_softc *sc); +void i686_mrstoreone(void *arg); +struct mem_range_desc *i686_mtrrfixsearch(struct mem_range_softc *sc, + u_int64_t addr); +int i686_mrsetlow(struct mem_range_softc *sc, struct mem_range_desc *mrd, - int *arg)); -int i686_mrsetvariable __P((struct mem_range_softc *sc, + int *arg); +int i686_mrsetvariable(struct mem_range_softc *sc, struct mem_range_desc *mrd, - int *arg)); + int *arg); /* i686 MTRR type to memory range type conversion */ int i686_mtrrtomrt[] = { diff --git a/sys/arch/i386/i386/k6_mem.c b/sys/arch/i386/i386/k6_mem.c index d16ee55eeaf..9266bd30308 100644 --- a/sys/arch/i386/i386/k6_mem.c +++ b/sys/arch/i386/i386/k6_mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: k6_mem.c,v 1.4 2000/03/22 00:02:12 deraadt Exp $ */ +/* $OpenBSD: k6_mem.c,v 1.5 2002/03/14 01:26:32 millert Exp $ */ /*- * Copyright (c) 1999 Brian Fundakowski Feldman * All rights reserved. @@ -67,9 +67,9 @@ #define k6_reg_make(addr, mask, wc, uc) \ ((addr) | ((mask) << 2) | ((wc) << 1) | uc) -void k6_mrinit __P((struct mem_range_softc *sc)); -int k6_mrset __P((struct mem_range_softc *, struct mem_range_desc *, int *)); -__inline int k6_mrmake __P((struct mem_range_desc *, u_int32_t *)); +void k6_mrinit(struct mem_range_softc *sc); +int k6_mrset(struct mem_range_softc *, struct mem_range_desc *, int *); +__inline int k6_mrmake(struct mem_range_desc *, u_int32_t *); struct mem_range_ops k6_mrops = { k6_mrinit, diff --git a/sys/arch/i386/i386/linux_machdep.c b/sys/arch/i386/i386/linux_machdep.c index 57dd6222d88..b0313c0914c 100644 --- a/sys/arch/i386/i386/linux_machdep.c +++ b/sys/arch/i386/i386/linux_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: linux_machdep.c,v 1.20 2002/02/13 20:43:42 jasoni Exp $ */ +/* $OpenBSD: linux_machdep.c,v 1.21 2002/03/14 01:26:32 millert Exp $ */ /* $NetBSD: linux_machdep.c,v 1.29 1996/05/03 19:42:11 christos Exp $ */ /* @@ -80,10 +80,10 @@ #ifdef USER_LDT #include <machine/cpu.h> -int linux_read_ldt __P((struct proc *, struct linux_sys_modify_ldt_args *, - register_t *)); -int linux_write_ldt __P((struct proc *, struct linux_sys_modify_ldt_args *, - register_t *)); +int linux_read_ldt(struct proc *, struct linux_sys_modify_ldt_args *, + register_t *); +int linux_write_ldt(struct proc *, struct linux_sys_modify_ldt_args *, + register_t *); #endif /* @@ -454,7 +454,7 @@ linux_machdepioctl(p, v, retval) struct filedesc *fdp; struct file *fp; int fd; - int (*ioctlf) __P((struct file *, u_long, caddr_t, struct proc *)); + int (*ioctlf)(struct file *, u_long, caddr_t, struct proc *); struct ioctl_pt pt; fd = SCARG(uap, fd); diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 9773b403d34..b035da2e2da 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.197 2002/02/17 22:59:52 maja Exp $ */ +/* $OpenBSD: machdep.c,v 1.198 2002/03/14 01:26:32 millert Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -270,18 +270,18 @@ struct extent *ioport_ex; struct extent *iomem_ex; static int ioport_malloc_safe; -caddr_t allocsys __P((caddr_t)); -void setup_buffers __P((vm_offset_t *)); -void dumpsys __P((void)); -int cpu_dump __P((void)); -void identifycpu __P((void)); -void init386 __P((vm_offset_t)); -void consinit __P((void)); +caddr_t allocsys(caddr_t); +void setup_buffers(vm_offset_t *); +void dumpsys(void); +int cpu_dump(void); +void identifycpu(void); +void init386(vm_offset_t); +void consinit(void); -int bus_mem_add_mapping __P((bus_addr_t, bus_size_t, - int, bus_space_handle_t *)); -int _bus_dmamap_load_buffer __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int, paddr_t *, int *, int)); +int bus_mem_add_mapping(bus_addr_t, bus_size_t, + int, bus_space_handle_t *); +int _bus_dmamap_load_buffer(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int, paddr_t *, int *, int); #ifdef KGDB #ifndef KGDB_DEVNAME @@ -306,7 +306,7 @@ int comkgdbrate = KGDBRATE; #endif int comkgdbmode = KGDBMODE; #endif /* NCOM || NPCCOM */ -void kgdb_port_init __P((void)); +void kgdb_port_init(void); #endif /* KGDB */ #ifdef APERTURE @@ -317,12 +317,12 @@ int allowaperture = 0; #endif #endif -void winchip_cpu_setup __P((const char *, int, int)); -void cyrix3_cpu_setup __P((const char *, int, int)); -void cyrix6x86_cpu_setup __P((const char *, int, int)); -void intel586_cpu_setup __P((const char *, int, int)); -void intel686_cpu_setup __P((const char *, int, int)); -char * intel686_cpu_name __P((int)); +void winchip_cpu_setup(const char *, int, int); +void cyrix3_cpu_setup(const char *, int, int); +void cyrix6x86_cpu_setup(const char *, int, int); +void intel586_cpu_setup(const char *, int, int); +void intel686_cpu_setup(const char *, int, int); +char * intel686_cpu_name(int); #if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU) static __inline u_char @@ -1145,7 +1145,7 @@ identifycpu() int class = CPUCLASS_386, vendor, i, max; int family, model, step, modif, cachesize; const struct cpu_cpuid_nameclass *cpup = NULL; - void (*cpu_setup) __P((const char *, int, int)); + void (*cpu_setup)(const char *, int, int); if (cpuid_level == -1) { #ifdef DIAGNOSTIC @@ -1353,7 +1353,7 @@ identifycpu() } #ifdef COMPAT_IBCS2 -void ibcs2_sendsig __P((sig_t, int, int, u_long, int, union sigval)); +void ibcs2_sendsig(sig_t, int, int, u_long, int, union sigval); void ibcs2_sendsig(catcher, sig, mask, code, type, val) @@ -1703,7 +1703,7 @@ dumpconf() int cpu_dump() { - int (*dump) __P((dev_t, daddr_t, caddr_t, size_t)); + int (*dump)(dev_t, daddr_t, caddr_t, size_t); long buf[dbtob(1) / sizeof (long)]; kcore_seg_t *segp; @@ -1742,7 +1742,7 @@ dumpsys() register u_int i, j, npg; register int maddr; daddr_t blkno; - int (*dump) __P((dev_t, daddr_t, caddr_t, size_t)); + int (*dump)(dev_t, daddr_t, caddr_t, size_t); int error; register char *str; extern int msgbufmapped; diff --git a/sys/arch/i386/i386/mainbus.c b/sys/arch/i386/i386/mainbus.c index fa2e12c0f6c..47577e0a0b9 100644 --- a/sys/arch/i386/i386/mainbus.c +++ b/sys/arch/i386/i386/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.14 1999/02/19 17:32:39 art Exp $ */ +/* $OpenBSD: mainbus.c,v 1.15 2002/03/14 01:26:32 millert Exp $ */ /* $NetBSD: mainbus.c,v 1.21 1997/06/06 23:14:20 thorpej Exp $ */ /* @@ -54,8 +54,8 @@ #include <machine/biosvar.h> #endif -int mainbus_match __P((struct device *, void *, void *)); -void mainbus_attach __P((struct device *, struct device *, void *)); +int mainbus_match(struct device *, void *, void *); +void mainbus_attach(struct device *, struct device *, void *); struct cfattach mainbus_ca = { sizeof(struct device), mainbus_match, mainbus_attach @@ -65,7 +65,7 @@ struct cfdriver mainbus_cd = { NULL, "mainbus", DV_DULL }; -int mainbus_print __P((void *, const char *)); +int mainbus_print(void *, const char *); union mainbus_attach_args { const char *mba_busname; /* first elem of all */ diff --git a/sys/arch/i386/i386/mem.c b/sys/arch/i386/i386/mem.c index 5f258217f64..478a0931d4e 100644 --- a/sys/arch/i386/i386/mem.c +++ b/sys/arch/i386/i386/mem.c @@ -1,5 +1,5 @@ /* $NetBSD: mem.c,v 1.31 1996/05/03 19:42:19 christos Exp $ */ -/* $OpenBSD: mem.c,v 1.22 2001/12/08 02:24:06 art Exp $ */ +/* $OpenBSD: mem.c,v 1.23 2002/03/14 01:26:32 millert Exp $ */ /* * Copyright (c) 1988 University of Utah. * Copyright (c) 1982, 1986, 1990, 1993 @@ -75,7 +75,7 @@ extern int allowaperture; #if NMTRR > 0 struct mem_range_softc mem_range_softc; -static int mem_ioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); +static int mem_ioctl(dev_t, u_long, caddr_t, int, struct proc *); #endif /*ARGSUSED*/ diff --git a/sys/arch/i386/i386/mtrr.c b/sys/arch/i386/i386/mtrr.c index 99479bd73b9..b786be81ae5 100644 --- a/sys/arch/i386/i386/mtrr.c +++ b/sys/arch/i386/i386/mtrr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mtrr.c,v 1.5 2001/07/04 23:52:41 espie Exp $ */ +/* $OpenBSD: mtrr.c,v 1.6 2002/03/14 01:26:32 millert Exp $ */ /*- * Copyright (c) 1999 Michael Smith <msmith@freebsd.org> * Copyright (c) 1999 Brian Fundakowski Feldman @@ -41,7 +41,7 @@ extern char cpu_vendor[]; extern struct mem_range_ops i686_mrops; extern struct mem_range_ops k6_mrops; -void mtrrattach __P((int)); +void mtrrattach(int); void mtrrattach (num) diff --git a/sys/arch/i386/i386/pctr.c b/sys/arch/i386/i386/pctr.c index c3c7d95516e..72c2122af30 100644 --- a/sys/arch/i386/i386/pctr.c +++ b/sys/arch/i386/i386/pctr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pctr.c,v 1.14 2001/06/05 05:05:38 pvalchev Exp $ */ +/* $OpenBSD: pctr.c,v 1.15 2002/03/14 01:26:32 millert Exp $ */ /* * Pentium performance counter driver for OpenBSD. @@ -35,14 +35,14 @@ int pctr_isintel; (((cpu_id >> 4) & 15) > 0)) #define usep6ctr (pctr_isintel && ((cpu_id >> 8) & 15) == 6) -void pctrattach __P((int)); -int pctropen __P((dev_t, int, int, struct proc *)); -int pctrclose __P((dev_t, int, int, struct proc *)); -int pctrioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); -int p5ctrsel __P((int fflag, u_int cmd, u_int fn)); -static __inline void p5ctrrd __P((struct pctrst *st)); -int p6ctrsel __P((int fflag, u_int cmd, u_int fn)); -static __inline void p6ctrrd __P((struct pctrst *st)); +void pctrattach(int); +int pctropen(dev_t, int, int, struct proc *); +int pctrclose(dev_t, int, int, struct proc *); +int pctrioctl(dev_t, u_long, caddr_t, int, struct proc *); +int p5ctrsel(int fflag, u_int cmd, u_int fn); +static __inline void p5ctrrd(struct pctrst *st); +int p6ctrsel(int fflag, u_int cmd, u_int fn); +static __inline void p6ctrrd(struct pctrst *st); void pctrattach (num) diff --git a/sys/arch/i386/i386/pmap.c b/sys/arch/i386/i386/pmap.c index d9c5df4b464..1e5b9a09796 100644 --- a/sys/arch/i386/i386/pmap.c +++ b/sys/arch/i386/i386/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.58 2002/01/23 00:39:47 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.59 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: pmap.c,v 1.91 2000/06/02 17:46:37 thorpej Exp $ */ /* @@ -373,49 +373,49 @@ extern vaddr_t pentium_idt_vaddr; * local prototypes */ -static struct pv_entry *pmap_add_pvpage __P((struct pv_page *, boolean_t)); -static struct vm_page *pmap_alloc_ptp __P((struct pmap *, int, boolean_t)); -static struct pv_entry *pmap_alloc_pv __P((struct pmap *, int)); /* see codes below */ +static struct pv_entry *pmap_add_pvpage(struct pv_page *, boolean_t); +static struct vm_page *pmap_alloc_ptp(struct pmap *, int, boolean_t); +static struct pv_entry *pmap_alloc_pv(struct pmap *, int); /* see codes below */ #define ALLOCPV_NEED 0 /* need PV now */ #define ALLOCPV_TRY 1 /* just try to allocate, don't steal */ #define ALLOCPV_NONEED 2 /* don't need PV, just growing cache */ -static struct pv_entry *pmap_alloc_pvpage __P((struct pmap *, int)); -static void pmap_enter_pv __P((struct pv_head *, +static struct pv_entry *pmap_alloc_pvpage(struct pmap *, int); +static void pmap_enter_pv(struct pv_head *, struct pv_entry *, struct pmap *, - vaddr_t, struct vm_page *)); -static void pmap_free_pv __P((struct pmap *, struct pv_entry *)); -static void pmap_free_pvs __P((struct pmap *, struct pv_entry *)); -static void pmap_free_pv_doit __P((struct pv_entry *)); -static void pmap_free_pvpage __P((void)); -static struct vm_page *pmap_get_ptp __P((struct pmap *, int, boolean_t)); -static boolean_t pmap_is_curpmap __P((struct pmap *)); -static pt_entry_t *pmap_map_ptes __P((struct pmap *)); -static struct pv_entry *pmap_remove_pv __P((struct pv_head *, struct pmap *, - vaddr_t)); -static boolean_t pmap_remove_pte __P((struct pmap *, struct vm_page *, - pt_entry_t *, vaddr_t)); -static void pmap_remove_ptes __P((struct pmap *, + vaddr_t, struct vm_page *); +static void pmap_free_pv(struct pmap *, struct pv_entry *); +static void pmap_free_pvs(struct pmap *, struct pv_entry *); +static void pmap_free_pv_doit(struct pv_entry *); +static void pmap_free_pvpage(void); +static struct vm_page *pmap_get_ptp(struct pmap *, int, boolean_t); +static boolean_t pmap_is_curpmap(struct pmap *); +static pt_entry_t *pmap_map_ptes(struct pmap *); +static struct pv_entry *pmap_remove_pv(struct pv_head *, struct pmap *, + vaddr_t); +static boolean_t pmap_remove_pte(struct pmap *, struct vm_page *, + pt_entry_t *, vaddr_t); +static void pmap_remove_ptes(struct pmap *, struct pmap_remove_record *, struct vm_page *, vaddr_t, - vaddr_t, vaddr_t)); -static struct vm_page *pmap_steal_ptp __P((struct uvm_object *, - vaddr_t)); -static vaddr_t pmap_tmpmap_pa __P((paddr_t)); -static pt_entry_t *pmap_tmpmap_pvepte __P((struct pv_entry *)); -static void pmap_tmpunmap_pa __P((void)); -static void pmap_tmpunmap_pvepte __P((struct pv_entry *)); -static boolean_t pmap_transfer_ptes __P((struct pmap *, + vaddr_t, vaddr_t); +static struct vm_page *pmap_steal_ptp(struct uvm_object *, + vaddr_t); +static vaddr_t pmap_tmpmap_pa(paddr_t); +static pt_entry_t *pmap_tmpmap_pvepte(struct pv_entry *); +static void pmap_tmpunmap_pa(void); +static void pmap_tmpunmap_pvepte(struct pv_entry *); +static boolean_t pmap_transfer_ptes(struct pmap *, struct pmap_transfer_location *, struct pmap *, struct pmap_transfer_location *, - int, boolean_t)); -static boolean_t pmap_try_steal_pv __P((struct pv_head *, + int, boolean_t); +static boolean_t pmap_try_steal_pv(struct pv_head *, struct pv_entry *, - struct pv_entry *)); -static void pmap_unmap_ptes __P((struct pmap *)); + struct pv_entry *); +static void pmap_unmap_ptes(struct pmap *); -void pmap_pinit __P((pmap_t)); -void pmap_release __P((pmap_t)); +void pmap_pinit(pmap_t); +void pmap_release(pmap_t); /* * p m a p i n l i n e h e l p e r f u n c t i o n s @@ -3625,7 +3625,7 @@ out: } #ifdef DEBUG -void pmap_dump __P((struct pmap *, vaddr_t, vaddr_t)); +void pmap_dump(struct pmap *, vaddr_t, vaddr_t); /* * pmap_dump: dump all the mappings from a pmap diff --git a/sys/arch/i386/i386/process_machdep.c b/sys/arch/i386/i386/process_machdep.c index 7897ee4bf8c..c4148f27494 100644 --- a/sys/arch/i386/i386/process_machdep.c +++ b/sys/arch/i386/i386/process_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: process_machdep.c,v 1.9 2002/03/14 00:42:24 miod Exp $ */ +/* $OpenBSD: process_machdep.c,v 1.10 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: process_machdep.c,v 1.22 1996/05/03 19:42:25 christos Exp $ */ /* @@ -81,8 +81,8 @@ #include <machine/vm86.h> #endif -static __inline struct trapframe *process_frame __P((struct proc *)); -static __inline struct save87 *process_fpframe __P((struct proc *)); +static __inline struct trapframe *process_frame(struct proc *); +static __inline struct save87 *process_fpframe(struct proc *); static __inline struct trapframe * process_frame(p) diff --git a/sys/arch/i386/i386/svr4_machdep.c b/sys/arch/i386/i386/svr4_machdep.c index 7c5bde75890..7ed6edcc7a7 100644 --- a/sys/arch/i386/i386/svr4_machdep.c +++ b/sys/arch/i386/i386/svr4_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: svr4_machdep.c,v 1.14 1997/09/12 23:17:54 martin Exp $ */ +/* $OpenBSD: svr4_machdep.c,v 1.15 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: svr4_machdep.c,v 1.24 1996/05/03 19:42:26 christos Exp $ */ /* @@ -56,7 +56,7 @@ #include <machine/vm86.h> #include <machine/svr4_machdep.h> -static void svr4_getsiginfo __P((union svr4_siginfo *, int, u_long, int, caddr_t)); +static void svr4_getsiginfo(union svr4_siginfo *, int, u_long, int, caddr_t); void svr4_getcontext(p, uc, mask, oonstack) diff --git a/sys/arch/i386/i386/swapgeneric.c b/sys/arch/i386/i386/swapgeneric.c index eb3fa21ba4b..8c9192c3e96 100644 --- a/sys/arch/i386/i386/swapgeneric.c +++ b/sys/arch/i386/i386/swapgeneric.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapgeneric.c,v 1.11 2001/09/29 18:40:32 miod Exp $ */ +/* $OpenBSD: swapgeneric.c,v 1.12 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: swapgeneric.c,v 1.12 1996/05/03 19:42:28 christos Exp $ */ /*- @@ -46,7 +46,7 @@ #include <sys/param.h> #include <sys/conf.h> -int (*mountroot) __P((void)) = NULL; +int (*mountroot)(void) = NULL; dev_t rootdev = NODEV; dev_t dumpdev = NODEV; diff --git a/sys/arch/i386/i386/sys_machdep.c b/sys/arch/i386/i386/sys_machdep.c index 6aa7063898c..fec9478d381 100644 --- a/sys/arch/i386/i386/sys_machdep.c +++ b/sys/arch/i386/i386/sys_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_machdep.c,v 1.17 2001/11/28 16:13:28 art Exp $ */ +/* $OpenBSD: sys_machdep.c,v 1.18 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: sys_machdep.c,v 1.28 1996/05/03 19:42:29 christos Exp $ */ /*- @@ -73,12 +73,12 @@ extern struct vm_map *kernel_map; #ifdef USER_LDT -int i386_get_ldt __P((struct proc *, void *, register_t *)); -int i386_set_ldt __P((struct proc *, void *, register_t *)); +int i386_get_ldt(struct proc *, void *, register_t *); +int i386_set_ldt(struct proc *, void *, register_t *); #endif -int i386_iopl __P((struct proc *, void *, register_t *)); -int i386_get_ioperm __P((struct proc *, void *, register_t *)); -int i386_set_ioperm __P((struct proc *, void *, register_t *)); +int i386_iopl(struct proc *, void *, register_t *); +int i386_get_ioperm(struct proc *, void *, register_t *); +int i386_set_ioperm(struct proc *, void *, register_t *); #ifdef USER_LDT /* diff --git a/sys/arch/i386/i386/trap.c b/sys/arch/i386/i386/trap.c index 53a47290602..83c315a24cd 100644 --- a/sys/arch/i386/i386/trap.c +++ b/sys/arch/i386/i386/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.48 2002/02/21 23:27:12 deraadt Exp $ */ +/* $OpenBSD: trap.c,v 1.49 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: trap.c,v 1.95 1996/05/05 06:50:02 mycroft Exp $ */ /*- @@ -91,10 +91,10 @@ extern struct emul emul_bsdos; #include "npx.h" -static __inline void userret __P((struct proc *, int, u_quad_t)); -void trap __P((struct trapframe)); -int trapwrite __P((unsigned)); -void syscall __P((struct trapframe)); +static __inline void userret(struct proc *, int, u_quad_t); +void trap(struct trapframe); +int trapwrite(unsigned); +void syscall(struct trapframe); /* * Define the code needed before returning to user mode, for diff --git a/sys/arch/i386/i386/vm86.c b/sys/arch/i386/i386/vm86.c index 19aa6c9e886..4bf4911debe 100644 --- a/sys/arch/i386/i386/vm86.c +++ b/sys/arch/i386/i386/vm86.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm86.c,v 1.13 2002/01/16 20:50:16 miod Exp $ */ +/* $OpenBSD: vm86.c,v 1.14 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: vm86.c,v 1.15 1996/05/03 19:42:33 christos Exp $ */ /*- @@ -70,8 +70,8 @@ #include <machine/sysarch.h> #include <machine/vm86.h> -static void fast_intxx __P((struct proc *, int)); -static __inline int is_bitset __P((int, caddr_t)); +static void fast_intxx(struct proc *, int); +static __inline int is_bitset(int, caddr_t); #define CS(tf) (*(u_short *)&tf->tf_cs) #define IP(tf) (*(u_short *)&tf->tf_eip) diff --git a/sys/arch/i386/i386/wscons_machdep.c b/sys/arch/i386/i386/wscons_machdep.c index 91f2163882f..3bc50e979ae 100644 --- a/sys/arch/i386/i386/wscons_machdep.c +++ b/sys/arch/i386/i386/wscons_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wscons_machdep.c,v 1.7 2001/07/29 23:13:28 csapuntz Exp $ */ +/* $OpenBSD: wscons_machdep.c,v 1.8 2002/03/14 01:26:33 millert Exp $ */ /* * Copyright (c) 2001 Aaron Campbell @@ -85,11 +85,11 @@ #include <machine/pccons.h> #endif -void wscnprobe __P((struct consdev *)); -void wscninit __P((struct consdev *)); -void wscnputc __P((dev_t, char)); -int wscngetc __P((dev_t)); -void wscnpollc __P((dev_t, int)); +void wscnprobe(struct consdev *); +void wscninit(struct consdev *); +void wscnputc(dev_t, char); +int wscngetc(dev_t); +void wscnpollc(dev_t, int); void wscnprobe(cp) diff --git a/sys/arch/i386/include/apmvar.h b/sys/arch/i386/include/apmvar.h index 1703c833ac1..f2c1aaf41dc 100644 --- a/sys/arch/i386/include/apmvar.h +++ b/sys/arch/i386/include/apmvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: apmvar.h,v 1.14 2001/12/14 17:07:40 mickey Exp $ */ +/* $OpenBSD: apmvar.h,v 1.15 2002/03/14 01:26:33 millert Exp $ */ /* * Copyright (c) 1995 John T. Kohl @@ -289,11 +289,11 @@ struct apm_ctl { if the percentage changes */ #ifdef _KERNEL -extern void apm_cpu_busy __P((void)); -extern void apm_cpu_idle __P((void)); -extern void apminit __P((void)); -int apm_set_powstate __P((u_int devid, u_int powstate)); -int apm_kqfilter __P((dev_t dev, struct knote *kn)); +extern void apm_cpu_busy(void); +extern void apm_cpu_idle(void); +extern void apminit(void); +int apm_set_powstate(u_int devid, u_int powstate); +int apm_kqfilter(dev_t dev, struct knote *kn); #endif /* _KERNEL */ #endif /* _I386_APMVAR_H_ */ diff --git a/sys/arch/i386/include/biosvar.h b/sys/arch/i386/include/biosvar.h index a7b5bf5b68c..f27db7a95e0 100644 --- a/sys/arch/i386/include/biosvar.h +++ b/sys/arch/i386/include/biosvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: biosvar.h,v 1.39 2002/02/21 18:38:44 tdeval Exp $ */ +/* $OpenBSD: biosvar.h,v 1.40 2002/03/14 01:26:33 millert Exp $ */ /* * Copyright (c) 1997-1999 Michael Shalayeff @@ -235,18 +235,17 @@ struct bios_attach_args { struct consdev; struct proc; -int bios_sysctl - __P((int *, u_int, void *, size_t *, void *, size_t, struct proc *)); +int bios_sysctl(int *, u_int, void *, size_t *, void *, size_t, struct proc *); -void bioscnprobe __P((struct consdev *)); -void bioscninit __P((struct consdev *)); -void bioscnputc __P((dev_t, int)); -int bioscngetc __P((dev_t)); -void bioscnpollc __P((dev_t, int)); -void bios_getopt __P((void)); +void bioscnprobe(struct consdev *); +void bioscninit(struct consdev *); +void bioscnputc(dev_t, int); +int bioscngetc(dev_t); +void bioscnpollc(dev_t, int); +void bios_getopt(void); /* bios32.c */ -int bios32_service __P((u_int32_t, bios32_entry_t, bios32_entry_info_t)); +int bios32_service(u_int32_t, bios32_entry_t, bios32_entry_info_t); extern u_int bootapiver; extern bios_memmap_t *bios_memmap; diff --git a/sys/arch/i386/include/bus.h b/sys/arch/i386/include/bus.h index 3ac591f0149..7ab5bc7ef48 100644 --- a/sys/arch/i386/include/bus.h +++ b/sys/arch/i386/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.32 2002/03/07 18:08:08 jason Exp $ */ +/* $OpenBSD: bus.h,v 1.33 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: bus.h,v 1.6 1996/11/10 03:19:25 thorpej Exp $ */ /*- @@ -93,26 +93,26 @@ typedef u_long bus_size_t; typedef int bus_space_tag_t; typedef u_long bus_space_handle_t; -int bus_space_map __P((bus_space_tag_t t, bus_addr_t addr, - bus_size_t size, int cacheable, bus_space_handle_t *bshp)); +int bus_space_map(bus_space_tag_t t, bus_addr_t addr, + bus_size_t size, int cacheable, bus_space_handle_t *bshp); /* like bus_space_map(), but without extent map checking/allocation */ -int _bus_space_map __P((bus_space_tag_t t, bus_addr_t addr, - bus_size_t size, int cacheable, bus_space_handle_t *bshp)); -void bus_space_unmap __P((bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t size)); -int bus_space_subregion __P((bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp)); - -int bus_space_alloc __P((bus_space_tag_t t, bus_addr_t rstart, +int _bus_space_map(bus_space_tag_t t, bus_addr_t addr, + bus_size_t size, int cacheable, bus_space_handle_t *bshp); +void bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, + bus_size_t size); +int bus_space_subregion(bus_space_tag_t t, bus_space_handle_t bsh, + bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp); + +int bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart, bus_addr_t rend, bus_size_t size, bus_size_t align, bus_size_t boundary, int cacheable, bus_addr_t *addrp, - bus_space_handle_t *bshp)); -void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t size)); + bus_space_handle_t *bshp); +void bus_space_free(bus_space_tag_t t, bus_space_handle_t bsh, + bus_size_t size); /* - * u_intN_t bus_space_read_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset)); + * u_intN_t bus_space_read_N(bus_space_tag_t tag, + * bus_space_handle_t bsh, bus_size_t offset); * * Read a 1, 2, 4, or 8 byte quantity from bus space * described by tag/handle/offset. @@ -135,9 +135,9 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh, #endif /* - * void bus_space_read_multi_N __P((bus_space_tag_t tag, + * void bus_space_read_multi_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t *addr, size_t count)); + * u_intN_t *addr, size_t count); * * Read `count' 1, 2, 4, or 8 byte quantities from bus space * described by tag/handle/offset and copy into buffer provided. @@ -190,9 +190,9 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh, #endif /* - * void bus_space_read_raw_multi_N __P((bus_space_tag_t tag, + * void bus_space_read_raw_multi_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_int8_t *addr, size_t count)); + * u_int8_t *addr, size_t count); * * Read `count' bytes in 2, 4 or 8 byte wide quantities from bus space * described by tag/handle/offset and copy into buffer provided. The buffer @@ -211,9 +211,9 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh, #endif /* - * void bus_space_read_region_N __P((bus_space_tag_t tag, + * void bus_space_read_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t *addr, size_t count)); + * u_intN_t *addr, size_t count); * * Read `count' 1, 2, 4, or 8 byte quantities from bus space * described by tag/handle and starting at `offset' and copy into @@ -270,9 +270,9 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh, #endif /* - * void bus_space_read_raw_region_N __P((bus_space_tag_t tag, + * void bus_space_read_raw_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_int8_t *addr, size_t count)); + * u_int8_t *addr, size_t count); * * Read `count' bytes in 2, 4 or 8 byte wide quantities from bus space * described by tag/handle and starting at `offset' and copy into @@ -292,9 +292,9 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh, #endif /* - * void bus_space_write_N __P((bus_space_tag_t tag, + * void bus_space_write_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t value)); + * u_intN_t value); * * Write the 1, 2, 4, or 8 byte value `value' to bus space * described by tag/handle/offset. @@ -326,9 +326,9 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh, #endif /* - * void bus_space_write_multi_N __P((bus_space_tag_t tag, + * void bus_space_write_multi_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * const u_intN_t *addr, size_t count)); + * const u_intN_t *addr, size_t count); * * Write `count' 1, 2, 4, or 8 byte quantities from the buffer * provided to bus space described by tag/handle/offset. @@ -382,9 +382,9 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh, #endif /* - * void bus_space_write_raw_multi_N __P((bus_space_tag_t tag, + * void bus_space_write_raw_multi_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * const u_int8_t *addr, size_t count)); + * const u_int8_t *addr, size_t count); * * Write `count' bytes in 2, 4 or 8 byte wide quantities from the buffer * provided to bus space described by tag/handle/offset. The buffer @@ -403,9 +403,9 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh, #endif /* - * void bus_space_write_region_N __P((bus_space_tag_t tag, + * void bus_space_write_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * const u_intN_t *addr, size_t count)); + * const u_intN_t *addr, size_t count); * * Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided * to bus space described by tag/handle starting at `offset'. @@ -462,9 +462,9 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh, #endif /* - * void bus_space_write_raw_region_N __P((bus_space_tag_t tag, + * void bus_space_write_raw_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * const u_int8_t *addr, size_t count)); + * const u_int8_t *addr, size_t count); * * Write `count' bytes in 2, 4 or 8 byte wide quantities to bus space * described by tag/handle and starting at `offset' from the @@ -484,9 +484,9 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh, #endif /* - * void bus_space_set_multi_N __P((bus_space_tag_t tag, + * void bus_space_set_multi_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t val, size_t count)); + * u_intN_t val, size_t count); * * Write the 1, 2, 4, or 8 byte value `val' to bus space described * by tag/handle/offset `count' times. @@ -555,9 +555,9 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh, #endif /* - * void bus_space_set_region_N __P((bus_space_tag_t tag, + * void bus_space_set_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t val, size_t count)); + * u_intN_t val, size_t count); * * Write `count' 1, 2, 4, or 8 byte value `val' to bus space described * by tag/handle starting at `offset'. @@ -626,10 +626,10 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh, #endif /* - * void bus_space_copy_N __P((bus_space_tag_t tag, + * void bus_space_copy_N(bus_space_tag_t tag, * bus_space_handle_t bsh1, bus_size_t off1, * bus_space_handle_t bsh2, bus_size_t off2, - * size_t count)); + * size_t count); * * Copy `count' 1, 2, 4, or 8 byte values from bus space starting * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2. @@ -714,9 +714,9 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh, /* * Bus read/write barrier methods. * - * void bus_space_barrier __P((bus_space_tag_t tag, + * void bus_space_barrier(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * bus_size_t len, int flags)); + * bus_size_t len, int flags); * * Note: the i386 does not currently require barriers, but we must * provide the flags to MI code. @@ -785,33 +785,33 @@ struct i386_bus_dma_tag { /* * DMA mapping methods. */ - int (*_dmamap_create) __P((bus_dma_tag_t, bus_size_t, int, - bus_size_t, bus_size_t, int, bus_dmamap_t *)); - void (*_dmamap_destroy) __P((bus_dma_tag_t, bus_dmamap_t)); - int (*_dmamap_load) __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); - int (*_dmamap_load_mbuf) __P((bus_dma_tag_t, bus_dmamap_t, - struct mbuf *, int)); - int (*_dmamap_load_uio) __P((bus_dma_tag_t, bus_dmamap_t, - struct uio *, int)); - int (*_dmamap_load_raw) __P((bus_dma_tag_t, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int)); - void (*_dmamap_unload) __P((bus_dma_tag_t, bus_dmamap_t)); - void (*_dmamap_sync) __P((bus_dma_tag_t, bus_dmamap_t, - bus_addr_t, bus_size_t, int)); + int (*_dmamap_create)(bus_dma_tag_t, bus_size_t, int, + bus_size_t, bus_size_t, int, bus_dmamap_t *); + void (*_dmamap_destroy)(bus_dma_tag_t, bus_dmamap_t); + int (*_dmamap_load)(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int); + int (*_dmamap_load_mbuf)(bus_dma_tag_t, bus_dmamap_t, + struct mbuf *, int); + int (*_dmamap_load_uio)(bus_dma_tag_t, bus_dmamap_t, + struct uio *, int); + int (*_dmamap_load_raw)(bus_dma_tag_t, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int); + void (*_dmamap_unload)(bus_dma_tag_t, bus_dmamap_t); + void (*_dmamap_sync)(bus_dma_tag_t, bus_dmamap_t, + bus_addr_t, bus_size_t, int); /* * DMA memory utility functions. */ - int (*_dmamem_alloc) __P((bus_dma_tag_t, bus_size_t, bus_size_t, - bus_size_t, bus_dma_segment_t *, int, int *, int)); - void (*_dmamem_free) __P((bus_dma_tag_t, - bus_dma_segment_t *, int)); - int (*_dmamem_map) __P((bus_dma_tag_t, bus_dma_segment_t *, - int, size_t, caddr_t *, int)); - void (*_dmamem_unmap) __P((bus_dma_tag_t, caddr_t, size_t)); - paddr_t (*_dmamem_mmap) __P((bus_dma_tag_t, bus_dma_segment_t *, - int, off_t, int, int)); + int (*_dmamem_alloc)(bus_dma_tag_t, bus_size_t, bus_size_t, + bus_size_t, bus_dma_segment_t *, int, int *, int); + void (*_dmamem_free)(bus_dma_tag_t, + bus_dma_segment_t *, int); + int (*_dmamem_map)(bus_dma_tag_t, bus_dma_segment_t *, + int, size_t, caddr_t *, int); + void (*_dmamem_unmap)(bus_dma_tag_t, caddr_t, size_t); + paddr_t (*_dmamem_mmap)(bus_dma_tag_t, bus_dma_segment_t *, + int, off_t, int, int); }; #define bus_dmamap_create(t, s, n, m, b, f, p) \ @@ -869,37 +869,37 @@ struct i386_bus_dmamap { }; #ifdef _I386_BUS_DMA_PRIVATE -int _bus_dmamap_create __P((bus_dma_tag_t, bus_size_t, int, bus_size_t, - bus_size_t, int, bus_dmamap_t *)); -void _bus_dmamap_destroy __P((bus_dma_tag_t, bus_dmamap_t)); -int _bus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); -int _bus_dmamap_load_mbuf __P((bus_dma_tag_t, bus_dmamap_t, - struct mbuf *, int)); -int _bus_dmamap_load_uio __P((bus_dma_tag_t, bus_dmamap_t, - struct uio *, int)); -int _bus_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int)); -void _bus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t)); -void _bus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t, bus_addr_t, - bus_size_t, int)); - -int _bus_dmamem_alloc __P((bus_dma_tag_t tag, bus_size_t size, +int _bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t, + bus_size_t, int, bus_dmamap_t *); +void _bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t); +int _bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int); +int _bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t, + struct mbuf *, int); +int _bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t, + struct uio *, int); +int _bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int); +void _bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t); +void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t, + bus_size_t, int); + +int _bus_dmamem_alloc(bus_dma_tag_t tag, bus_size_t size, bus_size_t alignment, bus_size_t boundary, - bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags)); -void _bus_dmamem_free __P((bus_dma_tag_t tag, bus_dma_segment_t *segs, - int nsegs)); -int _bus_dmamem_map __P((bus_dma_tag_t tag, bus_dma_segment_t *segs, - int nsegs, size_t size, caddr_t *kvap, int flags)); -void _bus_dmamem_unmap __P((bus_dma_tag_t tag, caddr_t kva, - size_t size)); -paddr_t _bus_dmamem_mmap __P((bus_dma_tag_t tag, bus_dma_segment_t *segs, - int nsegs, off_t off, int prot, int flags)); - -int _bus_dmamem_alloc_range __P((bus_dma_tag_t tag, bus_size_t size, + bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags); +void _bus_dmamem_free(bus_dma_tag_t tag, bus_dma_segment_t *segs, + int nsegs); +int _bus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs, + int nsegs, size_t size, caddr_t *kvap, int flags); +void _bus_dmamem_unmap(bus_dma_tag_t tag, caddr_t kva, + size_t size); +paddr_t _bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs, + int nsegs, off_t off, int prot, int flags); + +int _bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size, bus_size_t alignment, bus_size_t boundary, bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags, - vm_offset_t low, vm_offset_t high)); + vm_offset_t low, vm_offset_t high); #endif /* _I386_BUS_DMA_PRIVATE */ #endif /* _I386_BUS_H_ */ diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h index 0aac93264fb..aa413239594 100644 --- a/sys/arch/i386/include/cpu.h +++ b/sys/arch/i386/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.40 2001/12/08 02:24:06 art Exp $ */ +/* $OpenBSD: cpu.h,v 1.41 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $ */ /*- @@ -93,13 +93,13 @@ int want_resched; /* resched() was called */ * We need a machine-independent name for this. */ #define DELAY(x) delay(x) -void delay __P((int)); +void delay(int); #if defined(I586_CPU) || defined(I686_CPU) /* * High resolution clock support (Pentium only) */ -void calibrate_cyclecounter __P((void)); +void calibrate_cyclecounter(void); #ifndef HZ extern u_quad_t pentium_base_tsc; #define CPU_CLOCKUPDATE(otime, ntime) \ @@ -134,7 +134,7 @@ struct cpu_nocpuid_nameclass { const char *cpu_vendorname; const char *cpu_name; int cpu_class; - void (*cpu_setup) __P((const char *, int, int)); + void (*cpu_setup)(const char *, int, int); }; struct cpu_cpuid_nameclass { @@ -144,7 +144,7 @@ struct cpu_cpuid_nameclass { struct cpu_cpuid_family { int cpu_class; const char *cpu_models[CPU_MAXMODEL+2]; - void (*cpu_setup) __P((const char *, int, int)); + void (*cpu_setup)(const char *, int, int); } cpu_family[CPU_MAXFAMILY - CPU_MINFAMILY + 1]; }; @@ -170,68 +170,68 @@ extern int pentium_mhz; #ifdef I586_CPU /* F00F bug fix stuff for pentium cpu */ extern int cpu_f00f_bug; -void fix_f00f __P((void)); +void fix_f00f(void); #endif /* dkcsum.c */ -void dkcsumattach __P((void)); +void dkcsumattach(void); /* machdep.c */ -void dumpconf __P((void)); -void cpu_reset __P((void)); -void i386_proc0_tss_ldt_init __P((void)); +void dumpconf(void); +void cpu_reset(void); +void i386_proc0_tss_ldt_init(void); /* locore.s */ struct region_descriptor; -void lgdt __P((struct region_descriptor *)); -void fillw __P((short, void *, size_t)); -short fusword __P((u_short *)); -int susword __P((u_short *t, u_short)); +void lgdt(struct region_descriptor *); +void fillw(short, void *, size_t); +short fusword(u_short *); +int susword(u_short *t, u_short); struct pcb; -void savectx __P((struct pcb *)); -void switch_exit __P((struct proc *)); -void proc_trampoline __P((void)); +void savectx(struct pcb *); +void switch_exit(struct proc *); +void proc_trampoline(void); /* clock.c */ -void initrtclock __P((void)); -void startrtclock __P((void)); -void rtcdrain __P((void *)); +void initrtclock(void); +void startrtclock(void); +void rtcdrain(void *); /* npx.c */ -void npxdrop __P((void)); -void npxsave __P((void)); +void npxdrop(void); +void npxsave(void); #if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE) /* math_emulate.c */ -int math_emulate __P((struct trapframe *)); +int math_emulate(struct trapframe *); #endif #ifdef USER_LDT /* sys_machdep.h */ -void i386_user_cleanup __P((struct pcb *)); -int i386_get_ldt __P((struct proc *, void *, register_t *)); -int i386_set_ldt __P((struct proc *, void *, register_t *)); +void i386_user_cleanup(struct pcb *); +int i386_get_ldt(struct proc *, void *, register_t *); +int i386_set_ldt(struct proc *, void *, register_t *); #endif /* isa_machdep.c */ -void isa_defaultirq __P((void)); -int isa_nmi __P((void)); +void isa_defaultirq(void); +int isa_nmi(void); /* pmap.c */ -void pmap_bootstrap __P((vm_offset_t)); +void pmap_bootstrap(vm_offset_t); /* vm_machdep.c */ -int kvtop __P((caddr_t)); +int kvtop(caddr_t); #ifdef VM86 /* vm86.c */ -void vm86_gpfault __P((struct proc *, int)); +void vm86_gpfault(struct proc *, int); #endif /* VM86 */ #ifdef GENERIC /* swapgeneric.c */ -void setconf __P((void)); +void setconf(void); #endif /* GENERIC */ #endif /* _KERNEL */ diff --git a/sys/arch/i386/include/cpufunc.h b/sys/arch/i386/include/cpufunc.h index ffe750332ad..b7c039ab585 100644 --- a/sys/arch/i386/include/cpufunc.h +++ b/sys/arch/i386/include/cpufunc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpufunc.h,v 1.7 2001/08/18 20:37:42 espie Exp $ */ +/* $OpenBSD: cpufunc.h,v 1.8 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: cpufunc.h,v 1.8 1994/10/27 04:15:59 cgd Exp $ */ /* @@ -41,24 +41,24 @@ #include <sys/cdefs.h> #include <sys/types.h> -static __inline void invlpg __P((u_int)); -static __inline void lidt __P((void *)); -static __inline void lldt __P((u_short)); -static __inline void ltr __P((u_short)); -static __inline void lcr0 __P((u_int)); -static __inline u_int rcr0 __P((void)); -static __inline u_int rcr2 __P((void)); -static __inline void lcr3 __P((u_int)); -static __inline u_int rcr3 __P((void)); -static __inline void lcr4 __P((u_int)); -static __inline u_int rcr4 __P((void)); -static __inline void tlbflush __P((void)); -static __inline void disable_intr __P((void)); -static __inline void enable_intr __P((void)); -static __inline void wbinvd __P((void)); -static __inline void wrmsr __P((u_int, u_int64_t)); -static __inline u_int64_t rdmsr __P((u_int)); -static __inline void breakpoint __P((void)); +static __inline void invlpg(u_int); +static __inline void lidt(void *); +static __inline void lldt(u_short); +static __inline void ltr(u_short); +static __inline void lcr0(u_int); +static __inline u_int rcr0(void); +static __inline u_int rcr2(void); +static __inline void lcr3(u_int); +static __inline u_int rcr3(void); +static __inline void lcr4(u_int); +static __inline u_int rcr4(void); +static __inline void tlbflush(void); +static __inline void disable_intr(void); +static __inline void enable_intr(void); +static __inline void wbinvd(void); +static __inline void wrmsr(u_int, u_int64_t); +static __inline u_int64_t rdmsr(u_int); +static __inline void breakpoint(void); static __inline void invlpg(u_int addr) @@ -143,7 +143,7 @@ tlbflush(void) } #ifdef notyet -void setidt __P((int idx, /*XXX*/caddr_t func, int typ, int dpl)); +void setidt(int idx, /*XXX*/caddr_t func, int typ, int dpl); #endif diff --git a/sys/arch/i386/include/db_machdep.h b/sys/arch/i386/include/db_machdep.h index ee32ef6556d..a95248af211 100644 --- a/sys/arch/i386/include/db_machdep.h +++ b/sys/arch/i386/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.6 2001/11/06 19:53:14 miod Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.7 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: db_machdep.h,v 1.9 1996/05/03 19:23:59 christos Exp $ */ /* @@ -87,8 +87,8 @@ db_regs_t ddb_regs; /* register state */ ((user) && (addr) < VM_MAX_ADDRESS)) #if 0 -boolean_t db_check_access __P((vaddr_t, int, task_t)); -boolean_t db_phys_eq __P((task_t, vaddr_t, task_t, vaddr_t)); +boolean_t db_check_access(vaddr_t, int, task_t); +boolean_t db_phys_eq(task_t, vaddr_t, task_t, vaddr_t); #endif /* macros for printing OS server dependent task name */ @@ -113,6 +113,6 @@ void db_task_name(/* task_t */); #define db_thread_fp_used(thread) ((thread)->pcb->ims.ifps != 0) -int kdb_trap __P((int, int, db_regs_t *)); +int kdb_trap(int, int, db_regs_t *); #endif /* _I386_DB_MACHDEP_H_ */ diff --git a/sys/arch/i386/include/disklabel.h b/sys/arch/i386/include/disklabel.h index 7b288a7b0a6..8e9a284a166 100644 --- a/sys/arch/i386/include/disklabel.h +++ b/sys/arch/i386/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.23 2000/12/06 17:18:58 deraadt Exp $ */ +/* $OpenBSD: disklabel.h,v 1.24 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp $ */ /* @@ -95,7 +95,7 @@ struct cpu_disklabel { #define DPSECT(s) ((s) & 0x3f) #define DPCYL(c, s) ((c) + (((s) & 0xc0) << 2)) -static __inline u_int32_t get_le __P((void *)); +static __inline u_int32_t get_le(void *); static __inline u_int32_t #ifdef __cplusplus diff --git a/sys/arch/i386/include/float.h b/sys/arch/i386/include/float.h index 19351cc0ee7..50a2c3b1db8 100644 --- a/sys/arch/i386/include/float.h +++ b/sys/arch/i386/include/float.h @@ -1,4 +1,4 @@ -/* $OpenBSD: float.h,v 1.3 2000/08/05 22:07:31 niklas Exp $ */ +/* $OpenBSD: float.h,v 1.4 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: float.h,v 1.8 1995/06/20 20:45:37 jtc Exp $ */ /* @@ -42,7 +42,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/i386/include/freebsd_machdep.h b/sys/arch/i386/include/freebsd_machdep.h index 3f735a68c7f..c18e5d9dc7e 100644 --- a/sys/arch/i386/include/freebsd_machdep.h +++ b/sys/arch/i386/include/freebsd_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: freebsd_machdep.h,v 1.5 2000/08/05 22:07:31 niklas Exp $ */ +/* $OpenBSD: freebsd_machdep.h,v 1.6 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: freebsd_machdep.h,v 1.1 1995/10/10 01:22:35 mycroft Exp $ */ /* @@ -159,7 +159,7 @@ struct freebsd_ptrace_reg { #define FREEBSD___LDPGSZ 4096 #ifdef _KERNEL -void freebsd_sendsig __P((sig_t, int, int, u_long, int, union sigval)); +void freebsd_sendsig(sig_t, int, int, u_long, int, union sigval); #endif #endif /* _FREEBSD_MACHDEP_H */ diff --git a/sys/arch/i386/include/gdt.h b/sys/arch/i386/include/gdt.h index f3e3d7f90d0..1568b573a86 100644 --- a/sys/arch/i386/include/gdt.h +++ b/sys/arch/i386/include/gdt.h @@ -1,4 +1,4 @@ -/* $OpenBSD: gdt.h,v 1.8 2001/05/05 23:25:45 art Exp $ */ +/* $OpenBSD: gdt.h,v 1.9 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: gdt.h,v 1.3 1996/02/27 22:32:11 jtc Exp $ */ /*- @@ -38,9 +38,9 @@ */ #ifdef _KERNEL -void gdt_init __P((void)); -void tss_alloc __P((struct pcb *)); -void tss_free __P((struct pcb *)); -void ldt_alloc __P((struct pmap *, union descriptor *, size_t)); -void ldt_free __P((struct pmap *)); +void gdt_init(void); +void tss_alloc(struct pcb *); +void tss_free(struct pcb *); +void ldt_alloc(struct pmap *, union descriptor *, size_t); +void ldt_free(struct pmap *); #endif diff --git a/sys/arch/i386/include/intr.h b/sys/arch/i386/include/intr.h index 3bd8226f64d..c496a25c097 100644 --- a/sys/arch/i386/include/intr.h +++ b/sys/arch/i386/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.12 2001/12/14 08:35:12 niklas Exp $ */ +/* $OpenBSD: intr.h,v 1.13 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: intr.h,v 1.5 1996/05/13 06:11:28 mycroft Exp $ */ /* @@ -104,12 +104,12 @@ int iunmask[NIPL]; /* Bitmasks telling what interrupts are accepted. */ #define IMASK(level) imask[IPL(level)] #define IUNMASK(level) iunmask[IPL(level)] -extern void Xspllower __P((void)); +extern void Xspllower(void); -static __inline int splraise __P((int)); -static __inline int spllower __P((int)); -#define SPLX_DECL void splx __P((int)); -static __inline void softintr __P((int)); +static __inline int splraise(int); +static __inline int spllower(int); +#define SPLX_DECL void splx(int); +static __inline void softintr(int); /* * Raise current interrupt priority level, and return the old one. diff --git a/sys/arch/i386/include/linux_machdep.h b/sys/arch/i386/include/linux_machdep.h index 58846882b22..e02e7f9068a 100644 --- a/sys/arch/i386/include/linux_machdep.h +++ b/sys/arch/i386/include/linux_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: linux_machdep.h,v 1.8 2001/04/07 21:44:02 tholo Exp $ */ +/* $OpenBSD: linux_machdep.h,v 1.9 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: linux_machdep.h,v 1.5 1996/05/03 19:26:28 christos Exp $ */ /* @@ -78,8 +78,8 @@ struct linux_sigframe { }; #ifdef _KERNEL -void linux_sendsig __P((sig_t, int, int, u_long, int, union sigval)); -dev_t linux_fakedev __P((dev_t)); +void linux_sendsig(sig_t, int, int, u_long, int, union sigval); +dev_t linux_fakedev(dev_t); #endif /* diff --git a/sys/arch/i386/include/pccons.h b/sys/arch/i386/include/pccons.h index 372f9ab331c..3195344edf3 100644 --- a/sys/arch/i386/include/pccons.h +++ b/sys/arch/i386/include/pccons.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pccons.h,v 1.6 2001/01/30 00:00:32 aaron Exp $ */ +/* $OpenBSD: pccons.h,v 1.7 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: pccons.h,v 1.4 1996/02/02 18:06:06 mycroft Exp $ */ /* @@ -44,7 +44,7 @@ typedef struct { #define CONSOLE_SET_BLANK _IOW('t',130,int) #ifdef _KERNEL -int pccnattach __P((void)); +int pccnattach(void); #if (NPCCONSKBD > 0) int pcconskbd_cnattach _P((pckbc_tag_t, pckbc_slot_t)); diff --git a/sys/arch/i386/include/pmap.h b/sys/arch/i386/include/pmap.h index ff7cca16a22..61e1fb1d9a9 100644 --- a/sys/arch/i386/include/pmap.h +++ b/sys/arch/i386/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.25 2001/12/19 08:58:05 art Exp $ */ +/* $OpenBSD: pmap.h,v 1.26 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: pmap.h,v 1.44 2000/04/24 17:18:18 thorpej Exp $ */ /* @@ -390,29 +390,29 @@ extern int pmap_pg_g; /* do we support PG_G? */ * prototypes */ -void pmap_bootstrap __P((vaddr_t)); -boolean_t pmap_change_attrs __P((struct vm_page *, int, int)); -static void pmap_page_protect __P((struct vm_page *, vm_prot_t)); -void pmap_page_remove __P((struct vm_page *)); -static void pmap_protect __P((struct pmap *, vaddr_t, - vaddr_t, vm_prot_t)); -void pmap_remove __P((struct pmap *, vaddr_t, vaddr_t)); -boolean_t pmap_test_attrs __P((struct vm_page *, int)); -void pmap_transfer __P((struct pmap *, struct pmap *, vaddr_t, - vsize_t, vaddr_t, boolean_t)); -static void pmap_update_pg __P((vaddr_t)); -static void pmap_update_2pg __P((vaddr_t,vaddr_t)); -void pmap_write_protect __P((struct pmap *, vaddr_t, - vaddr_t, vm_prot_t)); - -vaddr_t reserve_dumppages __P((vaddr_t)); /* XXX: not a pmap fn */ +void pmap_bootstrap(vaddr_t); +boolean_t pmap_change_attrs(struct vm_page *, int, int); +static void pmap_page_protect(struct vm_page *, vm_prot_t); +void pmap_page_remove(struct vm_page *); +static void pmap_protect(struct pmap *, vaddr_t, + vaddr_t, vm_prot_t); +void pmap_remove(struct pmap *, vaddr_t, vaddr_t); +boolean_t pmap_test_attrs(struct vm_page *, int); +void pmap_transfer(struct pmap *, struct pmap *, vaddr_t, + vsize_t, vaddr_t, boolean_t); +static void pmap_update_pg(vaddr_t); +static void pmap_update_2pg(vaddr_t,vaddr_t); +void pmap_write_protect(struct pmap *, vaddr_t, + vaddr_t, vm_prot_t); + +vaddr_t reserve_dumppages(vaddr_t); /* XXX: not a pmap fn */ #define PMAP_GROWKERNEL /* turn on pmap_growkernel interface */ /* * Do idle page zero'ing uncached to avoid polluting the cache. */ -boolean_t pmap_zero_page_uncached __P((paddr_t)); +boolean_t pmap_zero_page_uncached(paddr_t); #define PMAP_PAGEIDLEZERO(pa) pmap_zero_page_uncached((pa)) /* @@ -502,7 +502,7 @@ pmap_protect(pmap, sva, eva, prot) } #if defined(USER_LDT) -void pmap_ldt_cleanup __P((struct proc *)); +void pmap_ldt_cleanup(struct proc *); #define PMAP_FORK #endif /* USER_LDT */ diff --git a/sys/arch/i386/include/profile.h b/sys/arch/i386/include/profile.h index d3850e7748d..56723c1889a 100644 --- a/sys/arch/i386/include/profile.h +++ b/sys/arch/i386/include/profile.h @@ -1,4 +1,4 @@ -/* $OpenBSD: profile.h,v 1.6 2001/11/30 20:26:02 mickey Exp $ */ +/* $OpenBSD: profile.h,v 1.7 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: profile.h,v 1.6 1995/03/28 18:17:08 jtc Exp $ */ /* @@ -39,7 +39,7 @@ #define _MCOUNT_DECL static __inline void _mcount #define MCOUNT \ -extern void mcount __P((void)) __asm("mcount"); \ +extern void mcount(void) __asm("mcount"); \ void \ mcount() \ { \ diff --git a/sys/arch/i386/include/psl.h b/sys/arch/i386/include/psl.h index 78b2a1a061b..f9dcb72032d 100644 --- a/sys/arch/i386/include/psl.h +++ b/sys/arch/i386/include/psl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psl.h,v 1.11 2000/08/05 22:07:32 niklas Exp $ */ +/* $OpenBSD: psl.h,v 1.12 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: psl.h,v 1.30 1996/05/13 01:28:05 mycroft Exp $ */ /*- @@ -84,7 +84,7 @@ */ struct intrhand { - int (*ih_fun) __P((void *)); + int (*ih_fun)(void *); void *ih_arg; u_long ih_count; struct intrhand *ih_next; diff --git a/sys/arch/i386/include/rbus_machdep.h b/sys/arch/i386/include/rbus_machdep.h index 7bb855d1589..2808e44599c 100644 --- a/sys/arch/i386/include/rbus_machdep.h +++ b/sys/arch/i386/include/rbus_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rbus_machdep.h,v 1.1 2000/04/08 05:50:50 aaron Exp $ */ +/* $OpenBSD: rbus_machdep.h,v 1.2 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: rbus_machdep.h,v 1.2 1999/10/15 06:43:05 haya Exp $ */ /* @@ -37,8 +37,8 @@ struct pci_attach_args; /* XXX */ -void _bus_space_unmap __P((bus_space_tag_t, bus_space_handle_t, - bus_size_t, bus_addr_t *)); +void _bus_space_unmap(bus_space_tag_t, bus_space_handle_t, + bus_size_t, bus_addr_t *); #define md_space_map(bt, physaddr, size, flags, bshp) \ _bus_space_map((bt), (physaddr), (size), (flags), (bshp)) @@ -47,7 +47,7 @@ void _bus_space_unmap __P((bus_space_tag_t, bus_space_handle_t, _bus_space_unmap((bt), (bsh), (size), (adrp)) -rbus_tag_t rbus_pccbb_parent_io __P((struct pci_attach_args *pa)); -rbus_tag_t rbus_pccbb_parent_mem __P((struct pci_attach_args *pa)); +rbus_tag_t rbus_pccbb_parent_io(struct pci_attach_args *pa); +rbus_tag_t rbus_pccbb_parent_mem(struct pci_attach_args *pa); #endif /* _ARCH_I386_I386_RBUS_MACHDEP_H_ */ diff --git a/sys/arch/i386/include/segments.h b/sys/arch/i386/include/segments.h index df535490c22..d2bbca3c2c2 100644 --- a/sys/arch/i386/include/segments.h +++ b/sys/arch/i386/include/segments.h @@ -1,4 +1,4 @@ -/* $OpenBSD: segments.h,v 1.8 2000/12/06 17:18:58 deraadt Exp $ */ +/* $OpenBSD: segments.h,v 1.9 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: segments.h,v 1.23 1996/02/01 22:31:03 mycroft Exp $ */ /*- @@ -132,10 +132,10 @@ extern union descriptor gdt[], ldt[]; extern struct gate_descriptor idt_region[]; extern struct gate_descriptor *idt; -void setgate __P((struct gate_descriptor *, void *, int, int, int, int)); -void setregion __P((struct region_descriptor *, void *, size_t)); -void setsegment __P((struct segment_descriptor *, void *, size_t, int, int, - int, int)); +void setgate(struct gate_descriptor *, void *, int, int, int, int); +void setregion(struct region_descriptor *, void *, size_t); +void setsegment(struct segment_descriptor *, void *, size_t, int, int, + int, int); #endif /* _KERNEL */ #endif /* !_LOCORE */ diff --git a/sys/arch/i386/include/svr4_machdep.h b/sys/arch/i386/include/svr4_machdep.h index cc77173d17b..17926ef3cfc 100644 --- a/sys/arch/i386/include/svr4_machdep.h +++ b/sys/arch/i386/include/svr4_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: svr4_machdep.h,v 1.6 1997/11/11 22:53:41 deraadt Exp $ */ +/* $OpenBSD: svr4_machdep.h,v 1.7 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: svr4_machdep.h,v 1.5 1995/03/31 02:51:37 christos Exp $ */ /* @@ -70,9 +70,9 @@ typedef struct { struct svr4_ucontext; #ifdef _KERNEL -void svr4_getcontext __P((struct proc *, struct svr4_ucontext *, int, int)); -int svr4_setcontext __P((struct proc *, struct svr4_ucontext *)); -void svr4_sendsig __P((sig_t, int, int, u_long, int, union sigval)); +void svr4_getcontext(struct proc *, struct svr4_ucontext *, int, int); +int svr4_setcontext(struct proc *, struct svr4_ucontext *); +void svr4_sendsig(sig_t, int, int, u_long, int, union sigval); #endif typedef struct { diff --git a/sys/arch/i386/include/sysarch.h b/sys/arch/i386/include/sysarch.h index d4f84c09126..e2f3dfccc23 100644 --- a/sys/arch/i386/include/sysarch.h +++ b/sys/arch/i386/include/sysarch.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sysarch.h,v 1.3 2000/08/05 22:07:33 niklas Exp $ */ +/* $OpenBSD: sysarch.h,v 1.4 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: sysarch.h,v 1.8 1996/01/08 13:51:44 mycroft Exp $ */ #ifndef _I386_SYSARCH_H_ @@ -39,12 +39,12 @@ struct i386_set_ioperm_args { }; #ifndef _KERNEL -int i386_get_ldt __P((int, union descriptor *, int)); -int i386_set_ldt __P((int, union descriptor *, int)); -int i386_iopl __P((int)); -int i386_get_ioperm __P((u_long *)); -int i386_set_ioperm __P((u_long *)); -int sysarch __P((int, char *)); +int i386_get_ldt(int, union descriptor *, int); +int i386_set_ldt(int, union descriptor *, int); +int i386_iopl(int); +int i386_get_ioperm(u_long *); +int i386_set_ioperm(u_long *); +int sysarch(int, char *); #endif #endif /* !_I386_SYSARCH_H_ */ diff --git a/sys/arch/i386/include/vm86.h b/sys/arch/i386/include/vm86.h index f8a9f0d7c20..e69229bea6a 100644 --- a/sys/arch/i386/include/vm86.h +++ b/sys/arch/i386/include/vm86.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vm86.h,v 1.7 1996/05/30 09:30:11 deraadt Exp $ */ +/* $OpenBSD: vm86.h,v 1.8 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: vm86.h,v 1.8 1996/05/03 19:26:32 christos Exp $ */ #undef VM86_USE_VIF @@ -81,15 +81,15 @@ struct vm86_struct { #define VCPU_586 5 #ifdef _KERNEL -int i386_vm86 __P((struct proc *, char *, register_t *)); -void vm86_gpfault __P((struct proc *, int)); -void vm86_return __P((struct proc *, int)); -static __inline void clr_vif __P((struct proc *)); -static __inline void set_vif __P((struct proc *)); -static __inline void set_vflags __P((struct proc *, int)); -static __inline int get_vflags __P((struct proc *)); -static __inline void set_vflags_short __P((struct proc *, int)); -static __inline int get_vflags_short __P((struct proc *)); +int i386_vm86(struct proc *, char *, register_t *); +void vm86_gpfault(struct proc *, int); +void vm86_return(struct proc *, int); +static __inline void clr_vif(struct proc *); +static __inline void set_vif(struct proc *); +static __inline void set_vflags(struct proc *, int); +static __inline int get_vflags(struct proc *); +static __inline void set_vflags_short(struct proc *, int); +static __inline int get_vflags_short(struct proc *); static __inline void clr_vif(p) @@ -182,5 +182,5 @@ get_vflags_short(p) return (flags); } #else -int i386_vm86 __P((struct vm86_struct *vmcp)); +int i386_vm86(struct vm86_struct *vmcp); #endif diff --git a/sys/arch/i386/isa/ahc_isa.c b/sys/arch/i386/isa/ahc_isa.c index 7be50b00ead..1a6b16452e3 100644 --- a/sys/arch/i386/isa/ahc_isa.c +++ b/sys/arch/i386/isa/ahc_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahc_isa.c,v 1.6 2002/02/16 04:36:32 smurph Exp $ */ +/* $OpenBSD: ahc_isa.c,v 1.7 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: ahc_isa.c,v 1.5 1996/10/21 22:27:39 thorpej Exp $ */ /* @@ -113,13 +113,13 @@ #define AHC_ISA_PRIMING_VID(index) (AHC_ISA_VID + (index)) #define AHC_ISA_PRIMING_PID(index) (AHC_ISA_PID + (index)) -int ahc_isa_irq __P((bus_space_tag_t, bus_space_handle_t)); -int ahc_isa_idstring __P((bus_space_tag_t, bus_space_handle_t, char *)); -int ahc_isa_match __P((struct isa_attach_args *, bus_addr_t)); +int ahc_isa_irq(bus_space_tag_t, bus_space_handle_t); +int ahc_isa_idstring(bus_space_tag_t, bus_space_handle_t, char *); +int ahc_isa_match(struct isa_attach_args *, bus_addr_t); -int ahc_isa_probe __P((struct device *, void *, void *)); -void ahc_isa_attach __P((struct device *, struct device *, void *)); -void aha2840_load_seeprom __P((struct ahc_softc *ahc)); +int ahc_isa_probe(struct device *, void *, void *); +void ahc_isa_attach(struct device *, struct device *, void *); +void aha2840_load_seeprom(struct ahc_softc *ahc); struct cfattach ahc_isa_ca = { sizeof(struct ahc_softc), ahc_isa_probe, ahc_isa_attach diff --git a/sys/arch/i386/isa/clock.c b/sys/arch/i386/isa/clock.c index 1c7c26116a8..489a9874593 100644 --- a/sys/arch/i386/isa/clock.c +++ b/sys/arch/i386/isa/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.24 2001/09/21 20:38:42 mickey Exp $ */ +/* $OpenBSD: clock.c,v 1.25 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: clock.c,v 1.39 1996/05/12 23:11:54 mycroft Exp $ */ /*- @@ -115,11 +115,11 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #define __BROKEN_INDIRECT_CONFIG /* XXX */ #ifdef __BROKEN_INDIRECT_CONFIG -int sysbeepmatch __P((struct device *, void *, void *)); +int sysbeepmatch(struct device *, void *, void *); #else -int sysbeepmatch __P((struct device *, struct cfdata *, void *)); +int sysbeepmatch(struct device *, struct cfdata *, void *); #endif -void sysbeepattach __P((struct device *, struct device *, void *)); +void sysbeepattach(struct device *, struct device *, void *); struct cfattach sysbeep_ca = { sizeof(struct device), sysbeepmatch, sysbeepattach @@ -133,20 +133,20 @@ static int ppi_attached; static pcppi_tag_t ppicookie; #endif /* PCPPI */ -void spinwait __P((int)); -void findcpuspeed __P((void)); -int clockintr __P((void *)); -int gettick __P((void)); -void sysbeep __P((int, int)); -int rtcget __P((mc_todregs *)); -void rtcput __P((mc_todregs *)); -int hexdectodec __P((int)); -int dectohexdec __P((int)); -int rtcintr __P((void *)); -void rtcdrain __P((void *)); - -u_int mc146818_read __P((void *, u_int)); -void mc146818_write __P((void *, u_int, u_int)); +void spinwait(int); +void findcpuspeed(void); +int clockintr(void *); +int gettick(void); +void sysbeep(int, int); +int rtcget(mc_todregs *); +void rtcput(mc_todregs *); +int hexdectodec(int); +int dectohexdec(int); +int rtcintr(void *); +void rtcdrain(void *); + +u_int mc146818_read(void *, u_int); +void mc146818_write(void *, u_int, u_int); #if defined(I586_CPU) || defined(I686_CPU) int pentium_mhz; @@ -483,7 +483,7 @@ static int timeset; * check whether the CMOS layout is "standard"-like (ie, not PS/2-like), * to be called at splclock() */ -int cmoscheck __P((void)); +int cmoscheck(void); int cmoscheck() { @@ -510,7 +510,7 @@ int rtc_update_century = 0; * into full width. * Being here, deal with the CMOS century byte. */ -int clock_expandyear __P((int)); +int clock_expandyear(int); int clock_expandyear(clockyear) int clockyear; diff --git a/sys/arch/i386/isa/isa_machdep.c b/sys/arch/i386/isa/isa_machdep.c index 6347d5ee698..87463b342c8 100644 --- a/sys/arch/i386/isa/isa_machdep.c +++ b/sys/arch/i386/isa/isa_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.c,v 1.44 2001/12/06 21:09:13 niklas Exp $ */ +/* $OpenBSD: isa_machdep.c,v 1.45 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $ */ #define ISA_DMA_STATS @@ -150,43 +150,43 @@ extern vm_offset_t avail_end; #define IDTVEC(name) __CONCAT(X,name) /* default interrupt vector table entries */ -typedef int (*vector) __P((void)); +typedef int (*vector)(void); extern vector IDTVEC(intr)[]; -void isa_strayintr __P((int)); -void intr_calculatemasks __P((void)); -int fakeintr __P((void *)); +void isa_strayintr(int); +void intr_calculatemasks(void); +int fakeintr(void *); #if NISADMA > 0 -int _isa_bus_dmamap_create __P((bus_dma_tag_t, bus_size_t, int, - bus_size_t, bus_size_t, int, bus_dmamap_t *)); -void _isa_bus_dmamap_destroy __P((bus_dma_tag_t, bus_dmamap_t)); -int _isa_bus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); -int _isa_bus_dmamap_load_mbuf __P((bus_dma_tag_t, bus_dmamap_t, - struct mbuf *, int)); -int _isa_bus_dmamap_load_uio __P((bus_dma_tag_t, bus_dmamap_t, - struct uio *, int)); -int _isa_bus_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int)); -void _isa_bus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t)); -void _isa_bus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t, - bus_addr_t, bus_size_t, int)); - -int _isa_bus_dmamem_alloc __P((bus_dma_tag_t, bus_size_t, bus_size_t, - bus_size_t, bus_dma_segment_t *, int, int *, int)); -void _isa_bus_dmamem_free __P((bus_dma_tag_t, - bus_dma_segment_t *, int)); -int _isa_bus_dmamem_map __P((bus_dma_tag_t, bus_dma_segment_t *, - int, size_t, caddr_t *, int)); -void _isa_bus_dmamem_unmap __P((bus_dma_tag_t, caddr_t, size_t)); -paddr_t _isa_bus_dmamem_mmap __P((bus_dma_tag_t, bus_dma_segment_t *, - int, off_t, int, int)); - -int _isa_dma_check_buffer __P((void *, bus_size_t, int, bus_size_t, - struct proc *)); -int _isa_dma_alloc_bouncebuf __P((bus_dma_tag_t, bus_dmamap_t, - bus_size_t, int)); -void _isa_dma_free_bouncebuf __P((bus_dma_tag_t, bus_dmamap_t)); +int _isa_bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, + bus_size_t, bus_size_t, int, bus_dmamap_t *); +void _isa_bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t); +int _isa_bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int); +int _isa_bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t, + struct mbuf *, int); +int _isa_bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t, + struct uio *, int); +int _isa_bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int); +void _isa_bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t); +void _isa_bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, + bus_addr_t, bus_size_t, int); + +int _isa_bus_dmamem_alloc(bus_dma_tag_t, bus_size_t, bus_size_t, + bus_size_t, bus_dma_segment_t *, int, int *, int); +void _isa_bus_dmamem_free(bus_dma_tag_t, + bus_dma_segment_t *, int); +int _isa_bus_dmamem_map(bus_dma_tag_t, bus_dma_segment_t *, + int, size_t, caddr_t *, int); +void _isa_bus_dmamem_unmap(bus_dma_tag_t, caddr_t, size_t); +paddr_t _isa_bus_dmamem_mmap(bus_dma_tag_t, bus_dma_segment_t *, + int, off_t, int, int); + +int _isa_dma_check_buffer(void *, bus_size_t, int, bus_size_t, + struct proc *); +int _isa_dma_alloc_bouncebuf(bus_dma_tag_t, bus_dmamap_t, + bus_size_t, int); +void _isa_dma_free_bouncebuf(bus_dma_tag_t, bus_dmamap_t); /* * Entry points for ISA DMA. These are mostly wrappers around @@ -493,7 +493,7 @@ isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg, ih_what) int irq; int type; int level; - int (*ih_fun) __P((void *)); + int (*ih_fun)(void *); void *ih_arg; char *ih_what; { diff --git a/sys/arch/i386/isa/isa_machdep.h b/sys/arch/i386/isa/isa_machdep.h index 71f15937a5e..4886c9e21fb 100644 --- a/sys/arch/i386/isa/isa_machdep.h +++ b/sys/arch/i386/isa/isa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.h,v 1.15 1999/01/13 07:26:00 niklas Exp $ */ +/* $OpenBSD: isa_machdep.h,v 1.16 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: isa_machdep.h,v 1.7 1997/06/06 23:28:42 thorpej Exp $ */ /*- @@ -105,13 +105,13 @@ struct isabus_attach_args; /* XXX */ /* * Functions provided to machine-independent ISA code. */ -void isa_attach_hook __P((struct device *, struct device *, - struct isabus_attach_args *)); -int isa_intr_alloc __P((isa_chipset_tag_t, int, int, int *)); -int isa_intr_check __P((isa_chipset_tag_t, int, int)); +void isa_attach_hook(struct device *, struct device *, + struct isabus_attach_args *); +int isa_intr_alloc(isa_chipset_tag_t, int, int, int *); +int isa_intr_check(isa_chipset_tag_t, int, int); void *isa_intr_establish __P((isa_chipset_tag_t ic, int irq, int type, int level, int (*ih_fun)(void *), void *ih_arg, char *ih_what)); -void isa_intr_disestablish __P((isa_chipset_tag_t ic, void *handler)); +void isa_intr_disestablish(isa_chipset_tag_t ic, void *handler); /* * ALL OF THE FOLLOWING ARE MACHINE-DEPENDENT, AND SHOULD NOT BE USED @@ -219,6 +219,6 @@ extern u_long atdevbase; /* kernel virtual address of "hole" */ /* * Miscellanous functions. */ -void sysbeep __P((int, int)); /* beep with the system speaker */ +void sysbeep(int, int); /* beep with the system speaker */ #endif /* _I386_ISA_MACHDEP_H_ XXX */ diff --git a/sys/arch/i386/isa/isapnp_machdep.h b/sys/arch/i386/isa/isapnp_machdep.h index c719afdabe7..0d80a42ff29 100644 --- a/sys/arch/i386/isa/isapnp_machdep.h +++ b/sys/arch/i386/isa/isapnp_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isapnp_machdep.h,v 1.1 1997/12/21 14:44:34 downsj Exp $ */ +/* $OpenBSD: isapnp_machdep.h,v 1.2 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: isapnp_machdep.h,v 1.2 1997/10/04 17:32:32 thorpej Exp $ */ /*- @@ -70,7 +70,7 @@ /* * Functions provided to machine-independent ISA PnP code. */ -int isapnp_map __P((struct isapnp_softc *)); -void isapnp_unmap __P((struct isapnp_softc *)); -int isapnp_map_readport __P((struct isapnp_softc *)); -void isapnp_unmap_readport __P((struct isapnp_softc *)); +int isapnp_map(struct isapnp_softc *); +void isapnp_unmap(struct isapnp_softc *); +int isapnp_map_readport(struct isapnp_softc *); +void isapnp_unmap_readport(struct isapnp_softc *); diff --git a/sys/arch/i386/isa/joy.c b/sys/arch/i386/isa/joy.c index 2a144065e62..032377c2118 100644 --- a/sys/arch/i386/isa/joy.c +++ b/sys/arch/i386/isa/joy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: joy.c,v 1.8 1999/01/13 07:26:01 niklas Exp $ */ +/* $OpenBSD: joy.c,v 1.9 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: joy.c,v 1.3 1996/05/05 19:46:15 christos Exp $ */ /*- @@ -49,7 +49,7 @@ #include <i386/isa/timerreg.h> #include <i386/isa/joyreg.h> -static int joy_get_tick __P((void)); +static int joy_get_tick(void); struct cfdriver joy_cd = { NULL, "joy", DV_DULL diff --git a/sys/arch/i386/isa/joy_isa.c b/sys/arch/i386/isa/joy_isa.c index 9b6442df21b..5f4a1bef5bc 100644 --- a/sys/arch/i386/isa/joy_isa.c +++ b/sys/arch/i386/isa/joy_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: joy_isa.c,v 1.3 1999/01/13 07:26:01 niklas Exp $ */ +/* $OpenBSD: joy_isa.c,v 1.4 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: joy.c,v 1.3 1996/05/05 19:46:15 christos Exp $ */ /*- @@ -49,8 +49,8 @@ #include <i386/isa/timerreg.h> #include <i386/isa/joyreg.h> -int joy_isa_probe __P((struct device *, void *, void *)); -void joy_isa_attach __P((struct device *, struct device *, void *)); +int joy_isa_probe(struct device *, void *, void *); +void joy_isa_attach(struct device *, struct device *, void *); struct cfattach joy_isa_ca = { sizeof(struct joy_softc), joy_isa_probe, joy_isa_attach diff --git a/sys/arch/i386/isa/joy_isapnp.c b/sys/arch/i386/isa/joy_isapnp.c index 0916c828b8b..43bcc837564 100644 --- a/sys/arch/i386/isa/joy_isapnp.c +++ b/sys/arch/i386/isa/joy_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: joy_isapnp.c,v 1.3 1999/01/13 07:26:01 niklas Exp $ */ +/* $OpenBSD: joy_isapnp.c,v 1.4 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: joy.c,v 1.3 1996/05/05 19:46:15 christos Exp $ */ /*- @@ -49,8 +49,8 @@ #include <i386/isa/timerreg.h> #include <i386/isa/joyreg.h> -int joy_isapnp_probe __P((struct device *, void *, void *)); -void joy_isapnp_attach __P((struct device *, struct device *, void *)); +int joy_isapnp_probe(struct device *, void *, void *); +void joy_isapnp_attach(struct device *, struct device *, void *); struct cfattach joy_isapnp_ca = { sizeof(struct joy_softc), joy_isapnp_probe, joy_isapnp_attach diff --git a/sys/arch/i386/isa/joyreg.h b/sys/arch/i386/isa/joyreg.h index ccce2ec207e..d12bc61754e 100644 --- a/sys/arch/i386/isa/joyreg.h +++ b/sys/arch/i386/isa/joyreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: joyreg.h,v 1.2 1999/01/13 07:26:01 niklas Exp $ */ +/* $OpenBSD: joyreg.h,v 1.3 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: joy.c,v 1.3 1996/05/05 19:46:15 christos Exp $ */ /*- @@ -66,5 +66,5 @@ struct joy_softc { int timeout[2]; }; -int joyopen __P((dev_t, int, int, struct proc *)); -int joyclose __P((dev_t, int, int, struct proc *)); +int joyopen(dev_t, int, int, struct proc *); +int joyclose(dev_t, int, int, struct proc *); diff --git a/sys/arch/i386/isa/lms.c b/sys/arch/i386/isa/lms.c index c397c3367d5..7edde899115 100644 --- a/sys/arch/i386/isa/lms.c +++ b/sys/arch/i386/isa/lms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lms.c,v 1.17 2001/08/07 19:24:27 jason Exp $ */ +/* $OpenBSD: lms.c,v 1.18 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: lms.c,v 1.38 2000/01/08 02:57:25 takemura Exp $ */ /*- @@ -57,17 +57,17 @@ struct lms_softc { /* driver status information */ struct device *sc_wsmousedev; }; -int lmsprobe __P((struct device *, void *, void *)); -void lmsattach __P((struct device *, struct device *, void *)); -int lmsintr __P((void *)); +int lmsprobe(struct device *, void *, void *); +void lmsattach(struct device *, struct device *, void *); +int lmsintr(void *); struct cfattach lms_ca = { sizeof(struct lms_softc), lmsprobe, lmsattach }; -int lms_enable __P((void *)); -int lms_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); -void lms_disable __P((void *)); +int lms_enable(void *); +int lms_ioctl(void *, u_long, caddr_t, int, struct proc *); +void lms_disable(void *); const struct wsmouse_accessops lms_accessops = { lms_enable, diff --git a/sys/arch/i386/isa/mms.c b/sys/arch/i386/isa/mms.c index c622e672e72..1b84aecf965 100644 --- a/sys/arch/i386/isa/mms.c +++ b/sys/arch/i386/isa/mms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mms.c,v 1.15 2001/08/07 19:24:27 jason Exp $ */ +/* $OpenBSD: mms.c,v 1.16 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: mms.c,v 1.35 2000/01/08 02:57:25 takemura Exp $ */ /*- @@ -54,17 +54,17 @@ struct mms_softc { /* driver status information */ struct device *sc_wsmousedev; }; -int mmsprobe __P((struct device *, void *, void *)); -void mmsattach __P((struct device *, struct device *, void *)); -int mmsintr __P((void *)); +int mmsprobe(struct device *, void *, void *); +void mmsattach(struct device *, struct device *, void *); +int mmsintr(void *); struct cfattach mms_ca = { sizeof(struct mms_softc), mmsprobe, mmsattach }; -int mms_enable __P((void *)); -int mms_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); -void mms_disable __P((void *)); +int mms_enable(void *); +int mms_ioctl(void *, u_long, caddr_t, int, struct proc *); +void mms_disable(void *); const struct wsmouse_accessops mms_accessops = { mms_enable, diff --git a/sys/arch/i386/isa/npx.c b/sys/arch/i386/isa/npx.c index ff321001a9c..a976ea241b1 100644 --- a/sys/arch/i386/isa/npx.c +++ b/sys/arch/i386/isa/npx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: npx.c,v 1.24 2002/02/18 07:58:39 ericj Exp $ */ +/* $OpenBSD: npx.c,v 1.25 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: npx.c,v 1.57 1996/05/12 23:12:24 mycroft Exp $ */ #if 0 @@ -105,19 +105,19 @@ #define clts() __asm("clts") #define stts() lcr0(rcr0() | CR0_TS) -int npxdna __P((struct proc *)); -void npxexit __P((void)); -int npxintr __P((void *)); -static int npxprobe1 __P((struct isa_attach_args *)); -static void npxsave1 __P((void)); +int npxdna(struct proc *); +void npxexit(void); +int npxintr(void *); +static int npxprobe1(struct isa_attach_args *); +static void npxsave1(void); struct npx_softc { struct device sc_dev; void *sc_ih; }; -int npxprobe __P((struct device *, void *, void *)); -void npxattach __P((struct device *, struct device *, void *)); +int npxprobe(struct device *, void *, void *); +void npxattach(struct device *, struct device *, void *); struct cfattach npx_ca = { sizeof(struct npx_softc), npxprobe, npxattach @@ -150,7 +150,7 @@ extern int i386_fpu_fdivbug; * interrupts. We'll still need a special exception 16 handler. The busy * latch stuff in probintr() can be moved to npxprobe(). */ -void probeintr __P((void)); +void probeintr(void); asm (".text\n\t" "_probeintr:\n\t" "ss\n\t" @@ -164,7 +164,7 @@ asm (".text\n\t" "popl %eax\n\t" "iret\n\t"); -void probetrap __P((void)); +void probetrap(void); asm (".text\n\t" "_probetrap:\n\t" "ss\n\t" @@ -305,7 +305,7 @@ npxprobe(parent, match, aux) return (result); } -int npx586bug1 __P((int, int)); +int npx586bug1(int, int); asm (".text\n\t" "_npx586bug1:\n\t" "fildl 4(%esp) # x\n\t" diff --git a/sys/arch/i386/isa/pccom.c b/sys/arch/i386/isa/pccom.c index c67edf3d455..79b848d80dd 100644 --- a/sys/arch/i386/isa/pccom.c +++ b/sys/arch/i386/isa/pccom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccom.c,v 1.41 2002/01/30 20:45:34 nordin Exp $ */ +/* $OpenBSD: pccom.c,v 1.42 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */ /* @@ -107,17 +107,17 @@ cdev_decl(com); bdev_decl(com); -static u_char tiocm_xxx2mcr __P((int)); +static u_char tiocm_xxx2mcr(int); -void pccom_xr16850_fifo_init __P((bus_space_tag_t, bus_space_handle_t)); +void pccom_xr16850_fifo_init(bus_space_tag_t, bus_space_handle_t); /* * XXX the following two cfattach structs should be different, and possibly * XXX elsewhere. */ -int comprobe __P((struct device *, void *, void *)); -void comattach __P((struct device *, struct device *, void *)); -void compwroff __P((struct com_softc *)); +int comprobe(struct device *, void *, void *); +void comattach(struct device *, struct device *, void *); +void compwroff(struct com_softc *); #if NPCCOM_ISA struct cfattach pccom_isa_ca = { @@ -141,7 +141,7 @@ struct cfdriver pccom_cd = { NULL, "pccom", DV_TTY }; -void cominit __P((bus_space_tag_t, bus_space_handle_t, int)); +void cominit(bus_space_tag_t, bus_space_handle_t, int); #ifndef CONSPEED #define CONSPEED B9600 @@ -171,8 +171,8 @@ static bus_space_tag_t com_kgdb_iot; static bus_space_handle_t com_kgdb_ioh; static int com_kgdb_attached; -int com_kgdb_getc __P((void *)); -void com_kgdb_putc __P((void *, int)); +int com_kgdb_getc(void *); +void com_kgdb_putc(void *, int); #endif /* KGDB */ #define DEVUNIT(x) (minor(x) & 0x7f) diff --git a/sys/arch/i386/isa/pccomvar.h b/sys/arch/i386/isa/pccomvar.h index 80fa32c9967..781b59f0752 100644 --- a/sys/arch/i386/isa/pccomvar.h +++ b/sys/arch/i386/isa/pccomvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pccomvar.h,v 1.13 2001/08/08 19:07:17 mickey Exp $ */ +/* $OpenBSD: pccomvar.h,v 1.14 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: comvar.h,v 1.5 1996/05/05 19:50:47 christos Exp $ */ /* @@ -105,45 +105,45 @@ struct com_softc { int sc_tbc; /* power management hooks */ - int (*enable) __P((struct com_softc *)); - void (*disable) __P((struct com_softc *)); + int (*enable)(struct com_softc *); + void (*disable)(struct com_softc *); int enabled; }; -int comprobe1 __P((bus_space_tag_t, bus_space_handle_t)); -void cominit __P((bus_space_tag_t, bus_space_handle_t, int)); -int comstop __P((struct tty *, int)); -int comintr __P((void *)); -int com_detach __P((struct device *, int)); -int com_activate __P((struct device *, enum devact)); +int comprobe1(bus_space_tag_t, bus_space_handle_t); +void cominit(bus_space_tag_t, bus_space_handle_t, int); +int comstop(struct tty *, int); +int comintr(void *); +int com_detach(struct device *, int); +int com_activate(struct device *, enum devact); #ifdef COM_HAYESP -int comprobeHAYESP __P((bus_space_handle_t hayespioh, struct com_softc *sc)); +int comprobeHAYESP(bus_space_handle_t hayespioh, struct com_softc *sc); #endif -void comdiag __P((void *)); -int comspeed __P((long, long)); -int comparam __P((struct tty *, struct termios *)); -void comstart __P((struct tty *)); -void comsoft __P((void)); -int comhwiflow __P((struct tty *, int)); -void com_raisedtr __P((void *)); +void comdiag(void *); +int comspeed(long, long); +int comparam(struct tty *, struct termios *); +void comstart(struct tty *); +void comsoft(void); +int comhwiflow(struct tty *, int); +void com_raisedtr(void *); struct consdev; -void comcnprobe __P((struct consdev *)); -void comcninit __P((struct consdev *)); -int comcngetc __P((dev_t)); -void comcnputc __P((dev_t, int)); -void comcnpollc __P((dev_t, int)); -int com_common_getc __P((bus_space_tag_t, bus_space_handle_t)); -void com_common_putc __P((bus_space_tag_t, bus_space_handle_t, int)); +void comcnprobe(struct consdev *); +void comcninit(struct consdev *); +int comcngetc(dev_t); +void comcnputc(dev_t, int); +void comcnpollc(dev_t, int); +int com_common_getc(bus_space_tag_t, bus_space_handle_t); +void com_common_putc(bus_space_tag_t, bus_space_handle_t, int); #if defined(DDB) || defined(KGDB) -void com_enable_debugport __P((struct com_softc *)); +void com_enable_debugport(struct com_softc *); #endif /* DDB || KGDB */ #ifdef KGDB -int com_kgdb_attach __P((bus_space_tag_t, int, int, int, tcflag_t)); -int kgdbintr __P((void *)); +int com_kgdb_attach(bus_space_tag_t, int, int, int, tcflag_t); +int kgdbintr(void *); #endif /* KGDB */ extern int comconsaddr; diff --git a/sys/arch/i386/isa/pccons.c b/sys/arch/i386/isa/pccons.c index ce9e6a98eb7..6f3e017d978 100644 --- a/sys/arch/i386/isa/pccons.c +++ b/sys/arch/i386/isa/pccons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccons.c,v 1.48 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: pccons.c,v 1.49 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: pccons.c,v 1.99.4.1 1996/06/04 20:03:53 cgd Exp $ */ /*- @@ -129,11 +129,11 @@ struct pc_softc { struct tty *sc_tty; }; -int pcprobe __P((struct device *, void *, void *)); -void pcattach __P((struct device *, struct device *, void *)); -int pcintr __P((void *)); -static void screen_restore __P((int)); -static void screen_blank __P((void *)); +int pcprobe(struct device *, void *, void *); +void pcattach(struct device *, struct device *, void *); +int pcintr(void *); +static void screen_restore(int); +static void screen_blank(void *); struct cfattach pc_ca = { sizeof(struct pc_softc), pcprobe, pcattach @@ -149,36 +149,36 @@ struct cfdriver pc_cd = { static unsigned int addr_6845 = MONO_BASE; -void pcinit __P((void)); -char *sget __P((void)); -void sput __P((u_char *, int)); +void pcinit(void); +char *sget(void); +void sput(u_char *, int); #ifdef XSERVER -void pc_xmode_on __P((void)); -void pc_xmode_off __P((void)); +void pc_xmode_on(void); +void pc_xmode_off(void); #endif -void pcstart __P((struct tty *)); -int pcparam __P((struct tty *, struct termios *)); +void pcstart(struct tty *); +int pcparam(struct tty *, struct termios *); -int kbd_cmd __P((u_char, u_char)); -void set_cursor_shape __P((void)); +int kbd_cmd(u_char, u_char); +void set_cursor_shape(void); #ifdef XSERVER -void get_cursor_shape __P((void)); +void get_cursor_shape(void); #endif -void do_async_update __P((void *)); -void async_update __P((void)); - -static __inline int kbd_wait_output __P((void)); -static __inline int kbd_wait_input __P((void)); -static __inline void kbd_flush_input __P((void)); -static u_char kbc_get8042cmd __P((void)); -static int kbc_put8042cmd __P((u_char)); - -void pccnprobe __P((struct consdev *)); -void pccninit __P((struct consdev *)); -void pccnputc __P((dev_t, char)); -int pccngetc __P((dev_t)); -void pccnpollc __P((dev_t, int)); +void do_async_update(void *); +void async_update(void); + +static __inline int kbd_wait_output(void); +static __inline int kbd_wait_input(void); +static __inline void kbd_flush_input(void); +static u_char kbc_get8042cmd(void); +static int kbc_put8042cmd(u_char); + +void pccnprobe(struct consdev *); +void pccninit(struct consdev *); +void pccnputc(dev_t, char); +int pccngetc(dev_t); +void pccnpollc(dev_t, int); /* wait 7+ us for keyboard controller; ~1.25us per inb() */ #define KBD_DELAY \ diff --git a/sys/arch/i386/pci/amd756.c b/sys/arch/i386/pci/amd756.c index 5a18cbb5ba3..bd86f45dd1d 100644 --- a/sys/arch/i386/pci/amd756.c +++ b/sys/arch/i386/pci/amd756.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amd756.c,v 1.2 2001/01/25 00:07:40 mickey Exp $ */ +/* $OpenBSD: amd756.c,v 1.3 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD$ */ /*- @@ -89,13 +89,13 @@ struct viper_handle { pcitag_t ph_tag; }; -int amd756_getclink __P((pciintr_icu_handle_t, int, int *)); -int amd756_get_intr __P((pciintr_icu_handle_t, int, int *)); -int amd756_set_intr __P((pciintr_icu_handle_t, int, int)); -int amd756_get_trigger __P((pciintr_icu_handle_t, int, int *)); -int amd756_set_trigger __P((pciintr_icu_handle_t, int, int)); +int amd756_getclink(pciintr_icu_handle_t, int, int *); +int amd756_get_intr(pciintr_icu_handle_t, int, int *); +int amd756_set_intr(pciintr_icu_handle_t, int, int); +int amd756_get_trigger(pciintr_icu_handle_t, int, int *); +int amd756_set_trigger(pciintr_icu_handle_t, int, int); #ifdef VIPER_DEBUG -static void amd756_pir_dump __P((struct viper_handle *)); +static void amd756_pir_dump(struct viper_handle *); #endif const struct pciintr_icu amd756_pci_icu = { diff --git a/sys/arch/i386/pci/opti82c558.c b/sys/arch/i386/pci/opti82c558.c index 4fc45b674c4..6a240fb13c0 100644 --- a/sys/arch/i386/pci/opti82c558.c +++ b/sys/arch/i386/pci/opti82c558.c @@ -1,4 +1,4 @@ -/* $OpenBSD: opti82c558.c,v 1.5 2001/01/25 00:07:40 mickey Exp $ */ +/* $OpenBSD: opti82c558.c,v 1.6 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: opti82c558.c,v 1.2 2000/07/18 11:24:09 soda Exp $ */ /*- @@ -82,11 +82,11 @@ #include <i386/pci/pcibiosvar.h> #include <i386/pci/opti82c558reg.h> -int opti82c558_getclink __P((pciintr_icu_handle_t, int, int *)); -int opti82c558_get_intr __P((pciintr_icu_handle_t, int, int *)); -int opti82c558_set_intr __P((pciintr_icu_handle_t, int, int)); -int opti82c558_get_trigger __P((pciintr_icu_handle_t, int, int *)); -int opti82c558_set_trigger __P((pciintr_icu_handle_t, int, int)); +int opti82c558_getclink(pciintr_icu_handle_t, int, int *); +int opti82c558_get_intr(pciintr_icu_handle_t, int, int *); +int opti82c558_set_intr(pciintr_icu_handle_t, int, int); +int opti82c558_get_trigger(pciintr_icu_handle_t, int, int *); +int opti82c558_set_trigger(pciintr_icu_handle_t, int, int); const struct pciintr_icu opti82c558_pci_icu = { opti82c558_getclink, diff --git a/sys/arch/i386/pci/opti82c700.c b/sys/arch/i386/pci/opti82c700.c index 9b9fb779383..07766921546 100644 --- a/sys/arch/i386/pci/opti82c700.c +++ b/sys/arch/i386/pci/opti82c700.c @@ -1,4 +1,4 @@ -/* $OpenBSD: opti82c700.c,v 1.5 2001/01/25 00:07:40 mickey Exp $ */ +/* $OpenBSD: opti82c700.c,v 1.6 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: opti82c700.c,v 1.2 2000/07/18 11:07:20 soda Exp $ */ /*- @@ -88,11 +88,11 @@ #define DPRINTF(arg) #endif -int opti82c700_getclink __P((pciintr_icu_handle_t, int, int *)); -int opti82c700_get_intr __P((pciintr_icu_handle_t, int, int *)); -int opti82c700_set_intr __P((pciintr_icu_handle_t, int, int)); -int opti82c700_get_trigger __P((pciintr_icu_handle_t, int, int *)); -int opti82c700_set_trigger __P((pciintr_icu_handle_t, int, int)); +int opti82c700_getclink(pciintr_icu_handle_t, int, int *); +int opti82c700_get_intr(pciintr_icu_handle_t, int, int *); +int opti82c700_set_intr(pciintr_icu_handle_t, int, int); +int opti82c700_get_trigger(pciintr_icu_handle_t, int, int *); +int opti82c700_set_trigger(pciintr_icu_handle_t, int, int); const struct pciintr_icu opti82c700_pci_icu = { opti82c700_getclink, @@ -107,9 +107,9 @@ struct opti82c700_handle { pcitag_t ph_tag; }; -int opti82c700_addr __P((int, int *, int *)); +int opti82c700_addr(int, int *, int *); #ifdef FIRESTARDEBUG -void opti82c700_pir_dump __P((struct opti82c700_handle *)); +void opti82c700_pir_dump(struct opti82c700_handle *); #endif int diff --git a/sys/arch/i386/pci/pchb.c b/sys/arch/i386/pci/pchb.c index 071f940b36f..8c30e8e1cf2 100644 --- a/sys/arch/i386/pci/pchb.c +++ b/sys/arch/i386/pci/pchb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pchb.c,v 1.28 2001/12/31 23:38:53 mickey Exp $ */ +/* $OpenBSD: pchb.c,v 1.29 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: pchb.c,v 1.6 1997/06/06 23:29:16 thorpej Exp $ */ /* @@ -115,10 +115,10 @@ struct pchb_softc { struct timeout sc_tmo; }; -int pchbmatch __P((struct device *, void *, void *)); -void pchbattach __P((struct device *, struct device *, void *)); +int pchbmatch(struct device *, void *, void *); +void pchbattach(struct device *, struct device *, void *); -int pchb_print __P((void *, const char *)); +int pchb_print(void *, const char *); struct cfattach pchb_ca = { sizeof(struct pchb_softc), pchbmatch, pchbattach @@ -128,7 +128,7 @@ struct cfdriver pchb_cd = { NULL, "pchb", DV_DULL }; -void pchb_rnd __P((void *v)); +void pchb_rnd(void *v); int pchbmatch(parent, match, aux) diff --git a/sys/arch/i386/pci/pci_addr_fixup.c b/sys/arch/i386/pci/pci_addr_fixup.c index 025e3c1e4d0..bda77df0a85 100644 --- a/sys/arch/i386/pci/pci_addr_fixup.c +++ b/sys/arch/i386/pci/pci_addr_fixup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_addr_fixup.c,v 1.12 2001/12/04 06:32:06 mickey Exp $ */ +/* $OpenBSD: pci_addr_fixup.c,v 1.13 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: pci_addr_fixup.c,v 1.7 2000/08/03 20:10:45 nathanw Exp $ */ /*- @@ -42,25 +42,24 @@ #include <i386/pci/pcibiosvar.h> -typedef int (*pciaddr_resource_manage_func_t) - __P((struct pcibios_softc *, pci_chipset_tag_t, pcitag_t, int, - struct extent *, int, bus_addr_t *, bus_size_t)); -void pciaddr_resource_manage __P((struct pcibios_softc *, - pci_chipset_tag_t, pcitag_t, pciaddr_resource_manage_func_t)); -void pciaddr_resource_reserve __P((struct pcibios_softc *, - pci_chipset_tag_t, pcitag_t)); -int pciaddr_do_resource_reserve __P((struct pcibios_softc *, +typedef int (*pciaddr_resource_manage_func_t)(struct pcibios_softc *, pci_chipset_tag_t, pcitag_t, int, + struct extent *, int, bus_addr_t *, bus_size_t); +void pciaddr_resource_manage(struct pcibios_softc *, + pci_chipset_tag_t, pcitag_t, pciaddr_resource_manage_func_t); +void pciaddr_resource_reserve(struct pcibios_softc *, + pci_chipset_tag_t, pcitag_t); +int pciaddr_do_resource_reserve(struct pcibios_softc *, pci_chipset_tag_t, pcitag_t, int, struct extent *, int, - bus_addr_t *, bus_size_t)); -void pciaddr_resource_allocate __P((struct pcibios_softc *, - pci_chipset_tag_t, pcitag_t)); -int pciaddr_do_resource_allocate __P((struct pcibios_softc *, + bus_addr_t *, bus_size_t); +void pciaddr_resource_allocate(struct pcibios_softc *, + pci_chipset_tag_t, pcitag_t); +int pciaddr_do_resource_allocate(struct pcibios_softc *, pci_chipset_tag_t, pcitag_t, int, struct extent *, int, bus_addr_t *, - bus_size_t)); -bus_addr_t pciaddr_ioaddr __P((u_int32_t)); -void pciaddr_print_devid __P((pci_chipset_tag_t, pcitag_t)); + bus_size_t); +bus_addr_t pciaddr_ioaddr(u_int32_t); +void pciaddr_print_devid(pci_chipset_tag_t, pcitag_t); -int pciaddr_device_is_agp __P((pci_chipset_tag_t, pcitag_t)); +int pciaddr_device_is_agp(pci_chipset_tag_t, pcitag_t); #define PCIADDR_MEM_START 0x0 #define PCIADDR_MEM_END 0xffffffff diff --git a/sys/arch/i386/pci/pci_intr_fixup.c b/sys/arch/i386/pci/pci_intr_fixup.c index 3d975586aa2..a5e2d5c9791 100644 --- a/sys/arch/i386/pci/pci_intr_fixup.c +++ b/sys/arch/i386/pci/pci_intr_fixup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_intr_fixup.c,v 1.21 2002/02/20 19:01:19 mickey Exp $ */ +/* $OpenBSD: pci_intr_fixup.c,v 1.22 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: pci_intr_fixup.c,v 1.10 2000/08/10 21:18:27 soda Exp $ */ /* @@ -126,18 +126,18 @@ pciintr_icu_handle_t pciintr_icu_handle; int pcibios_irqs_hint = PCIBIOS_IRQS_HINT; #endif -struct pciintr_link_map *pciintr_link_lookup __P((int)); -struct pcibios_intr_routing *pciintr_pir_lookup __P((int, int)); -int pciintr_bitmap_count_irq __P((int, int *)); +struct pciintr_link_map *pciintr_link_lookup(int); +struct pcibios_intr_routing *pciintr_pir_lookup(int, int); +int pciintr_bitmap_count_irq(int, int *); SIMPLEQ_HEAD(, pciintr_link_map) pciintr_link_map_list; const struct pciintr_icu_table { pci_vendor_id_t piit_vendor; pci_product_id_t piit_product; - int (*piit_init) __P((pci_chipset_tag_t, + int (*piit_init)(pci_chipset_tag_t, bus_space_tag_t, pcitag_t, pciintr_icu_tag_t *, - pciintr_icu_handle_t *)); + pciintr_icu_handle_t *); } pciintr_icu_table[] = { { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82371MX, piix_init }, @@ -181,7 +181,7 @@ const struct pciintr_icu_table { NULL }, }; -const struct pciintr_icu_table *pciintr_icu_lookup __P((pcireg_t)); +const struct pciintr_icu_table *pciintr_icu_lookup(pcireg_t); const struct pciintr_icu_table * pciintr_icu_lookup(id) diff --git a/sys/arch/i386/pci/pci_machdep.c b/sys/arch/i386/pci/pci_machdep.c index d0ea039a240..7ac9f5336d3 100644 --- a/sys/arch/i386/pci/pci_machdep.c +++ b/sys/arch/i386/pci/pci_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.c,v 1.22 2001/11/06 19:53:14 miod Exp $ */ +/* $OpenBSD: pci_machdep.c,v 1.23 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: pci_machdep.c,v 1.28 1997/06/06 23:29:17 thorpej Exp $ */ /*- @@ -486,7 +486,7 @@ void * pci_intr_establish(pc, ih, level, func, arg, what) pci_chipset_tag_t pc; pci_intr_handle_t ih; - int level, (*func) __P((void *)); + int level, (*func)(void *); void *arg; char *what; { diff --git a/sys/arch/i386/pci/pci_machdep.h b/sys/arch/i386/pci/pci_machdep.h index 911dc7f897a..553136a4529 100644 --- a/sys/arch/i386/pci/pci_machdep.h +++ b/sys/arch/i386/pci/pci_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.h,v 1.9 2001/08/25 10:13:29 art Exp $ */ +/* $OpenBSD: pci_machdep.h,v 1.10 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: pci_machdep.h,v 1.7 1997/06/06 23:29:18 thorpej Exp $ */ /* @@ -75,28 +75,28 @@ struct { * NOT TO BE USED DIRECTLY BY MACHINE INDEPENDENT CODE. */ extern int pci_mode; -int pci_mode_detect __P((void)); +int pci_mode_detect(void); /* * Functions provided to machine-independent PCI code. */ -void pci_attach_hook __P((struct device *, struct device *, - struct pcibus_attach_args *)); -int pci_bus_maxdevs __P((pci_chipset_tag_t, int)); -pcitag_t pci_make_tag __P((pci_chipset_tag_t, int, int, int)); -pcireg_t pci_conf_read __P((pci_chipset_tag_t, pcitag_t, int)); -void pci_conf_write __P((pci_chipset_tag_t, pcitag_t, int, - pcireg_t)); +void pci_attach_hook(struct device *, struct device *, + struct pcibus_attach_args *); +int pci_bus_maxdevs(pci_chipset_tag_t, int); +pcitag_t pci_make_tag(pci_chipset_tag_t, int, int, int); +pcireg_t pci_conf_read(pci_chipset_tag_t, pcitag_t, int); +void pci_conf_write(pci_chipset_tag_t, pcitag_t, int, + pcireg_t); struct pci_attach_args; -int pci_intr_map __P((struct pci_attach_args *, - pci_intr_handle_t *)); +int pci_intr_map(struct pci_attach_args *, + pci_intr_handle_t *); #define pci_intr_line(ih) ((ih).line) -const char *pci_intr_string __P((pci_chipset_tag_t, pci_intr_handle_t)); +const char *pci_intr_string(pci_chipset_tag_t, pci_intr_handle_t); void *pci_intr_establish __P((pci_chipset_tag_t, pci_intr_handle_t, int, int (*)(void *), void *, char *)); -void pci_intr_disestablish __P((pci_chipset_tag_t, void *)); -void pci_decompose_tag __P((pci_chipset_tag_t, pcitag_t, - int *, int *, int *)); +void pci_intr_disestablish(pci_chipset_tag_t, void *); +void pci_decompose_tag(pci_chipset_tag_t, pcitag_t, + int *, int *, int *); /* * Section 6.2.4, `Miscellaneous Functions' of the PIC Specification, diff --git a/sys/arch/i386/pci/pcib.c b/sys/arch/i386/pci/pcib.c index be4ef0b37b5..056f67fda5c 100644 --- a/sys/arch/i386/pci/pcib.c +++ b/sys/arch/i386/pci/pcib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcib.c,v 1.8 2001/01/27 04:59:40 mickey Exp $ */ +/* $OpenBSD: pcib.c,v 1.9 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: pcib.c,v 1.6 1997/06/06 23:29:16 thorpej Exp $ */ /*- @@ -56,10 +56,10 @@ #include <i386/pci/pcibiosvar.h> #endif -int pcibmatch __P((struct device *, void *, void *)); -void pcibattach __P((struct device *, struct device *, void *)); -void pcib_callback __P((struct device *)); -int pcib_print __P((void *, const char *)); +int pcibmatch(struct device *, void *, void *); +void pcibattach(struct device *, struct device *, void *); +void pcib_callback(struct device *); +int pcib_print(void *, const char *); struct cfattach pcib_ca = { sizeof(struct device), pcibmatch, pcibattach diff --git a/sys/arch/i386/pci/pcibios.c b/sys/arch/i386/pci/pcibios.c index 9de6e27fcab..b21383c977d 100644 --- a/sys/arch/i386/pci/pcibios.c +++ b/sys/arch/i386/pci/pcibios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcibios.c,v 1.24 2001/05/12 19:12:44 mickey Exp $ */ +/* $OpenBSD: pcibios.c,v 1.25 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: pcibios.c,v 1.5 2000/08/01 05:23:59 uch Exp $ */ /* @@ -122,18 +122,18 @@ int pcibios_flags = 0; struct bios32_entry pcibios_entry; struct bios32_entry_info pcibios_entry_info; -struct pcibios_intr_routing *pcibios_pir_init __P((struct pcibios_softc *)); +struct pcibios_intr_routing *pcibios_pir_init(struct pcibios_softc *); -int pcibios_get_status __P((struct pcibios_softc *, +int pcibios_get_status(struct pcibios_softc *, u_int32_t *, u_int32_t *, u_int32_t *, - u_int32_t *, u_int32_t *, u_int32_t *, u_int32_t *)); -int pcibios_get_intr_routing __P((struct pcibios_softc *, - struct pcibios_intr_routing *, int *, u_int16_t *)); + u_int32_t *, u_int32_t *, u_int32_t *, u_int32_t *); +int pcibios_get_intr_routing(struct pcibios_softc *, + struct pcibios_intr_routing *, int *, u_int16_t *); -int pcibios_return_code __P((struct pcibios_softc *, u_int16_t, const char *)); +int pcibios_return_code(struct pcibios_softc *, u_int16_t, const char *); -void pcibios_print_exclirq __P((struct pcibios_softc *)); -void pcibios_print_pir_table __P((void)); +void pcibios_print_exclirq(struct pcibios_softc *); +void pcibios_print_pir_table(void); #define PCI_IRQ_TABLE_START 0xf0000 #define PCI_IRQ_TABLE_END 0xfffff @@ -142,8 +142,8 @@ struct cfdriver pcibios_cd = { NULL, "pcibios", DV_DULL }; -int pcibiosprobe __P((struct device *, void *, void *)); -void pcibiosattach __P((struct device *, struct device *, void *)); +int pcibiosprobe(struct device *, void *, void *); +void pcibiosattach(struct device *, struct device *, void *); struct cfattach pcibios_ca = { sizeof(struct pcibios_softc), pcibiosprobe, pcibiosattach @@ -524,7 +524,7 @@ pci_device_foreach(sc, pc, maxbus, func) struct pcibios_softc *sc; pci_chipset_tag_t pc; int maxbus; - void (*func) __P((struct pcibios_softc *, pci_chipset_tag_t, pcitag_t)); + void (*func)(struct pcibios_softc *, pci_chipset_tag_t, pcitag_t); { const struct pci_quirkdata *qd; int bus, device, function, maxdevs, nfuncs; diff --git a/sys/arch/i386/pci/pcibiosvar.h b/sys/arch/i386/pci/pcibiosvar.h index b78e9afdcae..86d377f13c1 100644 --- a/sys/arch/i386/pci/pcibiosvar.h +++ b/sys/arch/i386/pci/pcibiosvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcibiosvar.h,v 1.8 2001/10/25 19:03:49 mickey Exp $ */ +/* $OpenBSD: pcibiosvar.h,v 1.9 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: pcibios.h,v 1.2 2000/04/28 17:15:16 uch Exp $ */ /* @@ -104,7 +104,7 @@ struct pcibios_pir_header { #define PIR_DEVFUNC_FUNCTION(devfunc) ((devfunc) & 7) #define PIR_DEVFUNC_COMPOSE(dev,func) ((((dev) &0x1f) << 3) | ((func) & 7)) -void pcibios_init __P((void)); +void pcibios_init(void); extern struct pcibios_pir_header pcibios_pir_header; extern struct pcibios_intr_routing *pcibios_pir_table; @@ -115,11 +115,11 @@ int pcibios_flags; typedef void *pciintr_icu_handle_t; struct pciintr_icu { - int (*pi_getclink) __P((pciintr_icu_handle_t, int, int *)); - int (*pi_get_intr) __P((pciintr_icu_handle_t, int, int *)); - int (*pi_set_intr) __P((pciintr_icu_handle_t, int, int)); - int (*pi_get_trigger) __P((pciintr_icu_handle_t, int, int *)); - int (*pi_set_trigger) __P((pciintr_icu_handle_t, int, int)); + int (*pi_getclink)(pciintr_icu_handle_t, int, int *); + int (*pi_get_intr)(pciintr_icu_handle_t, int, int *); + int (*pi_set_intr)(pciintr_icu_handle_t, int, int); + int (*pi_get_trigger)(pciintr_icu_handle_t, int, int *); + int (*pi_set_trigger)(pciintr_icu_handle_t, int, int); }; typedef const struct pciintr_icu *pciintr_icu_tag_t; @@ -143,32 +143,32 @@ typedef const struct pciintr_icu *pciintr_icu_tag_t; #define PCIADDR_SEARCH_IO 0 #define PCIADDR_SEARCH_MEM 1 -struct extent *pciaddr_search __P((int, bus_addr_t *, bus_size_t)); +struct extent *pciaddr_search(int, bus_addr_t *, bus_size_t); -int pci_intr_fixup __P((struct pcibios_softc *, pci_chipset_tag_t, bus_space_tag_t)); -int pci_bus_fixup __P((pci_chipset_tag_t, int)); -void pci_addr_fixup __P((struct pcibios_softc *, pci_chipset_tag_t, int)); +int pci_intr_fixup(struct pcibios_softc *, pci_chipset_tag_t, bus_space_tag_t); +int pci_bus_fixup(pci_chipset_tag_t, int); +void pci_addr_fixup(struct pcibios_softc *, pci_chipset_tag_t, int); void pci_device_foreach __P((struct pcibios_softc *, pci_chipset_tag_t, int, - void (*) __P((struct pcibios_softc *, pci_chipset_tag_t, pcitag_t)))); -int pci_intr_header_fixup __P((pci_chipset_tag_t, pcitag_t, pci_intr_handle_t *)); -int pci_intr_route_link __P((pci_chipset_tag_t, pci_intr_handle_t *)); -int pci_intr_post_fixup __P((void)); + void (*)(struct pcibios_softc *, pci_chipset_tag_t, pcitag_t))); +int pci_intr_header_fixup(pci_chipset_tag_t, pcitag_t, pci_intr_handle_t *); +int pci_intr_route_link(pci_chipset_tag_t, pci_intr_handle_t *); +int pci_intr_post_fixup(void); /* * Init functions for our known PCI ICUs. */ -int piix_init __P((pci_chipset_tag_t, bus_space_tag_t, pcitag_t, - pciintr_icu_tag_t *, pciintr_icu_handle_t *)); -int opti82c558_init __P((pci_chipset_tag_t, bus_space_tag_t, pcitag_t, - pciintr_icu_tag_t *, pciintr_icu_handle_t *)); -int opti82c700_init __P((pci_chipset_tag_t, bus_space_tag_t, pcitag_t, - pciintr_icu_tag_t *, pciintr_icu_handle_t *)); -int via82c586_init __P((pci_chipset_tag_t, bus_space_tag_t, pcitag_t, - pciintr_icu_tag_t *, pciintr_icu_handle_t *)); -int sis85c503_init __P((pci_chipset_tag_t, bus_space_tag_t, pcitag_t, - pciintr_icu_tag_t *, pciintr_icu_handle_t *)); -int amd756_init __P((pci_chipset_tag_t, bus_space_tag_t, pcitag_t, - pciintr_icu_tag_t *, pciintr_icu_handle_t *)); -int ali1543_init __P((pci_chipset_tag_t, bus_space_tag_t, pcitag_t, - pciintr_icu_tag_t *, pciintr_icu_handle_t *)); +int piix_init(pci_chipset_tag_t, bus_space_tag_t, pcitag_t, + pciintr_icu_tag_t *, pciintr_icu_handle_t *); +int opti82c558_init(pci_chipset_tag_t, bus_space_tag_t, pcitag_t, + pciintr_icu_tag_t *, pciintr_icu_handle_t *); +int opti82c700_init(pci_chipset_tag_t, bus_space_tag_t, pcitag_t, + pciintr_icu_tag_t *, pciintr_icu_handle_t *); +int via82c586_init(pci_chipset_tag_t, bus_space_tag_t, pcitag_t, + pciintr_icu_tag_t *, pciintr_icu_handle_t *); +int sis85c503_init(pci_chipset_tag_t, bus_space_tag_t, pcitag_t, + pciintr_icu_tag_t *, pciintr_icu_handle_t *); +int amd756_init(pci_chipset_tag_t, bus_space_tag_t, pcitag_t, + pciintr_icu_tag_t *, pciintr_icu_handle_t *); +int ali1543_init(pci_chipset_tag_t, bus_space_tag_t, pcitag_t, + pciintr_icu_tag_t *, pciintr_icu_handle_t *); diff --git a/sys/arch/i386/pci/pcic_pci_machdep.c b/sys/arch/i386/pci/pcic_pci_machdep.c index 4f7e1bbf3ca..1861a31bfc6 100644 --- a/sys/arch/i386/pci/pcic_pci_machdep.c +++ b/sys/arch/i386/pci/pcic_pci_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcic_pci_machdep.c,v 1.2 2001/08/17 21:52:16 deraadt Exp $ */ +/* $OpenBSD: pcic_pci_machdep.c,v 1.3 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: pcic_pci_machdep.c,v 1.1 1998/12/20 17:53:29 nathanw Exp $ */ /* @@ -58,7 +58,7 @@ pcic_pci_machdep_intr_est(pc) void * pcic_pci_machdep_pcic_intr_establish(sc, fct) struct pcic_softc *sc; - int (*fct) __P((void *)); + int (*fct)(void *); { if (isa_intr_alloc(NULL, PCIC_CSC_INTR_IRQ_VALIDMASK & 0xffff, IST_EDGE, &(sc->irq))) @@ -73,7 +73,7 @@ pcic_pci_machdep_chip_intr_establish(pch, pf, ipl, fct, arg, xname) pcmcia_chipset_handle_t pch; struct pcmcia_function *pf; int ipl; - int (*fct) __P((void *)); + int (*fct)(void *); void *arg; char *xname; { diff --git a/sys/arch/i386/pci/pciide_machdep.c b/sys/arch/i386/pci/pciide_machdep.c index fcfdc0f6d8a..072d7b6ba1f 100644 --- a/sys/arch/i386/pci/pciide_machdep.c +++ b/sys/arch/i386/pci/pciide_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide_machdep.c,v 1.4 2001/06/25 21:42:31 csapuntz Exp $ */ +/* $OpenBSD: pciide_machdep.c,v 1.5 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: pciide_machdep.c,v 1.2 1999/02/19 18:01:27 mycroft Exp $ */ /* @@ -57,7 +57,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; { int irq; diff --git a/sys/arch/i386/pci/piix.c b/sys/arch/i386/pci/piix.c index 7d3843e6863..6aec21e7e38 100644 --- a/sys/arch/i386/pci/piix.c +++ b/sys/arch/i386/pci/piix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: piix.c,v 1.5 2001/01/25 00:07:40 mickey Exp $ */ +/* $OpenBSD: piix.c,v 1.6 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: piix.c,v 1.1 1999/11/17 01:21:20 thorpej Exp $ */ /*- @@ -89,11 +89,11 @@ #define DPRINTF(arg) #endif -int piix_getclink __P((pciintr_icu_handle_t, int, int *)); -int piix_get_intr __P((pciintr_icu_handle_t, int, int *)); -int piix_set_intr __P((pciintr_icu_handle_t, int, int)); +int piix_getclink(pciintr_icu_handle_t, int, int *); +int piix_get_intr(pciintr_icu_handle_t, int, int *); +int piix_set_intr(pciintr_icu_handle_t, int, int); #ifdef PIIX_DEBUG -void piix_pir_dump __P((struct piix_handle *)); +void piix_pir_dump(struct piix_handle *); #endif const struct pciintr_icu piix_pci_icu = { diff --git a/sys/arch/i386/pci/piixvar.h b/sys/arch/i386/pci/piixvar.h index a447b5942c5..a7ae9f2a33c 100644 --- a/sys/arch/i386/pci/piixvar.h +++ b/sys/arch/i386/pci/piixvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: piixvar.h,v 1.4 2000/03/28 03:38:00 mickey Exp $ */ +/* $OpenBSD: piixvar.h,v 1.5 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: piixvar.h,v 1.1 1999/11/17 01:21:21 thorpej Exp $ */ /*- @@ -67,8 +67,8 @@ * Support for the Intel PIIX PCI-ISA bridge interrupt controller. */ -int piix_get_trigger __P((pciintr_icu_handle_t, int, int *)); -int piix_set_trigger __P((pciintr_icu_handle_t, int, int)); +int piix_get_trigger(pciintr_icu_handle_t, int, int *); +int piix_set_trigger(pciintr_icu_handle_t, int, int); struct piix_handle { bus_space_tag_t ph_iot; diff --git a/sys/arch/i386/pci/sis85c503.c b/sys/arch/i386/pci/sis85c503.c index 32697ccb144..8e70cb53bb2 100644 --- a/sys/arch/i386/pci/sis85c503.c +++ b/sys/arch/i386/pci/sis85c503.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sis85c503.c,v 1.5 2001/01/25 00:07:41 mickey Exp $ */ +/* $OpenBSD: sis85c503.c,v 1.6 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: sis85c503.c,v 1.2 2000/07/18 11:24:09 soda Exp $ */ /*- @@ -82,9 +82,9 @@ #include <i386/pci/sis85c503reg.h> #include <i386/pci/piixvar.h> -int sis85c503_getclink __P((pciintr_icu_handle_t, int, int *)); -int sis85c503_get_intr __P((pciintr_icu_handle_t, int, int *)); -int sis85c503_set_intr __P((pciintr_icu_handle_t, int, int)); +int sis85c503_getclink(pciintr_icu_handle_t, int, int *); +int sis85c503_get_intr(pciintr_icu_handle_t, int, int *); +int sis85c503_set_intr(pciintr_icu_handle_t, int, int); const struct pciintr_icu sis85c503_pci_icu = { sis85c503_getclink, diff --git a/sys/arch/i386/pci/via82c586.c b/sys/arch/i386/pci/via82c586.c index 719ad6620d1..6e1137ea241 100644 --- a/sys/arch/i386/pci/via82c586.c +++ b/sys/arch/i386/pci/via82c586.c @@ -1,4 +1,4 @@ -/* $OpenBSD: via82c586.c,v 1.8 2001/06/08 03:18:04 mickey Exp $ */ +/* $OpenBSD: via82c586.c,v 1.9 2002/03/14 01:26:33 millert Exp $ */ /* $NetBSD: via82c586.c,v 1.2 2000/07/18 11:24:09 soda Exp $ */ /*- @@ -82,11 +82,11 @@ #include <i386/pci/via82c586reg.h> #include <i386/pci/piixvar.h> -int via82c586_getclink __P((pciintr_icu_handle_t, int, int *)); -int via82c586_get_intr __P((pciintr_icu_handle_t, int, int *)); -int via82c586_set_intr __P((pciintr_icu_handle_t, int, int)); -int via82c586_get_trigger __P((pciintr_icu_handle_t, int, int *)); -int via82c586_set_trigger __P((pciintr_icu_handle_t, int, int)); +int via82c586_getclink(pciintr_icu_handle_t, int, int *); +int via82c586_get_intr(pciintr_icu_handle_t, int, int *); +int via82c586_set_intr(pciintr_icu_handle_t, int, int); +int via82c586_get_trigger(pciintr_icu_handle_t, int, int *); +int via82c586_set_trigger(pciintr_icu_handle_t, int, int); const struct pciintr_icu via82c586_pci_icu = { via82c586_getclink, 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; diff --git a/sys/arch/m68k/fpe/fpu_arith_proto.h b/sys/arch/m68k/fpe/fpu_arith_proto.h index f33eff44f35..a50f2f61a96 100644 --- a/sys/arch/m68k/fpe/fpu_arith_proto.h +++ b/sys/arch/m68k/fpe/fpu_arith_proto.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu_arith_proto.h,v 1.2 1996/05/29 21:05:14 niklas Exp $ */ +/* $OpenBSD: fpu_arith_proto.h,v 1.3 2002/03/14 01:26:34 millert Exp $ */ /* $NetBSD: fpu_arith_proto.h,v 1.1 1995/11/03 04:47:00 briggs Exp $ */ /* @@ -42,54 +42,54 @@ */ /* fpu_add.c */ -struct fpn * fpu_add __P((struct fpemu *fe)); +struct fpn * fpu_add(struct fpemu *fe); /* fpu_div.c */ -struct fpn * fpu_div __P((struct fpemu *fe)); +struct fpn * fpu_div(struct fpemu *fe); /* fpu_exp.c */ -struct fpn * fpu_etox __P((struct fpemu *fe)); -struct fpn * fpu_etoxm1 __P((struct fpemu *fe)); -struct fpn * fpu_tentox __P((struct fpemu *fe)); -struct fpn * fpu_twotox __P((struct fpemu *fe)); +struct fpn * fpu_etox(struct fpemu *fe); +struct fpn * fpu_etoxm1(struct fpemu *fe); +struct fpn * fpu_tentox(struct fpemu *fe); +struct fpn * fpu_twotox(struct fpemu *fe); /* fpu_getexp.c */ -struct fpn * fpu_getexp __P((struct fpemu *fe)); -struct fpn * fpu_getman __P((struct fpemu *fe)); +struct fpn * fpu_getexp(struct fpemu *fe); +struct fpn * fpu_getman(struct fpemu *fe); /* fpu_hyperb.c */ -struct fpn * fpu_atanh __P((struct fpemu *fe)); -struct fpn * fpu_cosh __P((struct fpemu *fe)); -struct fpn * fpu_sinh __P((struct fpemu *fe)); -struct fpn * fpu_tanh __P((struct fpemu *fe)); +struct fpn * fpu_atanh(struct fpemu *fe); +struct fpn * fpu_cosh(struct fpemu *fe); +struct fpn * fpu_sinh(struct fpemu *fe); +struct fpn * fpu_tanh(struct fpemu *fe); /* fpu_int.c */ -struct fpn * fpu_intrz __P((struct fpemu *fe)); -struct fpn * fpu_int __P((struct fpemu *fe)); +struct fpn * fpu_intrz(struct fpemu *fe); +struct fpn * fpu_int(struct fpemu *fe); /* fpu_log.c */ -struct fpn * fpu_log10 __P((struct fpemu *fe)); -struct fpn * fpu_log2 __P((struct fpemu *fe)); -struct fpn * fpu_logn __P((struct fpemu *fe)); -struct fpn * fpu_lognp1 __P((struct fpemu *fe)); +struct fpn * fpu_log10(struct fpemu *fe); +struct fpn * fpu_log2(struct fpemu *fe); +struct fpn * fpu_logn(struct fpemu *fe); +struct fpn * fpu_lognp1(struct fpemu *fe); /* fpu_mulc */ -struct fpn * fpu_mul __P((struct fpemu *fe)); +struct fpn * fpu_mul(struct fpemu *fe); /* fpu_rem.c */ -struct fpn * fpu_rem __P((struct fpemu *fe)); -struct fpn * fpu_mod __P((struct fpemu *fe)); +struct fpn * fpu_rem(struct fpemu *fe); +struct fpn * fpu_mod(struct fpemu *fe); /* fpu_sqrt.c */ -struct fpn * fpu_sqrt __P((struct fpemu *fe)); +struct fpn * fpu_sqrt(struct fpemu *fe); /* fpu_trig.c */ -struct fpn * fpu_acos __P((struct fpemu *fe)); -struct fpn * fpu_asin __P((struct fpemu *fe)); -struct fpn * fpu_atan __P((struct fpemu *fe)); -struct fpn * fpu_cos __P((struct fpemu *fe)); -struct fpn * fpu_sin __P((struct fpemu *fe)); -struct fpn * fpu_tan __P((struct fpemu *fe)); -struct fpn * fpu_sincos __P((struct fpemu *fe, int regc)); +struct fpn * fpu_acos(struct fpemu *fe); +struct fpn * fpu_asin(struct fpemu *fe); +struct fpn * fpu_atan(struct fpemu *fe); +struct fpn * fpu_cos(struct fpemu *fe); +struct fpn * fpu_sin(struct fpemu *fe); +struct fpn * fpu_tan(struct fpemu *fe); +struct fpn * fpu_sincos(struct fpemu *fe, int regc); #endif /* _FPU_ARITH_PROTO_H_ */ diff --git a/sys/arch/m68k/fpe/fpu_calcea.c b/sys/arch/m68k/fpe/fpu_calcea.c index 041b7adf4dd..25338b03856 100644 --- a/sys/arch/m68k/fpe/fpu_calcea.c +++ b/sys/arch/m68k/fpe/fpu_calcea.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu_calcea.c,v 1.6 1999/01/11 05:11:33 millert Exp $ */ +/* $OpenBSD: fpu_calcea.c,v 1.7 2002/03/14 01:26:34 millert Exp $ */ /* $NetBSD: fpu_calcea.c,v 1.7 1996/10/16 06:27:05 scottr Exp $ */ /* @@ -43,13 +43,13 @@ /* * Prototypes of static functions */ -static int decode_ea6 __P((struct frame *frame, struct instruction *insn, - struct insn_ea *ea, int modreg)); -static int fetch_immed __P((struct frame *frame, struct instruction *insn, - int *dst)); -static int fetch_disp __P((struct frame *frame, struct instruction *insn, - int size, int *res)); -static int calc_ea __P((struct insn_ea *ea, char *ptr, char **eaddr)); +static int decode_ea6(struct frame *frame, struct instruction *insn, + struct insn_ea *ea, int modreg); +static int fetch_immed(struct frame *frame, struct instruction *insn, + int *dst); +static int fetch_disp(struct frame *frame, struct instruction *insn, + int size, int *res); +static int calc_ea(struct insn_ea *ea, char *ptr, char **eaddr); /* * Helper routines for dealing with "effective address" values. diff --git a/sys/arch/m68k/fpe/fpu_emulate.c b/sys/arch/m68k/fpe/fpu_emulate.c index 5f2a6a83431..6f3502575fb 100644 --- a/sys/arch/m68k/fpe/fpu_emulate.c +++ b/sys/arch/m68k/fpe/fpu_emulate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu_emulate.c,v 1.8 1997/02/13 21:49:16 kstailey Exp $ */ +/* $OpenBSD: fpu_emulate.c,v 1.9 2002/03/14 01:26:34 millert Exp $ */ /* $NetBSD: fpu_emulate.c,v 1.14 1996/12/18 05:44:31 scottr Exp $ */ /* @@ -45,13 +45,13 @@ #include "fpu_emulate.h" -static int fpu_emul_fmovmcr __P((struct fpemu *fe, struct instruction *insn)); -static int fpu_emul_fmovm __P((struct fpemu *fe, struct instruction *insn)); -static int fpu_emul_arith __P((struct fpemu *fe, struct instruction *insn)); -static int fpu_emul_type1 __P((struct fpemu *fe, struct instruction *insn)); -static int fpu_emul_brcc __P((struct fpemu *fe, struct instruction *insn)); -static int test_cc __P((struct fpemu *fe, int pred)); -static struct fpn *fpu_cmp __P((struct fpemu *fe)); +static int fpu_emul_fmovmcr(struct fpemu *fe, struct instruction *insn); +static int fpu_emul_fmovm(struct fpemu *fe, struct instruction *insn); +static int fpu_emul_arith(struct fpemu *fe, struct instruction *insn); +static int fpu_emul_type1(struct fpemu *fe, struct instruction *insn); +static int fpu_emul_brcc(struct fpemu *fe, struct instruction *insn); +static int test_cc(struct fpemu *fe, int pred); +static struct fpn *fpu_cmp(struct fpemu *fe); #if !defined(DL_DEFAULT) # if defined(DEBUG_WITH_FPU) diff --git a/sys/arch/m68k/fpe/fpu_emulate.h b/sys/arch/m68k/fpe/fpu_emulate.h index e12ad5d09ea..5fced755318 100644 --- a/sys/arch/m68k/fpe/fpu_emulate.h +++ b/sys/arch/m68k/fpe/fpu_emulate.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu_emulate.h,v 1.3 1996/05/09 22:20:44 niklas Exp $ */ +/* $OpenBSD: fpu_emulate.h,v 1.4 2002/03/14 01:26:34 millert Exp $ */ /* $NetBSD: fpu_emulate.h,v 1.4 1996/04/30 11:52:14 briggs Exp $ */ /* @@ -256,57 +256,57 @@ struct instruction { */ /* Build a new Quiet NaN (sign=0, frac=all 1's). */ -struct fpn *fpu_newnan __P((struct fpemu *fe)); +struct fpn *fpu_newnan(struct fpemu *fe); /* * Shift a number right some number of bits, taking care of round/sticky. * Note that the result is probably not a well-formed number (it will lack * the normal 1-bit mant[0]&FP_1). */ -int fpu_shr __P((struct fpn * fp, int shr)); +int fpu_shr(struct fpn * fp, int shr); /* * Round a number according to the round mode in FPCR */ -int round __P((register struct fpemu *fe, register struct fpn *fp)); +int round(register struct fpemu *fe, register struct fpn *fp); /* type conversion */ -void fpu_explode __P((struct fpemu *fe, struct fpn *fp, int t, u_int *src)); -void fpu_implode __P((struct fpemu *fe, struct fpn *fp, int t, u_int *dst)); +void fpu_explode(struct fpemu *fe, struct fpn *fp, int t, u_int *src); +void fpu_implode(struct fpemu *fe, struct fpn *fp, int t, u_int *dst); /* * non-static emulation functions */ /* type 0 */ -int fpu_emul_fmovecr __P((struct fpemu *fe, struct instruction *insn)); -int fpu_emul_fstore __P((struct fpemu *fe, struct instruction *insn)); -int fpu_emul_fscale __P((struct fpemu *fe, struct instruction *insn)); +int fpu_emul_fmovecr(struct fpemu *fe, struct instruction *insn); +int fpu_emul_fstore(struct fpemu *fe, struct instruction *insn); +int fpu_emul_fscale(struct fpemu *fe, struct instruction *insn); /* * include function declarations of those which are called by fpu_emul_arith() */ #include "fpu_arith_proto.h" -int fpu_emulate __P((struct frame *frame, struct fpframe *fpf)); +int fpu_emulate(struct frame *frame, struct fpframe *fpf); /* * "helper" functions */ /* return values from constant rom */ -struct fpn *fpu_const __P((struct fpn *fp, u_int offset)); +struct fpn *fpu_const(struct fpn *fp, u_int offset); /* update exceptions and FPSR */ -int fpu_upd_excp __P((struct fpemu *fe)); -u_int fpu_upd_fpsr __P((struct fpemu *fe, struct fpn *fp)); +int fpu_upd_excp(struct fpemu *fe); +u_int fpu_upd_fpsr(struct fpemu *fe, struct fpn *fp); /* address mode decoder, and load/store */ -int fpu_decode_ea __P((struct frame *frame, struct instruction *insn, - struct insn_ea *ea, int modreg)); -int fpu_load_ea __P((struct frame *frame, struct instruction *insn, - struct insn_ea *ea, char *dst)); -int fpu_store_ea __P((struct frame *frame, struct instruction *insn, - struct insn_ea *ea, char *src)); +int fpu_decode_ea(struct frame *frame, struct instruction *insn, + struct insn_ea *ea, int modreg); +int fpu_load_ea(struct frame *frame, struct instruction *insn, + struct insn_ea *ea, char *dst); +int fpu_store_ea(struct frame *frame, struct instruction *insn, + struct insn_ea *ea, char *src); /* fpu_subr.c */ -void fpu_norm __P((register struct fpn *fp)); +void fpu_norm(register struct fpn *fp); /* declarations for debugging */ diff --git a/sys/arch/m68k/fpe/fpu_explode.c b/sys/arch/m68k/fpe/fpu_explode.c index dcbf57776fb..74d92f3147b 100644 --- a/sys/arch/m68k/fpe/fpu_explode.c +++ b/sys/arch/m68k/fpe/fpu_explode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu_explode.c,v 1.2 1996/05/09 22:20:45 niklas Exp $ */ +/* $OpenBSD: fpu_explode.c,v 1.3 2002/03/14 01:26:34 millert Exp $ */ /* $NetBSD: fpu_explode.c,v 1.2 1996/04/30 11:52:18 briggs Exp $ */ /* @@ -61,10 +61,10 @@ /* Conversion to internal format -- note asymmetry. */ -static int fpu_itof __P((struct fpn *fp, u_int i)); -static int fpu_stof __P((struct fpn *fp, u_int i)); -static int fpu_dtof __P((struct fpn *fp, u_int i, u_int j)); -static int fpu_xtof __P((struct fpn *fp, u_int i, u_int j, u_int k)); +static int fpu_itof(struct fpn *fp, u_int i); +static int fpu_stof(struct fpn *fp, u_int i); +static int fpu_dtof(struct fpn *fp, u_int i, u_int j); +static int fpu_xtof(struct fpn *fp, u_int i, u_int j, u_int k); /* * N.B.: in all of the following, we assume the FP format is diff --git a/sys/arch/m68k/fpe/fpu_implode.c b/sys/arch/m68k/fpe/fpu_implode.c index dd1ab6fec7a..f6aca71e792 100644 --- a/sys/arch/m68k/fpe/fpu_implode.c +++ b/sys/arch/m68k/fpe/fpu_implode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu_implode.c,v 1.2 1996/05/09 22:20:47 niklas Exp $ */ +/* $OpenBSD: fpu_implode.c,v 1.3 2002/03/14 01:26:34 millert Exp $ */ /* $NetBSD: fpu_implode.c,v 1.2 1996/04/30 11:52:30 briggs Exp $ */ /* @@ -60,10 +60,10 @@ #include "fpu_arith.h" /* Conversion from internal format -- note asymmetry. */ -static u_int fpu_ftoi __P((struct fpemu *fe, struct fpn *fp)); -static u_int fpu_ftos __P((struct fpemu *fe, struct fpn *fp)); -static u_int fpu_ftod __P((struct fpemu *fe, struct fpn *fp, u_int *)); -static u_int fpu_ftox __P((struct fpemu *fe, struct fpn *fp, u_int *)); +static u_int fpu_ftoi(struct fpemu *fe, struct fpn *fp); +static u_int fpu_ftos(struct fpemu *fe, struct fpn *fp); +static u_int fpu_ftod(struct fpemu *fe, struct fpn *fp, u_int *); +static u_int fpu_ftox(struct fpemu *fe, struct fpn *fp, u_int *); /* * Round a number (algorithm from Motorola MC68882 manual, modified for diff --git a/sys/arch/m68k/fpe/fpu_log.c b/sys/arch/m68k/fpe/fpu_log.c index ebdfee98438..10992601d61 100644 --- a/sys/arch/m68k/fpe/fpu_log.c +++ b/sys/arch/m68k/fpe/fpu_log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu_log.c,v 1.3 1997/01/13 11:51:06 niklas Exp $ */ +/* $OpenBSD: fpu_log.c,v 1.4 2002/03/14 01:26:34 millert Exp $ */ /* $NetBSD: fpu_log.c,v 1.5 1996/10/13 03:19:18 christos Exp $ */ /* @@ -185,7 +185,7 @@ static struct sfpn { { 0x3FFE - 0x3fff, 0xB07197A2U, 0x3C46C654U }, }; -static struct fpn *__fpu_logn __P((struct fpemu *fe)); +static struct fpn *__fpu_logn(struct fpemu *fe); /* * natural log - algorithm taken from Motorola FPSP, diff --git a/sys/arch/m68k/fpe/fpu_rem.c b/sys/arch/m68k/fpe/fpu_rem.c index 0b201352e47..40714ea126a 100644 --- a/sys/arch/m68k/fpe/fpu_rem.c +++ b/sys/arch/m68k/fpe/fpu_rem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu_rem.c,v 1.2 1996/05/09 22:20:48 niklas Exp $ */ +/* $OpenBSD: fpu_rem.c,v 1.3 2002/03/14 01:26:34 millert Exp $ */ /* $NetBSD: fpu_rem.c,v 1.3 1996/04/30 12:02:54 briggs Exp $ */ /* @@ -83,7 +83,7 @@ * R := 0. Return signQ, last 7 bits of Q, and R. */ -static struct fpn * __fpu_modrem __P((struct fpemu *fe, int modrem)); +static struct fpn * __fpu_modrem(struct fpemu *fe, int modrem); static struct fpn * __fpu_modrem(fe, modrem) diff --git a/sys/arch/m68k/include/cacheops.h b/sys/arch/m68k/include/cacheops.h index 109e7164bf8..ff404a7f7cc 100644 --- a/sys/arch/m68k/include/cacheops.h +++ b/sys/arch/m68k/include/cacheops.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cacheops.h,v 1.2 2001/05/15 01:43:14 millert Exp $ */ +/* $OpenBSD: cacheops.h,v 1.3 2002/03/14 01:26:34 millert Exp $ */ /* $NetBSD: cacheops.h,v 1.1 1997/06/02 20:26:37 leo Exp $ */ /*- @@ -122,16 +122,16 @@ #define _MULTI_CPU #endif -void _TBIA __P((void)); -void _TBIS __P((vaddr_t)); -void _TBIAS __P((void)); -void _TBIAU __P((void)); -void _ICIA __P((void)); -void _ICPA __P((void)); -void _DCIA __P((void)); -void _DCIS __P((void)); -void _DCIU __P((void)); -void _DCIAS __P((paddr_t)); +void _TBIA(void); +void _TBIS(vaddr_t); +void _TBIAS(void); +void _TBIAU(void); +void _ICIA(void); +void _ICPA(void); +void _DCIA(void); +void _DCIS(void); +void _DCIU(void); +void _DCIAS(paddr_t); #define TBIA() _TBIA() #define TBIS(va) _TBIS((va)) @@ -146,15 +146,15 @@ void _DCIAS __P((paddr_t)); #if defined(M68040)||defined(M68060) -void _PCIA __P((void)); -void _DCFA __P((void)); -void _ICPL __P((paddr_t)); -void _ICPP __P((paddr_t)); -void _DCPL __P((paddr_t)); -void _DCPP __P((paddr_t)); -void _DCPA __P((void)); -void _DCFL __P((paddr_t)); -void _DCFP __P((paddr_t)); +void _PCIA(void); +void _DCFA(void); +void _ICPL(paddr_t); +void _ICPP(paddr_t); +void _DCPL(paddr_t); +void _DCPP(paddr_t); +void _DCPA(void); +void _DCFL(paddr_t); +void _DCFP(paddr_t); #define PCIA() _PCIA() #define DCFA() _DCFA() diff --git a/sys/arch/m68k/include/cacheops_20.h b/sys/arch/m68k/include/cacheops_20.h index d5156b6085f..e9a5eb3feae 100644 --- a/sys/arch/m68k/include/cacheops_20.h +++ b/sys/arch/m68k/include/cacheops_20.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cacheops_20.h,v 1.2 2001/01/15 19:50:37 deraadt Exp $ */ +/* $OpenBSD: cacheops_20.h,v 1.3 2002/03/14 01:26:34 millert Exp $ */ /* $NetBSD: cacheops_20.h,v 1.1 1997/06/02 20:26:39 leo Exp $ */ /*- @@ -40,7 +40,7 @@ /* * Invalidate entire TLB. */ -void TBIA_20 __P((void)); +void TBIA_20(void); extern __inline__ void TBIA_20() { @@ -50,7 +50,7 @@ TBIA_20() /* * Invalidate any TLB entry for given VA (TB Invalidate Single) */ -void TBIS_20 __P((void *)); +void TBIS_20(void *); extern __inline__ void TBIS_20(va) void *va; @@ -62,7 +62,7 @@ TBIS_20(va) /* * Invalidate supervisor side of TLB */ -void TBIAS_20 __P((void)); +void TBIAS_20(void); extern __inline__ void TBIAS_20() { @@ -72,7 +72,7 @@ TBIAS_20() /* * Invalidate user side of TLB */ -void TBIAU_20 __P((void)); +void TBIAU_20(void); extern __inline__ void TBIAU_20() { @@ -82,14 +82,14 @@ TBIAU_20() /* * Invalidate instruction cache */ -void ICIA_20 __P((void)); +void ICIA_20(void); extern __inline__ void ICIA_20() { __asm __volatile (" movc %0,cacr;" : : "d" (IC_CLEAR)); } -void ICPA_20 __P((void)); +void ICPA_20(void); extern __inline__ void ICPA_20() { @@ -108,7 +108,7 @@ ICPA_20() #define DCIU_20() #define DCIAS_20() -void PCIA_20 __P((void)); +void PCIA_20(void); extern __inline__ void PCIA_20() { diff --git a/sys/arch/m68k/include/cacheops_30.h b/sys/arch/m68k/include/cacheops_30.h index ae43b1af09c..2461598d42c 100644 --- a/sys/arch/m68k/include/cacheops_30.h +++ b/sys/arch/m68k/include/cacheops_30.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cacheops_30.h,v 1.3 2001/05/15 01:43:14 millert Exp $ */ +/* $OpenBSD: cacheops_30.h,v 1.4 2002/03/14 01:26:34 millert Exp $ */ /* $NetBSD: cacheops_30.h,v 1.1 1997/06/02 20:26:40 leo Exp $ */ /*- @@ -40,7 +40,7 @@ /* * Invalidate entire TLB. */ -void TBIA_30 __P((void)); +void TBIA_30(void); extern __inline__ void TBIA_30() { @@ -53,7 +53,7 @@ TBIA_30() /* * Invalidate any TLB entry for given VA (TB Invalidate Single) */ -void TBIS_30 __P((vaddr_t)); +void TBIS_30(vaddr_t); extern __inline__ void TBIS_30(va) vaddr_t va; @@ -65,7 +65,7 @@ TBIS_30(va) /* * Invalidate supervisor side of TLB */ -void TBIAS_30 __P((void)); +void TBIAS_30(void); extern __inline__ void TBIAS_30() { @@ -76,7 +76,7 @@ TBIAS_30() /* * Invalidate user side of TLB */ -void TBIAU_30 __P((void)); +void TBIAU_30(void); extern __inline__ void TBIAU_30() { @@ -87,14 +87,14 @@ TBIAU_30() /* * Invalidate instruction cache */ -void ICIA_30 __P((void)); +void ICIA_30(void); extern __inline__ void ICIA_30() { __asm __volatile (" movc %0,cacr;" : : "d" (IC_CLEAR)); } -void ICPA_30 __P((void)); +void ICPA_30(void); extern __inline__ void ICPA_30() { @@ -114,7 +114,7 @@ ICPA_30() #define DCIAS_30(va) -void PCIA_30 __P((void)); +void PCIA_30(void); extern __inline__ void PCIA_30() { diff --git a/sys/arch/m68k/include/cacheops_40.h b/sys/arch/m68k/include/cacheops_40.h index 15b07056cca..de20d2d4873 100644 --- a/sys/arch/m68k/include/cacheops_40.h +++ b/sys/arch/m68k/include/cacheops_40.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cacheops_40.h,v 1.3 2001/05/15 01:43:14 millert Exp $ */ +/* $OpenBSD: cacheops_40.h,v 1.4 2002/03/14 01:26:34 millert Exp $ */ /* $NetBSD: cacheops_40.h,v 1.1 1997/06/02 20:26:41 leo Exp $ */ /*- @@ -40,7 +40,7 @@ /* * Invalidate entire TLB. */ -void TBIA_40 __P((void)); +void TBIA_40(void); extern __inline__ void TBIA_40() { @@ -50,7 +50,7 @@ TBIA_40() /* * Invalidate any TLB entry for given VA (TB Invalidate Single) */ -void TBIS_40 __P((vaddr_t)); +void TBIS_40(vaddr_t); extern __inline__ void TBIS_40(va) vaddr_t va; @@ -69,7 +69,7 @@ TBIS_40(va) /* * Invalidate supervisor side of TLB */ -void TBIAS_40 __P((void)); +void TBIAS_40(void); extern __inline__ void TBIAS_40() { @@ -82,7 +82,7 @@ TBIAS_40() /* * Invalidate user side of TLB */ -void TBIAU_40 __P((void)); +void TBIAU_40(void); extern __inline__ void TBIAU_40() { @@ -95,14 +95,14 @@ TBIAU_40() /* * Invalidate instruction cache */ -void ICIA_40 __P((void)); +void ICIA_40(void); extern __inline__ void ICIA_40() { __asm __volatile (" .word 0xf498;"); /* cinva ic */ } -void ICPA_40 __P((void)); +void ICPA_40(void); extern __inline__ void ICPA_40() { @@ -112,28 +112,28 @@ ICPA_40() /* * Invalidate data cache. */ -void DCIA_40 __P((void)); +void DCIA_40(void); extern __inline__ void DCIA_40() { __asm __volatile (" .word 0xf478;"); /* cpusha dc */ } -void DCIS_40 __P((void)); +void DCIS_40(void); extern __inline__ void DCIS_40() { __asm __volatile (" .word 0xf478;"); /* cpusha dc */ } -void DCIU_40 __P((void)); +void DCIU_40(void); extern __inline__ void DCIU_40() { __asm __volatile (" .word 0xf478;"); /* cpusha dc */ } -void DCIAS_40 __P((paddr_t)); +void DCIAS_40(paddr_t); extern __inline__ void DCIAS_40(pa) paddr_t pa; @@ -143,14 +143,14 @@ DCIAS_40(pa) __asm __volatile (" .word 0xf468;" : : "a" (r_pa)); /* cpushl dc,a0@ */ } -void PCIA_40 __P((void)); +void PCIA_40(void); extern __inline__ void PCIA_40() { __asm __volatile (" .word 0xf478;"); /* cpusha dc */ } -void DCFA_40 __P((void)); +void DCFA_40(void); extern __inline__ void DCFA_40() { @@ -158,7 +158,7 @@ DCFA_40() } /* invalidate instruction physical cache line */ -void ICPL_40 __P((paddr_t)); +void ICPL_40(paddr_t); extern __inline__ void ICPL_40(pa) paddr_t pa; @@ -169,7 +169,7 @@ ICPL_40(pa) } /* invalidate instruction physical cache page */ -void ICPP_40 __P((paddr_t)); +void ICPP_40(paddr_t); extern __inline__ void ICPP_40(pa) paddr_t pa; @@ -180,7 +180,7 @@ ICPP_40(pa) } /* invalidate data physical cache line */ -void DCPL_40 __P((paddr_t)); +void DCPL_40(paddr_t); extern __inline__ void DCPL_40(pa) paddr_t pa; @@ -191,7 +191,7 @@ DCPL_40(pa) } /* invalidate data physical cache page */ -void DCPP_40 __P((paddr_t)); +void DCPP_40(paddr_t); extern __inline__ void DCPP_40(pa) paddr_t pa; @@ -202,7 +202,7 @@ DCPP_40(pa) } /* invalidate data physical all */ -void DCPA_40 __P((void)); +void DCPA_40(void); extern __inline__ void DCPA_40() { @@ -210,7 +210,7 @@ DCPA_40() } /* data cache flush line */ -void DCFL_40 __P((paddr_t)); +void DCFL_40(paddr_t); extern __inline__ void DCFL_40(pa) paddr_t pa; @@ -221,7 +221,7 @@ DCFL_40(pa) } /* data cache flush page */ -void DCFP_40 __P((paddr_t)); +void DCFP_40(paddr_t); extern __inline__ void DCFP_40(pa) paddr_t pa; diff --git a/sys/arch/m68k/include/cacheops_60.h b/sys/arch/m68k/include/cacheops_60.h index 6dc694b1a96..1985232227d 100644 --- a/sys/arch/m68k/include/cacheops_60.h +++ b/sys/arch/m68k/include/cacheops_60.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cacheops_60.h,v 1.3 2001/05/15 01:43:14 millert Exp $ */ +/* $OpenBSD: cacheops_60.h,v 1.4 2002/03/14 01:26:34 millert Exp $ */ /* $NetBSD: cacheops_60.h,v 1.1 1997/06/02 20:26:43 leo Exp $ */ /*- @@ -40,7 +40,7 @@ /* * Invalidate entire TLB. */ -void TBIA_60 __P((void)); +void TBIA_60(void); extern __inline__ void TBIA_60() { @@ -50,7 +50,7 @@ TBIA_60() /* * Invalidate any TLB entry for given VA (TB Invalidate Single) */ -void TBIS_60 __P((vaddr_t)); +void TBIS_60(vaddr_t); extern __inline__ void TBIS_60(va) vaddr_t va; @@ -73,7 +73,7 @@ TBIS_60(va) /* * Invalidate supervisor side of TLB */ -void TBIAS_60 __P((void)); +void TBIAS_60(void); extern __inline__ void TBIAS_60() { @@ -91,7 +91,7 @@ TBIAS_60() /* * Invalidate user side of TLB */ -void TBIAU_60 __P((void)); +void TBIAU_60(void); extern __inline__ void TBIAU_60() { @@ -109,7 +109,7 @@ TBIAU_60() /* * Invalidate instruction cache */ -void ICIA_60 __P((void)); +void ICIA_60(void); extern __inline__ void ICIA_60() { @@ -117,7 +117,7 @@ ICIA_60() __asm __volatile (" .word 0xf498;"); } -void ICPA_60 __P((void)); +void ICPA_60(void); extern __inline__ void ICPA_60() { @@ -128,28 +128,28 @@ ICPA_60() /* * Invalidate data cache. */ -void DCIA_60 __P((void)); +void DCIA_60(void); extern __inline__ void DCIA_60() { __asm __volatile (" .word 0xf478;"); /* cpusha dc */ } -void DCIS_60 __P((void)); +void DCIS_60(void); extern __inline__ void DCIS_60() { __asm __volatile (" .word 0xf478;"); /* cpusha dc */ } -void DCIU_60 __P((void)); +void DCIU_60(void); extern __inline__ void DCIU_60() { __asm __volatile (" .word 0xf478;"); /* cpusha dc */ } -void DCIAS_60 __P((paddr_t)); +void DCIAS_60(paddr_t); extern __inline__ void DCIAS_60(pa) paddr_t pa; @@ -159,14 +159,14 @@ DCIAS_60(pa) __asm __volatile (" .word 0xf468;" : : "a" (r_pa)); /* cpushl dc,a0@ */ } -void PCIA_60 __P((void)); +void PCIA_60(void); extern __inline__ void PCIA_60() { __asm __volatile (" .word 0xf478;"); /* cpusha dc */ } -void DCFA_60 __P((void)); +void DCFA_60(void); extern __inline__ void DCFA_60() { @@ -174,7 +174,7 @@ DCFA_60() } /* invalidate instruction physical cache line */ -void ICPL_60 __P((paddr_t)); +void ICPL_60(paddr_t); extern __inline__ void ICPL_60(pa) paddr_t pa; @@ -185,7 +185,7 @@ ICPL_60(pa) } /* invalidate instruction physical cache page */ -void ICPP_60 __P((paddr_t)); +void ICPP_60(paddr_t); extern __inline__ void ICPP_60(pa) paddr_t pa; @@ -196,7 +196,7 @@ ICPP_60(pa) } /* invalidate data physical cache line */ -void DCPL_60 __P((paddr_t)); +void DCPL_60(paddr_t); extern __inline__ void DCPL_60(pa) paddr_t va; @@ -207,7 +207,7 @@ DCPL_60(pa) } /* invalidate data physical cache page */ -void DCPP_60 __P((paddr_t)); +void DCPP_60(paddr_t); extern __inline__ void DCPP_60(pa) paddr_t pa; @@ -218,7 +218,7 @@ DCPP_60(pa) } /* invalidate data physical all */ -void DCPA_60 __P((void)); +void DCPA_60(void); extern __inline__ void DCPA_60() { @@ -226,7 +226,7 @@ DCPA_60() } /* data cache flush line */ -void DCFL_60 __P((paddr_t)); +void DCFL_60(paddr_t); extern __inline__ void DCFL_60(pa) paddr_t pa; @@ -237,7 +237,7 @@ DCFL_60(pa) } /* data cache flush page */ -void DCFP_60 __P((paddr_t)); +void DCFP_60(paddr_t); extern __inline__ void DCFP_60(pa) paddr_t pa; diff --git a/sys/arch/m68k/include/cpu.h b/sys/arch/m68k/include/cpu.h index 5c1f46f081c..b7bd34cb3d5 100644 --- a/sys/arch/m68k/include/cpu.h +++ b/sys/arch/m68k/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.7 2001/11/25 17:15:19 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.8 2002/03/14 01:26:34 millert Exp $ */ /* $NetBSD: cpu.h,v 1.3 1997/02/02 06:56:57 thorpej Exp $ */ /* @@ -189,30 +189,30 @@ extern int mmutype; /* MMU on this host */ #define CACHE60_OFF (CACHE40_OFF|IC60_CABC) #ifdef _KERNEL -void copypage __P((void *fromaddr, void *toaddr)); -void zeropage __P((void *addr)); +void copypage(void *fromaddr, void *toaddr); +void zeropage(void *addr); #ifdef MAPPEDCOPY -int mappedcopyin __P((void *fromp, void *top, size_t count)); -int mappedcopyout __P((void *fromp, void *top, size_t count)); +int mappedcopyin(void *fromp, void *top, size_t count); +int mappedcopyout(void *fromp, void *top, size_t count); extern u_int mappedcopysize; #endif /* MAPPEDCOPY */ /* locore.s */ -u_long getdfc __P((void)); -u_long getsfc __P((void)); +u_long getdfc(void); +u_long getsfc(void); /* copy.s */ -int fusword __P((caddr_t)); -int susword __P((caddr_t, u_short)); +int fusword(caddr_t); +int susword(caddr_t, u_short); /* m68k_machdep.c */ struct proc; struct frame; -void userret __P((struct proc *, struct frame *, u_quad_t, u_int, int)); +void userret(struct proc *, struct frame *, u_quad_t, u_int, int); /* regdump.c */ struct trapframe; -void regdump __P((struct trapframe *, int)); +void regdump(struct trapframe *, int); #endif /* _KERNEL */ diff --git a/sys/arch/m68k/include/db_machdep.h b/sys/arch/m68k/include/db_machdep.h index 7af52062575..3fc5355776d 100644 --- a/sys/arch/m68k/include/db_machdep.h +++ b/sys/arch/m68k/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.7 2001/11/06 00:30:38 art Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.8 2002/03/14 01:26:34 millert Exp $ */ /* $NetBSD: db_machdep.h,v 1.20 1997/06/26 01:26:58 thorpej Exp $ */ /* @@ -96,9 +96,9 @@ typedef long kgdb_reg_t; #ifdef _KERNEL -void Debugger __P((void)); /* XXX */ -void kdb_kintr __P((db_regs_t *)); -int kdb_trap __P((int, db_regs_t *)); +void Debugger(void); /* XXX */ +void kdb_kintr(db_regs_t *); +int kdb_trap(int, db_regs_t *); #endif /* _KERNEL */ diff --git a/sys/arch/m68k/include/float.h b/sys/arch/m68k/include/float.h index 7b3109c3cc6..984a9adee24 100644 --- a/sys/arch/m68k/include/float.h +++ b/sys/arch/m68k/include/float.h @@ -1,4 +1,4 @@ -/* $OpenBSD: float.h,v 1.3 1997/08/01 21:35:28 deraadt Exp $ */ +/* $OpenBSD: float.h,v 1.4 2002/03/14 01:26:34 millert Exp $ */ /* $NetBSD: float.h,v 1.10 1995/06/20 20:45:41 jtc Exp $ */ /* @@ -42,7 +42,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/m68k/include/pmap_motorola.h b/sys/arch/m68k/include/pmap_motorola.h index ccd11e766dc..4f9d578d8ab 100644 --- a/sys/arch/m68k/include/pmap_motorola.h +++ b/sys/arch/m68k/include/pmap_motorola.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_motorola.h,v 1.4 2002/01/10 21:08:41 miod Exp $ */ +/* $OpenBSD: pmap_motorola.h,v 1.5 2002/03/14 01:26:34 millert Exp $ */ /* * Copyright (c) 1987 Carnegie-Mellon University @@ -149,11 +149,11 @@ extern pt_entry_t *Sysmap; extern char *vmmap; /* map for mem, dumps, etc. */ #ifdef M68K_MMU_HP -void pmap_prefer __P((vaddr_t, vaddr_t *)); +void pmap_prefer(vaddr_t, vaddr_t *); #define PMAP_PREFER(foff, vap) pmap_prefer((foff), (vap)) #endif -vaddr_t pmap_map __P((vaddr_t, paddr_t, paddr_t, int)); +vaddr_t pmap_map(vaddr_t, paddr_t, paddr_t, int); #endif /* _KERNEL */ diff --git a/sys/arch/m68k/include/profile.h b/sys/arch/m68k/include/profile.h index 9b463a1a33d..2a17085ec6e 100644 --- a/sys/arch/m68k/include/profile.h +++ b/sys/arch/m68k/include/profile.h @@ -1,4 +1,4 @@ -/* $OpenBSD: profile.h,v 1.4 1997/01/27 20:34:15 deraadt Exp $ */ +/* $OpenBSD: profile.h,v 1.5 2002/03/14 01:26:34 millert Exp $ */ /* $NetBSD: profile.h,v 1.3 1995/03/26 17:08:37 briggs Exp $ */ /* @@ -39,7 +39,7 @@ #define _MCOUNT_DECL static __inline void _mcount #define MCOUNT \ -extern void mcount __P((void)) __asm("mcount"); void mcount() { \ +extern void mcount(void) __asm("mcount"); void mcount() { \ int selfpc, frompcindex; \ __asm("movl a6@(4),%0" : "=r" (selfpc)); \ __asm("movl a6@(0)@(4),%0" : "=r" (frompcindex)); \ diff --git a/sys/arch/m68k/include/reg.h b/sys/arch/m68k/include/reg.h index 0cb61fd0a50..db85b897ddc 100644 --- a/sys/arch/m68k/include/reg.h +++ b/sys/arch/m68k/include/reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: reg.h,v 1.3 1997/01/13 11:51:10 niklas Exp $ */ +/* $OpenBSD: reg.h,v 1.4 2002/03/14 01:26:34 millert Exp $ */ /* $NetBSD: reg.h,v 1.12 1996/12/17 19:24:31 gwr Exp $ */ /* @@ -100,8 +100,8 @@ struct fpreg { #define R1 A0 struct proc; -int process_read_regs __P((struct proc *, struct reg *)); -int process_read_fpregs __P((struct proc *, struct fpreg *)); +int process_read_regs(struct proc *, struct reg *); +int process_read_fpregs(struct proc *, struct fpreg *); #endif diff --git a/sys/arch/m68k/m68k/db_disasm.c b/sys/arch/m68k/m68k/db_disasm.c index 0a3da150603..cf17c2d2f03 100644 --- a/sys/arch/m68k/m68k/db_disasm.c +++ b/sys/arch/m68k/m68k/db_disasm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_disasm.c,v 1.8 2001/12/06 23:45:23 miod Exp $ */ +/* $OpenBSD: db_disasm.c,v 1.9 2002/03/14 01:26:34 millert Exp $ */ /* $NetBSD: db_disasm.c,v 1.19 1996/10/30 08:22:39 is Exp $ */ /* @@ -71,60 +71,60 @@ #include <ddb/db_output.h> #include <m68k/m68k/db_disasm.h> -void get_modregstr __P((dis_buffer_t *, int, int, int, int)); -void get_immed __P((dis_buffer_t *, int)); -void get_fpustdGEN __P((dis_buffer_t *, u_short, const char *)); -void addstr __P((dis_buffer_t *, const char *s)); -void prints __P((dis_buffer_t *, int, int)); -void printu __P((dis_buffer_t *, u_int, int)); -void prints_wb __P((dis_buffer_t *, int, int, int)); -void printu_wb __P((dis_buffer_t *, u_int, int, int)); -void prints_bf __P((dis_buffer_t *, int, int, int)); -void printu_bf __P((dis_buffer_t *, u_int, int, int)); -void iaddstr __P((dis_buffer_t *, const char *s)); -void iprints __P((dis_buffer_t *, int, int)); -void iprintu __P((dis_buffer_t *, u_int, int)); -void iprints_wb __P((dis_buffer_t *, int, int, int)); -void iprintu_wb __P((dis_buffer_t *, u_int, int, int)); -void make_cond __P((dis_buffer_t *, int , char *)); -void print_fcond __P((dis_buffer_t *, char)); -void print_mcond __P((dis_buffer_t *, char)); -void print_disp __P((dis_buffer_t *, int, int, int)); -void print_addr __P((dis_buffer_t *, u_long)); -void print_reglist __P((dis_buffer_t *, int, u_short)); -void print_freglist __P((dis_buffer_t *, int, u_short, int)); -void print_fcode __P((dis_buffer_t *, u_short)); +void get_modregstr(dis_buffer_t *, int, int, int, int); +void get_immed(dis_buffer_t *, int); +void get_fpustdGEN(dis_buffer_t *, u_short, const char *); +void addstr(dis_buffer_t *, const char *s); +void prints(dis_buffer_t *, int, int); +void printu(dis_buffer_t *, u_int, int); +void prints_wb(dis_buffer_t *, int, int, int); +void printu_wb(dis_buffer_t *, u_int, int, int); +void prints_bf(dis_buffer_t *, int, int, int); +void printu_bf(dis_buffer_t *, u_int, int, int); +void iaddstr(dis_buffer_t *, const char *s); +void iprints(dis_buffer_t *, int, int); +void iprintu(dis_buffer_t *, u_int, int); +void iprints_wb(dis_buffer_t *, int, int, int); +void iprintu_wb(dis_buffer_t *, u_int, int, int); +void make_cond(dis_buffer_t *, int , char *); +void print_fcond(dis_buffer_t *, char); +void print_mcond(dis_buffer_t *, char); +void print_disp(dis_buffer_t *, int, int, int); +void print_addr(dis_buffer_t *, u_long); +void print_reglist(dis_buffer_t *, int, u_short); +void print_freglist(dis_buffer_t *, int, u_short, int); +void print_fcode(dis_buffer_t *, u_short); /* groups */ -void opcode_bitmanip __P((dis_buffer_t *, u_short)); -void opcode_move __P((dis_buffer_t *, u_short)); -void opcode_misc __P((dis_buffer_t *, u_short)); -void opcode_branch __P((dis_buffer_t *, u_short)); -void opcode_coproc __P((dis_buffer_t *, u_short)); -void opcode_0101 __P((dis_buffer_t *, u_short)); -void opcode_1000 __P((dis_buffer_t *, u_short)); -void opcode_addsub __P((dis_buffer_t *, u_short)); -void opcode_1010 __P((dis_buffer_t *, u_short)); -void opcode_1011 __P((dis_buffer_t *, u_short)); -void opcode_1100 __P((dis_buffer_t *, u_short)); -void opcode_1110 __P((dis_buffer_t *, u_short)); -void opcode_fpu __P((dis_buffer_t *, u_short)); -void opcode_mmu __P((dis_buffer_t *, u_short)); -void opcode_mmu040 __P((dis_buffer_t *, u_short)); -void opcode_move16 __P((dis_buffer_t *, u_short)); +void opcode_bitmanip(dis_buffer_t *, u_short); +void opcode_move(dis_buffer_t *, u_short); +void opcode_misc(dis_buffer_t *, u_short); +void opcode_branch(dis_buffer_t *, u_short); +void opcode_coproc(dis_buffer_t *, u_short); +void opcode_0101(dis_buffer_t *, u_short); +void opcode_1000(dis_buffer_t *, u_short); +void opcode_addsub(dis_buffer_t *, u_short); +void opcode_1010(dis_buffer_t *, u_short); +void opcode_1011(dis_buffer_t *, u_short); +void opcode_1100(dis_buffer_t *, u_short); +void opcode_1110(dis_buffer_t *, u_short); +void opcode_fpu(dis_buffer_t *, u_short); +void opcode_mmu(dis_buffer_t *, u_short); +void opcode_mmu040(dis_buffer_t *, u_short); +void opcode_move16(dis_buffer_t *, u_short); /* subs of groups */ -void opcode_movec __P((dis_buffer_t *, u_short)); -void opcode_divmul __P((dis_buffer_t *, u_short)); -void opcode_movem __P((dis_buffer_t *, u_short)); -void opcode_fmove_ext __P((dis_buffer_t *, u_short, u_short)); -void opcode_pmove __P((dis_buffer_t *, u_short, u_short)); -void opcode_pflush __P((dis_buffer_t *, u_short, u_short)); +void opcode_movec(dis_buffer_t *, u_short); +void opcode_divmul(dis_buffer_t *, u_short); +void opcode_movem(dis_buffer_t *, u_short); +void opcode_fmove_ext(dis_buffer_t *, u_short, u_short); +void opcode_pmove(dis_buffer_t *, u_short, u_short); +void opcode_pflush(dis_buffer_t *, u_short, u_short); #define addchar(ch) (*dbuf->casm++ = ch) #define iaddchar(ch) (*dbuf->cinfo++ = ch) -typedef void dis_func_t __P((dis_buffer_t *, u_short)); +typedef void dis_func_t(dis_buffer_t *, u_short); dis_func_t *const opcode_map[16] = { opcode_bitmanip, opcode_move, opcode_move, opcode_move, diff --git a/sys/arch/m68k/m68k/db_disasm.h b/sys/arch/m68k/m68k/db_disasm.h index 859ee0488c9..3b576e3dd70 100644 --- a/sys/arch/m68k/m68k/db_disasm.h +++ b/sys/arch/m68k/m68k/db_disasm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_disasm.h,v 1.3 2001/05/15 01:43:15 millert Exp $ */ +/* $OpenBSD: db_disasm.h,v 1.4 2002/03/14 01:26:34 millert Exp $ */ /* $NetBSD: db_disasm.h,v 1.4 1996/04/01 01:38:12 briggs Exp $ */ /* @@ -426,7 +426,7 @@ typedef struct dis_buffer dis_buffer_t; #define PRINT_DREG(dbuf, reg) addstr(dbuf, dregs[reg]) #define PRINT_AREG(dbuf, reg) addstr(dbuf, aregs[reg]) -db_addr_t db_disasm __P((db_addr_t loc, boolean_t moto_syntax)); -void get_modregstr_moto __P((dis_buffer_t *dbuf, int bit, int mod, int sz, int dd)); -void get_modregstr_mit __P((dis_buffer_t *dbuf, int bit, int mod, int sz, int dd)); -u_long get_areg_val __P((int reg)); +db_addr_t db_disasm(db_addr_t loc, boolean_t moto_syntax); +void get_modregstr_moto(dis_buffer_t *dbuf, int bit, int mod, int sz, int dd); +void get_modregstr_mit(dis_buffer_t *dbuf, int bit, int mod, int sz, int dd); +u_long get_areg_val(int reg); diff --git a/sys/arch/m68k/m68k/db_interface.c b/sys/arch/m68k/m68k/db_interface.c index 59a81c7558b..22b92dcb19f 100644 --- a/sys/arch/m68k/m68k/db_interface.c +++ b/sys/arch/m68k/m68k/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.11 2001/11/06 19:53:14 miod Exp $ */ +/* $OpenBSD: db_interface.c,v 1.12 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: db_interface.c,v 1.24 1997/02/18 22:27:32 gwr Exp $ */ /* @@ -53,7 +53,7 @@ extern label_t *db_recover; int db_active = 0; db_regs_t ddb_regs; -static void kdbprinttrap __P((int, int)); +static void kdbprinttrap(int, int); /* * Received keyboard interrupt sequence. diff --git a/sys/arch/m68k/m68k/db_trace.c b/sys/arch/m68k/m68k/db_trace.c index 9048eb24e37..288130d56d9 100644 --- a/sys/arch/m68k/m68k/db_trace.c +++ b/sys/arch/m68k/m68k/db_trace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_trace.c,v 1.14 2001/12/06 23:45:23 miod Exp $ */ +/* $OpenBSD: db_trace.c,v 1.15 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: db_trace.c,v 1.20 1997/02/05 05:10:25 scottr Exp $ */ /* @@ -44,7 +44,7 @@ extern label_t *db_recover; /* * Register list */ -static int db_var_short __P((struct db_variable *, db_expr_t *, int)); +static int db_var_short(struct db_variable *, db_expr_t *, int); struct db_variable db_regs[] = { /* D0-D7 */ @@ -114,10 +114,10 @@ struct stackpos { int k_regloc[NREGISTERS]; }; -static void findentry __P((struct stackpos *)); -static void findregs __P((struct stackpos *, db_addr_t)); -static int nextframe __P((struct stackpos *, int)); -static void stacktop __P((db_regs_t *, struct stackpos *)); +static void findentry(struct stackpos *); +static void findregs(struct stackpos *, db_addr_t); +static int nextframe(struct stackpos *, int); +static void stacktop(db_regs_t *, struct stackpos *); #define FR_SAVFP 0 diff --git a/sys/arch/m68k/m68k/in_cksum.c b/sys/arch/m68k/m68k/in_cksum.c index c70cdd43eb8..45fe512079f 100644 --- a/sys/arch/m68k/m68k/in_cksum.c +++ b/sys/arch/m68k/m68k/in_cksum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in_cksum.c,v 1.2 1996/05/09 22:30:11 niklas Exp $ */ +/* $OpenBSD: in_cksum.c,v 1.3 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: in_cksum.c,v 1.6 1996/04/30 11:57:05 briggs Exp $ */ /* @@ -47,7 +47,7 @@ #include <netinet/in.h> #include <netinet/in_systm.h> -extern int oc_cksum __P((char *buffer, int length, int startingval)); +extern int oc_cksum(char *buffer, int length, int startingval); /* * Checksum routine for the Internet Protocol family. diff --git a/sys/arch/m68k/m68k/pmap_bootstrap.c b/sys/arch/m68k/m68k/pmap_bootstrap.c index cf1c51edd46..cb75047dc71 100644 --- a/sys/arch/m68k/m68k/pmap_bootstrap.c +++ b/sys/arch/m68k/m68k/pmap_bootstrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_bootstrap.c,v 1.2 2002/02/27 20:51:01 miod Exp $ */ +/* $OpenBSD: pmap_bootstrap.c,v 1.3 2002/03/14 01:26:35 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -100,7 +100,7 @@ extern vsize_t mem_size; extern int pmap_aliasmask; #endif -void pmap_bootstrap __P((paddr_t, paddr_t)); +void pmap_bootstrap(paddr_t, paddr_t); /* diff --git a/sys/arch/m68k/m68k/pmap_motorola.c b/sys/arch/m68k/m68k/pmap_motorola.c index 02c67f39482..15feda116ad 100644 --- a/sys/arch/m68k/m68k/pmap_motorola.c +++ b/sys/arch/m68k/m68k/pmap_motorola.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_motorola.c,v 1.16 2002/01/23 00:39:47 art Exp $ */ +/* $OpenBSD: pmap_motorola.c,v 1.17 2002/03/14 01:26:35 millert Exp $ */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -311,26 +311,26 @@ struct pool pmap_pmap_pool; /* memory pool for pmap structures */ /* * Internal routines */ -struct pv_entry *pmap_alloc_pv __P((void)); -void pmap_free_pv __P((struct pv_entry *)); -void pmap_collect_pv __P((void)); +struct pv_entry *pmap_alloc_pv(void); +void pmap_free_pv(struct pv_entry *); +void pmap_collect_pv(void); #ifdef COMPAT_HPUX -int pmap_mapmulti __P((pmap_t, vaddr_t)); +int pmap_mapmulti(pmap_t, vaddr_t); #endif -void pmap_remove_mapping __P((pmap_t, vaddr_t, pt_entry_t *, int)); -boolean_t pmap_testbit __P((paddr_t, int)); -void pmap_changebit __P((paddr_t, int, int)); -void pmap_enter_ptpage __P((pmap_t, vaddr_t)); -void pmap_ptpage_addref __P((vaddr_t)); -int pmap_ptpage_delref __P((vaddr_t)); -void pmap_collect1 __P((pmap_t, paddr_t, paddr_t)); -void pmap_pinit __P((pmap_t)); -void pmap_release __P((pmap_t)); +void pmap_remove_mapping(pmap_t, vaddr_t, pt_entry_t *, int); +boolean_t pmap_testbit(paddr_t, int); +void pmap_changebit(paddr_t, int, int); +void pmap_enter_ptpage(pmap_t, vaddr_t); +void pmap_ptpage_addref(vaddr_t); +int pmap_ptpage_delref(vaddr_t); +void pmap_collect1(pmap_t, paddr_t, paddr_t); +void pmap_pinit(pmap_t); +void pmap_release(pmap_t); #ifdef DEBUG -void pmap_pvdump __P((paddr_t)); -void pmap_check_wiring __P((char *, vaddr_t)); +void pmap_pvdump(paddr_t); +void pmap_check_wiring(char *, vaddr_t); #endif /* pmap_remove_mapping flags */ diff --git a/sys/arch/m68k/m68k/regdump.c b/sys/arch/m68k/m68k/regdump.c index a7ab0f5a8c5..a27da661de2 100644 --- a/sys/arch/m68k/m68k/regdump.c +++ b/sys/arch/m68k/m68k/regdump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: regdump.c,v 1.2 1997/10/08 07:07:50 niklas Exp $ */ +/* $OpenBSD: regdump.c,v 1.3 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: regdump.c,v 1.1 1997/04/09 19:21:47 thorpej Exp $ */ /* @@ -52,10 +52,10 @@ #include <machine/psl.h> /* XXX until m68k/cpu.h has it */ -void regdump __P((struct trapframe *, int)); +void regdump(struct trapframe *, int); -void dumpmem __P((int *, int, int)); -char *hexstr __P((int, int)); +void dumpmem(int *, int, int); +char *hexstr(int, int); /* * Print a register and stack dump. diff --git a/sys/arch/m68k/m68k/sig_machdep.c b/sys/arch/m68k/m68k/sig_machdep.c index 2cebd4d7cc8..95b8f8e8790 100644 --- a/sys/arch/m68k/m68k/sig_machdep.c +++ b/sys/arch/m68k/m68k/sig_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sig_machdep.c,v 1.7 2001/11/06 19:53:14 miod Exp $ */ +/* $OpenBSD: sig_machdep.c,v 1.8 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: sig_machdep.c,v 1.3 1997/04/30 23:28:03 gwr Exp $ */ /* @@ -93,8 +93,8 @@ extern int fputype; extern short exframesize[]; -void m68881_save __P((struct fpframe *)); -void m68881_restore __P((struct fpframe *)); +void m68881_save(struct fpframe *); +void m68881_restore(struct fpframe *); #define SS_RTEFRAME 1 #define SS_FPSTATE 2 diff --git a/sys/arch/mac68k/dev/adb.c b/sys/arch/mac68k/dev/adb.c index b5facce434a..b70007c3a7f 100644 --- a/sys/arch/mac68k/dev/adb.c +++ b/sys/arch/mac68k/dev/adb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adb.c,v 1.11 2001/08/15 22:06:37 miod Exp $ */ +/* $OpenBSD: adb.c,v 1.12 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: adb.c,v 1.13 1996/12/16 16:17:02 scottr Exp $ */ /*- @@ -52,8 +52,8 @@ e* notice, this list of conditions and the following disclaimer in the /* * Function declarations. */ -static int adbmatch __P((struct device *, void *, void *)); -static void adbattach __P((struct device *, struct device *, void *)); +static int adbmatch(struct device *, void *, void *); +static void adbattach(struct device *, struct device *, void *); /* * Global variables. diff --git a/sys/arch/mac68k/dev/adb_direct.c b/sys/arch/mac68k/dev/adb_direct.c index 73a368a0cf4..ff56727b03d 100644 --- a/sys/arch/mac68k/dev/adb_direct.c +++ b/sys/arch/mac68k/dev/adb_direct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adb_direct.c,v 1.10 1998/05/03 07:12:51 gene Exp $ */ +/* $OpenBSD: adb_direct.c,v 1.11 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: adb_direct.c,v 1.5 1997/04/21 18:04:28 scottr Exp $ */ /* From: adb_direct.c 2.02 4/18/97 jpw */ @@ -58,9 +58,9 @@ typedef unsigned char u_char; #ifdef MRG_ADB -int adb_poweroff __P((void)); -int adb_read_date_time __P((unsigned long *t)); -int adb_set_date_time __P((unsigned long t)); +int adb_poweroff(void); +int adb_read_date_time(unsigned long *t); +int adb_set_date_time(unsigned long t); #endif /* more verbose for testing */ @@ -150,7 +150,7 @@ int adb_set_date_time __P((unsigned long t)); * A structure for storing information about each ADB device. */ struct ADBDevEntry { - void (*ServiceRtPtr) __P((void)); + void (*ServiceRtPtr)(void); void *DataAreaAddr; char devType; char origAddr; @@ -204,48 +204,48 @@ int ADBNumDevices; /* num. of ADB devices found with ADBReInit */ extern struct mac68k_machine_S mac68k_machine; -int zshard __P((int)); +int zshard(int); -void pm_setup_adb __P((void)); -void pm_check_adb_devices __P((int)); -void pm_intr __P((void)); -int pm_adb_op __P((u_char *, void *, void *, int)); -void pm_init_adb_device __P((void)); +void pm_setup_adb(void); +void pm_check_adb_devices(int); +void pm_intr(void); +int pm_adb_op(u_char *, void *, void *, int); +void pm_init_adb_device(void); /* * The following are private routines. */ -void print_single __P((u_char *)); -void adb_intr __P((void)); -void adb_intr_II __P((void)); -void adb_intr_IIsi __P((void)); -void adb_intr_cuda __P((void)); -int send_adb_II __P((u_char *, u_char *, void *, void *, int)); -int send_adb_IIsi __P((u_char *, u_char *, void *, void *, int)); -int send_adb_cuda __P((u_char *, u_char *, void *, void *, int)); -void adb_intr_cuda_test __P((void)); -void adb_handle_unsol __P((u_char *)); -void adb_op_comprout __P((void)); -void adb_reinit __P((void)); -int count_adbs __P((void)); -int get_ind_adb_info __P((ADBDataBlock *, int)); -int get_adb_info __P((ADBDataBlock *, int)); -int set_adb_info __P((ADBSetInfoBlock *, int)); -void adb_setup_hw_type __P((void)); -int adb_op __P((Ptr, Ptr, Ptr, short)); -void adb_handle_unsol __P((u_char *)); -int adb_op_sync __P((Ptr, Ptr, Ptr, short)); -void adb_read_II __P((u_char *)); -void adb_cleanup __P((u_char *)); -void adb_cleanup_IIsi __P((u_char *)); -void adb_comp_exec __P((void)); -int adb_cmd_result __P((u_char *)); -int adb_cmd_extra __P((u_char *)); -int adb_guess_next_device __P((void)); -int adb_prog_switch_enable __P((void)); -int adb_prog_switch_disable __P((void)); +void print_single(u_char *); +void adb_intr(void); +void adb_intr_II(void); +void adb_intr_IIsi(void); +void adb_intr_cuda(void); +int send_adb_II(u_char *, u_char *, void *, void *, int); +int send_adb_IIsi(u_char *, u_char *, void *, void *, int); +int send_adb_cuda(u_char *, u_char *, void *, void *, int); +void adb_intr_cuda_test(void); +void adb_handle_unsol(u_char *); +void adb_op_comprout(void); +void adb_reinit(void); +int count_adbs(void); +int get_ind_adb_info(ADBDataBlock *, int); +int get_adb_info(ADBDataBlock *, int); +int set_adb_info(ADBSetInfoBlock *, int); +void adb_setup_hw_type(void); +int adb_op(Ptr, Ptr, Ptr, short); +void adb_handle_unsol(u_char *); +int adb_op_sync(Ptr, Ptr, Ptr, short); +void adb_read_II(u_char *); +void adb_cleanup(u_char *); +void adb_cleanup_IIsi(u_char *); +void adb_comp_exec(void); +int adb_cmd_result(u_char *); +int adb_cmd_extra(u_char *); +int adb_guess_next_device(void); +int adb_prog_switch_enable(void); +int adb_prog_switch_disable(void); /* we should create this and it will be the public version */ -int send_adb __P((u_char *, void *, void *)); +int send_adb(u_char *, void *, void *); /* * print_single diff --git a/sys/arch/mac68k/dev/adbsys.c b/sys/arch/mac68k/dev/adbsys.c index 4d83d54b150..78bbead2ba5 100644 --- a/sys/arch/mac68k/dev/adbsys.c +++ b/sys/arch/mac68k/dev/adbsys.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adbsys.c,v 1.10 1998/05/03 07:12:53 gene Exp $ */ +/* $OpenBSD: adbsys.c,v 1.11 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: adbsys.c,v 1.24 1997/01/13 07:01:23 scottr Exp $ */ /*- @@ -43,9 +43,9 @@ extern struct mac68k_machine_S mac68k_machine; /* from adb.c */ -void adb_processevent __P((adb_event_t * event)); +void adb_processevent(adb_event_t * event); -extern void adb_jadbproc __P((void)); +extern void adb_jadbproc(void); void adb_complete(buffer, data_area, adb_command) diff --git a/sys/arch/mac68k/dev/adbvar.h b/sys/arch/mac68k/dev/adbvar.h index b6335ff936d..b52a04df698 100644 --- a/sys/arch/mac68k/dev/adbvar.h +++ b/sys/arch/mac68k/dev/adbvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: adbvar.h,v 1.6 1997/04/14 18:47:56 gene Exp $ */ +/* $OpenBSD: adbvar.h,v 1.7 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: adbvar.h,v 1.5 1997/01/13 07:01:24 scottr Exp $ */ /*- @@ -46,26 +46,26 @@ typedef struct adb_trace_xlate_s { extern adb_trace_xlate_t adb_trace_xlations[]; /* adb.c */ -void adb_asmcomplete __P((void)); -void adb_enqevent __P((adb_event_t *event)); -void adb_handoff __P((adb_event_t *event)); -void adb_autorepeat __P((void *keyp)); -void adb_dokeyupdown __P((adb_event_t *event)); -void adb_keymaybemouse __P((adb_event_t *event)); -void adb_processevent __P((adb_event_t *event)); -int adbopen __P((dev_t dev, int flag, int mode, struct proc *p)); -int adbclose __P((dev_t dev, int flag, int mode, struct proc *p)); -int adbread __P((dev_t dev, struct uio *uio, int flag)); -int adbwrite __P((dev_t dev, struct uio *uio, int flag)); -int adbioctl __P((dev_t , int , caddr_t , int , struct proc *)); -int adbselect __P((dev_t dev, int rw, struct proc *p)); +void adb_asmcomplete(void); +void adb_enqevent(adb_event_t *event); +void adb_handoff(adb_event_t *event); +void adb_autorepeat(void *keyp); +void adb_dokeyupdown(adb_event_t *event); +void adb_keymaybemouse(adb_event_t *event); +void adb_processevent(adb_event_t *event); +int adbopen(dev_t dev, int flag, int mode, struct proc *p); +int adbclose(dev_t dev, int flag, int mode, struct proc *p); +int adbread(dev_t dev, struct uio *uio, int flag); +int adbwrite(dev_t dev, struct uio *uio, int flag); +int adbioctl(dev_t , int , caddr_t , int , struct proc *); +int adbselect(dev_t dev, int rw, struct proc *p); /* adbsysadm.s */ -void extdms_complete __P((void)); +void extdms_complete(void); /* adbsys.c */ -void adb_complete __P((caddr_t buffer, caddr_t data_area, int adb_command)); -void extdms_init __P((int)); +void adb_complete(caddr_t buffer, caddr_t data_area, int adb_command); +void extdms_init(int); #ifndef MRG_ADB @@ -77,14 +77,14 @@ void extdms_init __P((int)); #define ADB_HW_CUDA 0x05 /* Machines with a Cuda chip */ /* adb_direct.c */ -int adb_poweroff __P((void)); -int CountADBs __P((void)); -void ADBReInit __P((void)); -int GetIndADB __P((ADBDataBlock * info, int index)); -int GetADBInfo __P((ADBDataBlock * info, int adbAddr)); -int SetADBInfo __P((ADBSetInfoBlock * info, int adbAddr)); -int ADBOp __P((Ptr buffer, Ptr compRout, Ptr data, short commandNum)); -int adb_read_date_time __P((unsigned long *t)); -int adb_set_date_time __P((unsigned long t)); +int adb_poweroff(void); +int CountADBs(void); +void ADBReInit(void); +int GetIndADB(ADBDataBlock * info, int index); +int GetADBInfo(ADBDataBlock * info, int adbAddr); +int SetADBInfo(ADBSetInfoBlock * info, int adbAddr); +int ADBOp(Ptr buffer, Ptr compRout, Ptr data, short commandNum); +int adb_read_date_time(unsigned long *t); +int adb_set_date_time(unsigned long t); #endif diff --git a/sys/arch/mac68k/dev/asc.c b/sys/arch/mac68k/dev/asc.c index 0806cce19d5..003699da211 100644 --- a/sys/arch/mac68k/dev/asc.c +++ b/sys/arch/mac68k/dev/asc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc.c,v 1.13 2001/11/06 19:53:14 miod Exp $ */ +/* $OpenBSD: asc.c,v 1.14 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: asc.c,v 1.20 1997/02/24 05:47:33 scottr Exp $ */ /* @@ -93,11 +93,11 @@ static u_int8_t asc_wave_tab[0x800]; -static int asc_ring_bell __P((void *, int, int, int)); -static void asc_stop_bell __P((void *)); +static int asc_ring_bell(void *, int, int, int); +static void asc_stop_bell(void *); -static int ascmatch __P((struct device *, void *, void *)); -static void ascattach __P((struct device *, struct device *, void *)); +static int ascmatch(struct device *, void *, void *); +static void ascattach(struct device *, struct device *, void *); struct cfattach asc_ca = { sizeof(struct asc_softc), ascmatch, ascattach diff --git a/sys/arch/mac68k/dev/ascvar.h b/sys/arch/mac68k/dev/ascvar.h index ff05129d144..7c1c2c30f16 100644 --- a/sys/arch/mac68k/dev/ascvar.h +++ b/sys/arch/mac68k/dev/ascvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ascvar.h,v 1.4 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: ascvar.h,v 1.5 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: ascvar.h,v 1.3 1997/02/24 05:47:34 scottr Exp $ */ /* @@ -42,10 +42,10 @@ struct asc_softc { struct timeout sc_bell_tmo; }; -int ascopen __P((dev_t dev, int flag, int mode, struct proc *p)); -int ascclose __P((dev_t dev, int flag, int mode, struct proc *p)); -int ascread __P((dev_t, struct uio *, int)); -int ascwrite __P((dev_t, struct uio *, int)); -int ascioctl __P((dev_t, int, caddr_t, int, struct proc *p)); -int ascselect __P((dev_t dev, int rw, struct proc *p)); -paddr_t ascmmap __P((dev_t dev, off_t off, int prot)); +int ascopen(dev_t dev, int flag, int mode, struct proc *p); +int ascclose(dev_t dev, int flag, int mode, struct proc *p); +int ascread(dev_t, struct uio *, int); +int ascwrite(dev_t, struct uio *, int); +int ascioctl(dev_t, int, caddr_t, int, struct proc *p); +int ascselect(dev_t dev, int rw, struct proc *p); +paddr_t ascmmap(dev_t dev, off_t off, int prot); diff --git a/sys/arch/mac68k/dev/esp.c b/sys/arch/mac68k/dev/esp.c index e3ec485c056..0cce56422aa 100644 --- a/sys/arch/mac68k/dev/esp.c +++ b/sys/arch/mac68k/dev/esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esp.c,v 1.14 2001/07/04 08:52:44 niklas Exp $ */ +/* $OpenBSD: esp.c,v 1.15 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: esp.c,v 1.59 1996/10/13 02:59:48 christos Exp $ */ /* @@ -104,8 +104,8 @@ #include <mac68k/dev/espvar.h> -void espattach __P((struct device *, struct device *, void *)); -int espmatch __P((struct device *, void *, void *)); +void espattach(struct device *, struct device *, void *); +int espmatch(struct device *, void *, void *); /* Linkup to the rest of the kernel */ struct cfattach esp_ca = { @@ -129,16 +129,16 @@ struct scsi_device esp_dev = { /* * Functions and the switch for the MI code. */ -u_char esp_read_reg __P((struct ncr53c9x_softc *, int)); -void esp_write_reg __P((struct ncr53c9x_softc *, int, u_char)); -int esp_dma_isintr __P((struct ncr53c9x_softc *)); -void esp_dma_reset __P((struct ncr53c9x_softc *)); -int esp_dma_intr __P((struct ncr53c9x_softc *)); -int esp_dma_setup __P((struct ncr53c9x_softc *, caddr_t *, - size_t *, int, size_t *)); -void esp_dma_go __P((struct ncr53c9x_softc *)); -void esp_dma_stop __P((struct ncr53c9x_softc *)); -int esp_dma_isactive __P((struct ncr53c9x_softc *)); +u_char esp_read_reg(struct ncr53c9x_softc *, int); +void esp_write_reg(struct ncr53c9x_softc *, int, u_char); +int esp_dma_isintr(struct ncr53c9x_softc *); +void esp_dma_reset(struct ncr53c9x_softc *); +int esp_dma_intr(struct ncr53c9x_softc *); +int esp_dma_setup(struct ncr53c9x_softc *, caddr_t *, + size_t *, int, size_t *); +void esp_dma_go(struct ncr53c9x_softc *); +void esp_dma_stop(struct ncr53c9x_softc *); +int esp_dma_isactive(struct ncr53c9x_softc *); struct ncr53c9x_glue esp_glue = { esp_read_reg, diff --git a/sys/arch/mac68k/dev/grf.c b/sys/arch/mac68k/dev/grf.c index 34aeb896c27..7adae8ca1b3 100644 --- a/sys/arch/mac68k/dev/grf.c +++ b/sys/arch/mac68k/dev/grf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf.c,v 1.20 2001/12/19 08:58:05 art Exp $ */ +/* $OpenBSD: grf.c,v 1.21 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: grf.c,v 1.41 1997/02/24 06:20:04 scottr Exp $ */ /* @@ -81,8 +81,8 @@ #define iteoff(u,f) #endif -int grfmatch __P((struct device *, void *, void *)); -void grfattach __P((struct device *, struct device *, void *)); +int grfmatch(struct device *, void *, void *); +void grfattach(struct device *, struct device *, void *); struct cfdriver grf_cd = { NULL, "grf", DV_DULL diff --git a/sys/arch/mac68k/dev/grf_iv.c b/sys/arch/mac68k/dev/grf_iv.c index 19ec1dd9703..be4164aef69 100644 --- a/sys/arch/mac68k/dev/grf_iv.c +++ b/sys/arch/mac68k/dev/grf_iv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_iv.c,v 1.19 1999/04/24 06:39:40 downsj Exp $ */ +/* $OpenBSD: grf_iv.c,v 1.20 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: grf_iv.c,v 1.17 1997/02/20 00:23:27 scottr Exp $ */ /* @@ -60,10 +60,10 @@ extern long videorowbytes; extern long videobitdepth; extern unsigned long videosize; -static int grfiv_mode __P((struct grf_softc *gp, int cmd, void *arg)); -static caddr_t grfiv_phys __P((struct grf_softc *gp, vm_offset_t addr)); -static int grfiv_match __P((struct device *, void *, void *)); -static void grfiv_attach __P((struct device *, struct device *, void *)); +static int grfiv_mode(struct grf_softc *gp, int cmd, void *arg); +static caddr_t grfiv_phys(struct grf_softc *gp, vm_offset_t addr); +static int grfiv_match(struct device *, void *, void *); +static void grfiv_attach(struct device *, struct device *, void *); struct cfdriver intvid_cd = { NULL, "intvid", DV_DULL diff --git a/sys/arch/mac68k/dev/grf_mv.c b/sys/arch/mac68k/dev/grf_mv.c index e54930c019f..2fbb1d01671 100644 --- a/sys/arch/mac68k/dev/grf_mv.c +++ b/sys/arch/mac68k/dev/grf_mv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_mv.c,v 1.17 1999/04/24 06:39:40 downsj Exp $ */ +/* $OpenBSD: grf_mv.c,v 1.18 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: grf_mv.c,v 1.24 1997/05/03 02:29:54 briggs Exp $ */ /* @@ -51,18 +51,18 @@ #include "nubus.h" #include "grfvar.h" -static void load_image_data __P((caddr_t data, struct image_data *image)); +static void load_image_data(caddr_t data, struct image_data *image); -static void grfmv_intr_generic __P((void *vsc, int slot)); -static void grfmv_intr_radius __P((void *vsc, int slot)); -static void grfmv_intr_cti __P((void *vsc, int slot)); -static void grfmv_intr_cb264 __P((void *vsc, int slot)); -static void grfmv_intr_cb364 __P((void *vsc, int slot)); +static void grfmv_intr_generic(void *vsc, int slot); +static void grfmv_intr_radius(void *vsc, int slot); +static void grfmv_intr_cti(void *vsc, int slot); +static void grfmv_intr_cb264(void *vsc, int slot); +static void grfmv_intr_cb364(void *vsc, int slot); -static int grfmv_mode __P((struct grf_softc *gp, int cmd, void *arg)); -static caddr_t grfmv_phys __P((struct grf_softc *gp, vm_offset_t addr)); -static int grfmv_match __P((struct device *, void *, void *)); -static void grfmv_attach __P((struct device *, struct device *, void *)); +static int grfmv_mode(struct grf_softc *gp, int cmd, void *arg); +static caddr_t grfmv_phys(struct grf_softc *gp, vm_offset_t addr); +static int grfmv_match(struct device *, void *, void *); +static void grfmv_attach(struct device *, struct device *, void *); struct cfdriver macvid_cd = { NULL, "macvid", DV_DULL diff --git a/sys/arch/mac68k/dev/grf_subr.c b/sys/arch/mac68k/dev/grf_subr.c index eb2631a34dc..cab2542f520 100644 --- a/sys/arch/mac68k/dev/grf_subr.c +++ b/sys/arch/mac68k/dev/grf_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_subr.c,v 1.4 1997/03/08 16:16:52 briggs Exp $ */ +/* $OpenBSD: grf_subr.c,v 1.5 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: grf_subr.c,v 1.6 1997/02/20 00:23:28 scottr Exp $ */ /*- @@ -51,8 +51,8 @@ void grf_establish(sc, sp, g_mode, g_phys) struct grfbus_softc *sc; nubus_slot *sp; - int (*g_mode) __P((struct grf_softc *, int, void *)); - caddr_t (*g_phys) __P((struct grf_softc *, vm_offset_t)); + int (*g_mode)(struct grf_softc *, int, void *); + caddr_t (*g_phys)(struct grf_softc *, vm_offset_t); { struct grfmode *gm = &sc->curr_mode; struct grfbus_attach_args ga; diff --git a/sys/arch/mac68k/dev/grfvar.h b/sys/arch/mac68k/dev/grfvar.h index f6031403ab6..19d3396ae49 100644 --- a/sys/arch/mac68k/dev/grfvar.h +++ b/sys/arch/mac68k/dev/grfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: grfvar.h,v 1.9 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: grfvar.h,v 1.10 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: grfvar.h,v 1.11 1996/08/04 06:03:58 scottr Exp $ */ /* @@ -74,9 +74,9 @@ struct grf_softc { struct grfmode *sc_grfmode; /* forwarded ... */ nubus_slot *sc_slot; /* mode-change on/off/mode function */ - int (*sc_mode) __P((struct grf_softc *, int, void *)); + int (*sc_mode)(struct grf_softc *, int, void *); /* map virtual addr to physical addr */ - caddr_t (*sc_phys) __P((struct grf_softc *, vm_offset_t)); + caddr_t (*sc_phys)(struct grf_softc *, vm_offset_t); }; /* @@ -86,11 +86,11 @@ struct grfbus_attach_args { char *ga_name; /* name of semantics to attach */ struct grfmode *ga_grfmode; /* forwarded ... */ nubus_slot *ga_slot; - int (*ga_mode) __P((struct grf_softc *, int, void *)); - caddr_t (*ga_phys) __P((struct grf_softc *, vm_offset_t)); + int (*ga_mode)(struct grf_softc *, int, void *); + caddr_t (*ga_phys)(struct grf_softc *, vm_offset_t); }; -typedef caddr_t (*grf_phys_t) __P((struct grf_softc *gp, vm_offset_t addr)); +typedef caddr_t (*grf_phys_t)(struct grf_softc *gp, vm_offset_t addr); /* flags */ #define GF_ALIVE 0x01 @@ -140,18 +140,18 @@ struct image_data { #define VID_PAGE_CNT 3 #define VID_DEV_TYPE 4 -int grfopen __P((dev_t dev, int flag, int mode, struct proc *p)); -int grfclose __P((dev_t dev, int flag, int mode, struct proc *p)); -int grfioctl __P((dev_t, int, caddr_t, int, struct proc *p)); -int grfselect __P((dev_t dev, int rw, struct proc *p)); -paddr_t grfmmap __P((dev_t dev, off_t off, int prot)); -int grfon __P((dev_t dev)); -int grfoff __P((dev_t dev)); -int grfaddr __P((struct grf_softc *gp, register int off)); -int grfmap __P((dev_t dev, caddr_t *addrp, struct proc *p)); -int grfunmap __P((dev_t dev, caddr_t addr, struct proc *p)); +int grfopen(dev_t dev, int flag, int mode, struct proc *p); +int grfclose(dev_t dev, int flag, int mode, struct proc *p); +int grfioctl(dev_t, int, caddr_t, int, struct proc *p); +int grfselect(dev_t dev, int rw, struct proc *p); +paddr_t grfmmap(dev_t dev, off_t off, int prot); +int grfon(dev_t dev); +int grfoff(dev_t dev); +int grfaddr(struct grf_softc *gp, register int off); +int grfmap(dev_t dev, caddr_t *addrp, struct proc *p); +int grfunmap(dev_t dev, caddr_t addr, struct proc *p); void grf_establish __P((struct grfbus_softc *, nubus_slot *, int (*)(struct grf_softc *, int, void *), caddr_t (*)(struct grf_softc *, vm_offset_t))); -int grfbusprint __P((void *, const char *)); +int grfbusprint(void *, const char *); diff --git a/sys/arch/mac68k/dev/if_ae.c b/sys/arch/mac68k/dev/if_ae.c index 66b3b8f071d..b0d75b94c03 100644 --- a/sys/arch/mac68k/dev/if_ae.c +++ b/sys/arch/mac68k/dev/if_ae.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ae.c,v 1.17 2001/09/20 17:02:30 mpech Exp $ */ +/* $OpenBSD: if_ae.c,v 1.18 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: if_ae.c,v 1.62 1997/04/24 16:52:05 scottr Exp $ */ /* @@ -54,9 +54,9 @@ #define inline /* XXX for debugging porpoises */ -static inline void ae_rint __P((struct ae_softc *)); -static inline void ae_xmit __P((struct ae_softc *)); -static inline int ae_ring_copy __P(( struct ae_softc *, int, caddr_t, int)); +static inline void ae_rint(struct ae_softc *); +static inline void ae_xmit(struct ae_softc *); +static inline int ae_ring_copy( struct ae_softc *, int, caddr_t, int); #define ETHER_MIN_LEN 64 #define ETHER_MAX_LEN 1518 diff --git a/sys/arch/mac68k/dev/if_ae_nubus.c b/sys/arch/mac68k/dev/if_ae_nubus.c index d18ecdfcf20..b787bd80d0e 100644 --- a/sys/arch/mac68k/dev/if_ae_nubus.c +++ b/sys/arch/mac68k/dev/if_ae_nubus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ae_nubus.c,v 1.7 1997/05/01 18:32:49 briggs Exp $ */ +/* $OpenBSD: if_ae_nubus.c,v 1.8 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: if_ae_nubus.c,v 1.17 1997/05/01 18:17:16 briggs Exp $ */ /* @@ -67,12 +67,12 @@ #include "if_aereg.h" #include "if_aevar.h" -static int ae_nubus_match __P((struct device *, void *, void *)); -static void ae_nubus_attach __P((struct device *, struct device *, void *)); -static int ae_nb_card_vendor __P((struct nubus_attach_args *)); -static int ae_nb_get_enaddr __P((struct nubus_attach_args *, u_int8_t *)); +static int ae_nubus_match(struct device *, void *, void *); +static void ae_nubus_attach(struct device *, struct device *, void *); +static int ae_nb_card_vendor(struct nubus_attach_args *); +static int ae_nb_get_enaddr(struct nubus_attach_args *, u_int8_t *); #ifdef DEBUG -static void ae_nb_watchdog __P((struct ifnet *)); +static void ae_nb_watchdog(struct ifnet *); #endif struct cfattach ae_nubus_ca = { diff --git a/sys/arch/mac68k/dev/if_aevar.h b/sys/arch/mac68k/dev/if_aevar.h index 1db6ecc1c7c..83a8ac81328 100644 --- a/sys/arch/mac68k/dev/if_aevar.h +++ b/sys/arch/mac68k/dev/if_aevar.h @@ -1,5 +1,5 @@ /* $NetBSD: if_aevar.h,v 1.7 1997/03/19 08:04:40 scottr Exp $ */ -/* $OpenBSD: if_aevar.h,v 1.2 1997/03/25 04:58:44 briggs Exp $ */ +/* $OpenBSD: if_aevar.h,v 1.3 2002/03/14 01:26:35 millert Exp $ */ /* * Device driver for National Semiconductor DS8390/WD83C690 based ethernet @@ -55,20 +55,20 @@ struct ae_softc { u_short next_packet; /* pointer to next unread RX packet */ }; -int ae_size_card_memory __P(( - bus_space_tag_t, bus_space_handle_t, int)); +int ae_size_card_memory( + bus_space_tag_t, bus_space_handle_t, int); -int aesetup __P((struct ae_softc *)); -void aeintr __P((void *, int)); -int aeioctl __P((struct ifnet *, u_long, caddr_t)); -void aestart __P((struct ifnet *)); -void aewatchdog __P((struct ifnet *)); -void aereset __P((struct ae_softc *)); -void aeinit __P((struct ae_softc *)); -void aestop __P((struct ae_softc *)); +int aesetup(struct ae_softc *); +void aeintr(void *, int); +int aeioctl(struct ifnet *, u_long, caddr_t); +void aestart(struct ifnet *); +void aewatchdog(struct ifnet *); +void aereset(struct ae_softc *); +void aeinit(struct ae_softc *); +void aestop(struct ae_softc *); -void aeread __P((struct ae_softc *, int, int)); -struct mbuf *aeget __P((struct ae_softc *, int, int)); +void aeread(struct ae_softc *, int, int); +struct mbuf *aeget(struct ae_softc *, int, int); -int ae_put __P((struct ae_softc *, struct mbuf *, int)); -void ae_getmcaf __P((struct arpcom *, u_char *)); +int ae_put(struct ae_softc *, struct mbuf *, int); +void ae_getmcaf(struct arpcom *, u_char *); diff --git a/sys/arch/mac68k/dev/if_mc.c b/sys/arch/mac68k/dev/if_mc.c index 45e19e78de1..cc5db10344e 100644 --- a/sys/arch/mac68k/dev/if_mc.c +++ b/sys/arch/mac68k/dev/if_mc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mc.c,v 1.5 2001/11/06 19:53:14 miod Exp $ */ +/* $OpenBSD: if_mc.c,v 1.6 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: if_mc.c,v 1.4 1998/01/12 19:22:09 thorpej Exp $ */ /*- @@ -86,19 +86,19 @@ struct cfdriver mc_cd = { NULL, "mc", DV_IFNET }; -hide void mcwatchdog __P((struct ifnet *)); -hide int mcinit __P((struct mc_softc *sc)); -hide int mcstop __P((struct mc_softc *sc)); -hide int mcioctl __P((struct ifnet *ifp, u_long cmd, caddr_t data)); -hide void mcstart __P((struct ifnet *ifp)); -hide void mcreset __P((struct mc_softc *sc)); - -integrate u_int maceput __P((struct mc_softc *sc, struct mbuf *m0)); -integrate void mc_tint __P((struct mc_softc *sc)); -integrate void mace_read __P((struct mc_softc *, caddr_t, int)); -integrate struct mbuf *mace_get __P((struct mc_softc *, caddr_t, int)); -static void mace_calcladrf __P((struct arpcom *ac, u_int8_t *af)); -static inline u_int16_t ether_cmp __P((void *, void *)); +hide void mcwatchdog(struct ifnet *); +hide int mcinit(struct mc_softc *sc); +hide int mcstop(struct mc_softc *sc); +hide int mcioctl(struct ifnet *ifp, u_long cmd, caddr_t data); +hide void mcstart(struct ifnet *ifp); +hide void mcreset(struct mc_softc *sc); + +integrate u_int maceput(struct mc_softc *sc, struct mbuf *m0); +integrate void mc_tint(struct mc_softc *sc); +integrate void mace_read(struct mc_softc *, caddr_t, int); +integrate struct mbuf *mace_get(struct mc_softc *, caddr_t, int); +static void mace_calcladrf(struct arpcom *ac, u_int8_t *af); +static inline u_int16_t ether_cmp(void *, void *); /* diff --git a/sys/arch/mac68k/dev/if_mc_obio.c b/sys/arch/mac68k/dev/if_mc_obio.c index 37e122cda22..232602ff489 100644 --- a/sys/arch/mac68k/dev/if_mc_obio.c +++ b/sys/arch/mac68k/dev/if_mc_obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mc_obio.c,v 1.2 2001/11/06 19:53:14 miod Exp $ */ +/* $OpenBSD: if_mc_obio.c,v 1.3 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: if_mc_obio.c,v 1.4 1998/01/13 19:24:54 scottr Exp $ */ /*- @@ -60,17 +60,17 @@ #define MACE_REG_BASE 0x50F1C000 #define MACE_PROM_BASE 0x50F08000 -hide int mc_obio_match __P((struct device *, void *, void *)); -hide void mc_obio_attach __P((struct device *, struct device *, void *)); -hide void mc_obio_init __P((struct mc_softc *sc)); -hide void mc_obio_put __P((struct mc_softc *sc, u_int len)); -hide int mc_dmaintr __P((void *arg)); -hide void mc_reset_rxdma __P((struct mc_softc *sc)); -hide void mc_reset_rxdma_set __P((struct mc_softc *, int set)); -hide void mc_reset_txdma __P((struct mc_softc *sc)); -hide int mc_obio_getaddr __P((struct mc_softc *, u_int8_t *)); - -extern int kvtop __P((register caddr_t addr)); +hide int mc_obio_match(struct device *, void *, void *); +hide void mc_obio_attach(struct device *, struct device *, void *); +hide void mc_obio_init(struct mc_softc *sc); +hide void mc_obio_put(struct mc_softc *sc, u_int len); +hide int mc_dmaintr(void *arg); +hide void mc_reset_rxdma(struct mc_softc *sc); +hide void mc_reset_rxdma_set(struct mc_softc *, int set); +hide void mc_reset_txdma(struct mc_softc *sc); +hide int mc_obio_getaddr(struct mc_softc *, u_int8_t *); + +extern int kvtop(register caddr_t addr); struct cfattach mc_obio_ca = { sizeof(struct mc_softc), mc_obio_match, mc_obio_attach diff --git a/sys/arch/mac68k/dev/if_mcvar.h b/sys/arch/mac68k/dev/if_mcvar.h index 057244e14f3..74de54074b1 100644 --- a/sys/arch/mac68k/dev/if_mcvar.h +++ b/sys/arch/mac68k/dev/if_mcvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mcvar.h,v 1.1 1998/05/08 22:15:32 gene Exp $ */ +/* $OpenBSD: if_mcvar.h,v 1.2 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: if_mcvar.h,v 1.3 1997/12/07 17:47:48 scottr Exp $ */ /*- @@ -73,8 +73,8 @@ struct mc_softc { u_int8_t sc_enaddr[6]; u_int8_t sc_pad[2]; int sc_havecarrier; /* carrier status */ - void (*sc_bus_init) __P((struct mc_softc *)); - void (*sc_putpacket) __P((struct mc_softc *, u_int)); + void (*sc_bus_init)(struct mc_softc *); + void (*sc_putpacket)(struct mc_softc *, u_int); bus_space_tag_t sc_regt; bus_space_handle_t sc_regh; @@ -86,8 +86,8 @@ struct mc_softc { int sc_txset, sc_txseti; }; -int mcsetup __P((struct mc_softc *, u_int8_t *)); -void mcintr __P((void *arg)); -void mc_rint __P((struct mc_softc *sc)); -u_char mc_get_enaddr __P((bus_space_tag_t t, bus_space_handle_t h, - vm_offset_t o, u_char *dst)); +int mcsetup(struct mc_softc *, u_int8_t *); +void mcintr(void *arg); +void mc_rint(struct mc_softc *sc); +u_char mc_get_enaddr(bus_space_tag_t t, bus_space_handle_t h, + vm_offset_t o, u_char *dst); diff --git a/sys/arch/mac68k/dev/if_sn.c b/sys/arch/mac68k/dev/if_sn.c index 849844f0e8c..6f6aff4d7b2 100644 --- a/sys/arch/mac68k/dev/if_sn.c +++ b/sys/arch/mac68k/dev/if_sn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sn.c,v 1.30 2001/11/06 19:53:14 miod Exp $ */ +/* $OpenBSD: if_sn.c,v 1.31 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: if_sn.c,v 1.13 1997/04/25 03:40:10 briggs Exp $ */ /* @@ -53,31 +53,31 @@ #include <mac68k/dev/if_snreg.h> #include <mac68k/dev/if_snvar.h> -static void snwatchdog __P((struct ifnet *)); -static int sninit __P((struct sn_softc *sc)); -static int snstop __P((struct sn_softc *sc)); -static int snioctl __P((struct ifnet *ifp, u_long cmd, caddr_t data)); -static void snstart __P((struct ifnet *ifp)); -static void snreset __P((struct sn_softc *sc)); - -static void caminitialise __P((struct sn_softc *)); -static void camentry __P((struct sn_softc *, int, u_char *ea)); -static void camprogram __P((struct sn_softc *)); -static void initialise_tda __P((struct sn_softc *)); -static void initialise_rda __P((struct sn_softc *)); -static void initialise_rra __P((struct sn_softc *)); +static void snwatchdog(struct ifnet *); +static int sninit(struct sn_softc *sc); +static int snstop(struct sn_softc *sc); +static int snioctl(struct ifnet *ifp, u_long cmd, caddr_t data); +static void snstart(struct ifnet *ifp); +static void snreset(struct sn_softc *sc); + +static void caminitialise(struct sn_softc *); +static void camentry(struct sn_softc *, int, u_char *ea); +static void camprogram(struct sn_softc *); +static void initialise_tda(struct sn_softc *); +static void initialise_rda(struct sn_softc *); +static void initialise_rra(struct sn_softc *); #ifdef SNDEBUG -static void camdump __P((struct sn_softc *sc)); +static void camdump(struct sn_softc *sc); #endif -static void sonictxint __P((struct sn_softc *)); -static void sonicrxint __P((struct sn_softc *)); +static void sonictxint(struct sn_softc *); +static void sonicrxint(struct sn_softc *); -static __inline__ int sonicput __P((struct sn_softc *sc, struct mbuf *m0, - int mtd_next)); -static __inline__ int sonic_read __P((struct sn_softc *, caddr_t, int)); -static __inline__ struct mbuf *sonic_get __P((struct sn_softc *, - struct ether_header *, int)); +static __inline__ int sonicput(struct sn_softc *sc, struct mbuf *m0, + int mtd_next); +static __inline__ int sonic_read(struct sn_softc *, caddr_t, int); +static __inline__ struct mbuf *sonic_get(struct sn_softc *, + struct ether_header *, int); struct cfdriver sn_cd = { NULL, "sn", DV_IFNET diff --git a/sys/arch/mac68k/dev/if_sn_nubus.c b/sys/arch/mac68k/dev/if_sn_nubus.c index e7128102867..cf19ebb7c17 100644 --- a/sys/arch/mac68k/dev/if_sn_nubus.c +++ b/sys/arch/mac68k/dev/if_sn_nubus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sn_nubus.c,v 1.13 2001/07/04 08:52:45 niklas Exp $ */ +/* $OpenBSD: if_sn_nubus.c,v 1.14 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: if_sn_nubus.c,v 1.13 1997/05/11 19:11:34 scottr Exp $ */ /* * Copyright (C) 1997 Allen Briggs @@ -52,10 +52,10 @@ #include "if_snreg.h" #include "if_snvar.h" -static int sn_nubus_match __P((struct device *, void *, void *)); -static void sn_nubus_attach __P((struct device *, struct device *, void *)); -static int sn_nb_card_vendor __P((bus_space_tag_t, bus_space_handle_t, - struct nubus_attach_args *)); +static int sn_nubus_match(struct device *, void *, void *); +static void sn_nubus_attach(struct device *, struct device *, void *); +static int sn_nb_card_vendor(bus_space_tag_t, bus_space_handle_t, + struct nubus_attach_args *); struct cfattach sn_nubus_ca = { sizeof(struct sn_softc), sn_nubus_match, sn_nubus_attach diff --git a/sys/arch/mac68k/dev/if_sn_obio.c b/sys/arch/mac68k/dev/if_sn_obio.c index 01dabfa489e..a42f319965c 100644 --- a/sys/arch/mac68k/dev/if_sn_obio.c +++ b/sys/arch/mac68k/dev/if_sn_obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sn_obio.c,v 1.17 2001/07/04 08:52:46 niklas Exp $ */ +/* $OpenBSD: if_sn_obio.c,v 1.18 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: if_sn_obio.c,v 1.9 1997/04/22 20:56:15 scottr Exp $ */ /* @@ -54,10 +54,10 @@ #define SONIC_REG_BASE 0x50F0A000 #define SONIC_PROM_BASE 0x50F08000 -static int sn_obio_match __P((struct device *, void *, void *)); -static void sn_obio_attach __P((struct device *, struct device *, void *)); -static int sn_obio_getaddr __P((struct sn_softc *, u_int8_t *)); -static int sn_obio_getaddr_kludge __P((struct sn_softc *, u_int8_t *)); +static int sn_obio_match(struct device *, void *, void *); +static void sn_obio_attach(struct device *, struct device *, void *); +static int sn_obio_getaddr(struct sn_softc *, u_int8_t *); +static int sn_obio_getaddr_kludge(struct sn_softc *, u_int8_t *); struct cfattach sn_obio_ca = { sizeof(struct sn_softc), sn_obio_match, sn_obio_attach diff --git a/sys/arch/mac68k/dev/if_snvar.h b/sys/arch/mac68k/dev/if_snvar.h index 0f546e825e9..7c418932a81 100644 --- a/sys/arch/mac68k/dev/if_snvar.h +++ b/sys/arch/mac68k/dev/if_snvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_snvar.h,v 1.9 2001/07/04 08:52:46 niklas Exp $ */ +/* $OpenBSD: if_snvar.h,v 1.10 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: if_snvar.h,v 1.8 1997/04/25 03:40:09 briggs Exp $ */ /* @@ -214,7 +214,7 @@ typedef struct sn_softc { #define CDA_ENABLE 64 /* mask enabling CAM entries */ #define CDA_SIZE(sc) ((4*16 + 1) * ((sc->bitmode) ? 4 : 2)) -int snsetup __P((struct sn_softc *sc, u_int8_t *)); -void snintr __P((void *, int)); -void sn_get_enaddr __P((bus_space_tag_t t, bus_space_handle_t h, - vm_offset_t o, u_char *dst)); +int snsetup(struct sn_softc *sc, u_int8_t *); +void snintr(void *, int); +void sn_get_enaddr(bus_space_tag_t t, bus_space_handle_t h, + vm_offset_t o, u_char *dst); diff --git a/sys/arch/mac68k/dev/ite.c b/sys/arch/mac68k/dev/ite.c index 6b66a9c3cc4..61501d90856 100644 --- a/sys/arch/mac68k/dev/ite.c +++ b/sys/arch/mac68k/dev/ite.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ite.c,v 1.19 2001/11/06 19:53:14 miod Exp $ */ +/* $OpenBSD: ite.c,v 1.20 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: ite.c,v 1.32 1997/02/20 00:23:25 scottr Exp $ */ /* @@ -90,33 +90,33 @@ #define CHARHEIGHT 10 /* Local function prototypes */ -static __inline void putpixel1 __P((int, int, int *, int)); -static void putpixel2 __P((int, int, int *, int)); -static void putpixel4 __P((int, int, int *, int)); -static void putpixel8 __P((int, int, int *, int)); -static void putpixel16 __P((int, int, int *, int)); -static void putpixel32 __P((int, int, int *, int)); -static void reversepixel1 __P((int, int, int)); -static void writechar __P((char, int, int, int)); -static void drawcursor __P((void)); -static void erasecursor __P((void)); -static void scrollup __P((void)); -static void scrolldown __P((void)); -static void clear_screen __P((int)); -static void clear_line __P((int)); -static void reset_tabs __P((void)); -static void clear_tabs __P((void)); -static void vt100_reset __P((void)); -static void putc_normal __P((char)); -static void putc_esc __P((char)); -static void putc_gotpars __P((char)); -static void putc_getpars __P((char)); -static void putc_square __P((char)); -static void ite_putchar __P((char)); -static int ite_pollforchar __P((void)); -static int itematch __P((struct device *, void *, void *)); -static void iteattach __P((struct device *, struct device *, void *)); -static int ite_init __P((void)); +static __inline void putpixel1(int, int, int *, int); +static void putpixel2(int, int, int *, int); +static void putpixel4(int, int, int *, int); +static void putpixel8(int, int, int *, int); +static void putpixel16(int, int, int *, int); +static void putpixel32(int, int, int *, int); +static void reversepixel1(int, int, int); +static void writechar(char, int, int, int); +static void drawcursor(void); +static void erasecursor(void); +static void scrollup(void); +static void scrolldown(void); +static void clear_screen(int); +static void clear_line(int); +static void reset_tabs(void); +static void clear_tabs(void); +static void vt100_reset(void); +static void putc_normal(char); +static void putc_esc(char); +static void putc_gotpars(char); +static void putc_getpars(char); +static void putc_square(char); +static void ite_putchar(char); +static int ite_pollforchar(void); +static int itematch(struct device *, void *, void *); +static void iteattach(struct device *, struct device *, void *); +static int ite_init(void); #define dprintf if (0) printf @@ -174,8 +174,8 @@ extern u_int32_t mac68k_vidphys; struct tty *ite_tty; /* Our tty */ -static void (*putpixel) __P((int x, int y, int *c, int num)); -static void (*reversepixel) __P((int x, int y, int num)); +static void (*putpixel)(int x, int y, int *c, int num); +static void (*reversepixel)(int x, int y, int num); /* For capslock key functionality */ #define isealpha(ch) (((ch)>='A'&&(ch)<='Z')||((ch)>='a'&&(ch)<='z')||((ch)>=0xC0&&(ch)<=0xFF)) @@ -1340,7 +1340,7 @@ itecnputc(dev, c) int c; { extern dev_t mac68k_zsdev; - extern int zscnputc __P((dev_t dev, int c)); + extern int zscnputc(dev_t dev, int c); erasecursor(); ite_putchar(c); diff --git a/sys/arch/mac68k/dev/itevar.h b/sys/arch/mac68k/dev/itevar.h index febebc44731..0bffb454ab5 100644 --- a/sys/arch/mac68k/dev/itevar.h +++ b/sys/arch/mac68k/dev/itevar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: itevar.h,v 1.2 1997/04/08 04:41:27 briggs Exp $ */ +/* $OpenBSD: itevar.h,v 1.3 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: itevar.h,v 1.1 1996/05/05 06:16:49 briggs Exp $ */ /* @@ -32,25 +32,25 @@ #include <machine/adbsys.h> -int ite_intr __P((adb_event_t *event)); -int iteon __P((dev_t dev, int flags)); -int iteoff __P((dev_t dev, int flags)); -void itereset __P((void)); +int ite_intr(adb_event_t *event); +int iteon(dev_t dev, int flags); +int iteoff(dev_t dev, int flags); +void itereset(void); #ifndef CN_DEAD #include <dev/cons.h> #endif -void itestop __P((struct tty * tp, int flag)); -void itestart __P((register struct tty * tp)); -int iteopen __P((dev_t dev, int mode, int devtype, struct proc * p)); -int iteclose __P((dev_t dev, int flag, int mode, struct proc * p)); -int iteread __P((dev_t dev, struct uio * uio, int flag)); -int itewrite __P((dev_t dev, struct uio * uio, int flag)); -int iteioctl __P((dev_t, int, caddr_t, int, struct proc *)); -struct tty *itetty __P((dev_t dev)); +void itestop(struct tty * tp, int flag); +void itestart(register struct tty * tp); +int iteopen(dev_t dev, int mode, int devtype, struct proc * p); +int iteclose(dev_t dev, int flag, int mode, struct proc * p); +int iteread(dev_t dev, struct uio * uio, int flag); +int itewrite(dev_t dev, struct uio * uio, int flag); +int iteioctl(dev_t, int, caddr_t, int, struct proc *); +struct tty *itetty(dev_t dev); -int itecnprobe __P((struct consdev * cp)); -int itecninit __P((struct consdev * cp)); -int itecngetc __P((dev_t dev)); -int itecnputc __P((dev_t dev, int c)); +int itecnprobe(struct consdev * cp); +int itecninit(struct consdev * cp); +int itecngetc(dev_t dev); +int itecnputc(dev_t dev, int c); diff --git a/sys/arch/mac68k/dev/mac68k5380.c b/sys/arch/mac68k/dev/mac68k5380.c index 858754f8121..24d56de5356 100644 --- a/sys/arch/mac68k/dev/mac68k5380.c +++ b/sys/arch/mac68k/dev/mac68k5380.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mac68k5380.c,v 1.14 2001/05/08 17:30:40 aaron Exp $ */ +/* $OpenBSD: mac68k5380.c,v 1.15 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: mac68k5380.c,v 1.29 1997/02/28 15:50:50 scottr Exp $ */ /* @@ -130,16 +130,16 @@ static volatile u_char *ncr_5380_without_drq = (volatile u_char *) 0x12000; static void ncr5380_irq_intr(void *); static void ncr5380_drq_intr(void *); -static void do_ncr5380_drq_intr __P((void *)); +static void do_ncr5380_drq_intr(void *); -static __inline__ void scsi_clr_ipend __P((void)); -static void scsi_mach_init __P((struct ncr_softc *sc)); -static int machine_match __P((struct device *parent, +static __inline__ void scsi_clr_ipend(void); +static void scsi_mach_init(struct ncr_softc *sc); +static int machine_match(struct device *parent, struct cfdata *cf, void *aux, - struct cfdriver *cd)); -static __inline__ int pdma_ready __P((void)); -static int transfer_pdma __P((u_char *phasep, u_char *data, - u_long *count)); + struct cfdriver *cd); +static __inline__ int pdma_ready(void); +static int transfer_pdma(u_char *phasep, u_char *data, + u_long *count); static __inline__ void scsi_clr_ipend() diff --git a/sys/arch/mac68k/dev/ncr5380.c b/sys/arch/mac68k/dev/ncr5380.c index e1d62994030..a9ed67308eb 100644 --- a/sys/arch/mac68k/dev/ncr5380.c +++ b/sys/arch/mac68k/dev/ncr5380.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr5380.c,v 1.16 2001/08/26 00:45:08 fgsch Exp $ */ +/* $OpenBSD: ncr5380.c,v 1.17 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: ncr5380.c,v 1.38 1996/12/19 21:48:18 scottr Exp $ */ /* @@ -73,9 +73,9 @@ static volatile int main_running = 0; */ static u_char busy; -static void ncr5380_minphys __P((struct buf *bp)); -static int ncr5380_scsi_cmd __P((struct scsi_xfer *xs)); -static void ncr5380_show_scsi_cmd __P((struct scsi_xfer *xs)); +static void ncr5380_minphys(struct buf *bp); +static int ncr5380_scsi_cmd(struct scsi_xfer *xs); +static void ncr5380_show_scsi_cmd(struct scsi_xfer *xs); struct scsi_adapter ncr5380_switch = { ncr5380_scsi_cmd, /* scsi_cmd() */ @@ -197,8 +197,8 @@ extern __inline__ void finish_req(SC_REQ *reqp) /* * Auto config stuff.... */ -void ncr_attach __P((struct device *, struct device *, void *)); -int ncr_match __P((struct device *, void *, void *)); +void ncr_attach(struct device *, struct device *, void *); +int ncr_match(struct device *, void *, void *); /* * Tricks to make driver-name configurable diff --git a/sys/arch/mac68k/dev/ncr5380reg.h b/sys/arch/mac68k/dev/ncr5380reg.h index 26e37cf0939..42c7676c951 100644 --- a/sys/arch/mac68k/dev/ncr5380reg.h +++ b/sys/arch/mac68k/dev/ncr5380reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr5380reg.h,v 1.4 1996/05/26 18:35:31 briggs Exp $ */ +/* $OpenBSD: ncr5380reg.h,v 1.5 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: ncr5380reg.h,v 1.9 1996/05/05 06:16:58 briggs Exp $ */ /* @@ -230,31 +230,31 @@ static SC_REQ *connected = NULL; /* Command currently connected */ /* * Function decls: */ -static int transfer_pio __P((u_char *, u_char *, u_long *, int)); -static int wait_req_true __P((void)); -static int wait_req_false __P((void)); -static int scsi_select __P((SC_REQ *, int)); -static int handle_message __P((SC_REQ *, u_int)); -static void ack_message __P((void)); -static void nack_message __P((SC_REQ *, u_char)); -static void finish_req __P((SC_REQ *reqp)); -static int command_size __P((u_char opcode)); -static int information_transfer __P((struct ncr_softc *)); -static void reselect __P((struct ncr_softc *)); -static int check_autosense __P((SC_REQ *, int)); -static int reach_msg_out __P((struct ncr_softc *, u_long)); -static int check_intr __P((struct ncr_softc *)); -static void scsi_reset __P((void)); -static void scsi_reset_verbose __P((struct ncr_softc *, const char *)); -static void run_main __P((struct ncr_softc *)); -static void scsi_main __P((struct ncr_softc *)); -static void ncr_ctrl_intr __P((struct ncr_softc *)); -static void ncr_tprint __P((SC_REQ *, char *, ...)); -static void ncr_aprint __P((struct ncr_softc *, char *, ...)); +static int transfer_pio(u_char *, u_char *, u_long *, int); +static int wait_req_true(void); +static int wait_req_false(void); +static int scsi_select(SC_REQ *, int); +static int handle_message(SC_REQ *, u_int); +static void ack_message(void); +static void nack_message(SC_REQ *, u_char); +static void finish_req(SC_REQ *reqp); +static int command_size(u_char opcode); +static int information_transfer(struct ncr_softc *); +static void reselect(struct ncr_softc *); +static int check_autosense(SC_REQ *, int); +static int reach_msg_out(struct ncr_softc *, u_long); +static int check_intr(struct ncr_softc *); +static void scsi_reset(void); +static void scsi_reset_verbose(struct ncr_softc *, const char *); +static void run_main(struct ncr_softc *); +static void scsi_main(struct ncr_softc *); +static void ncr_ctrl_intr(struct ncr_softc *); +static void ncr_tprint(SC_REQ *, char *, ...); +static void ncr_aprint(struct ncr_softc *, char *, ...); -static void show_data_sense __P((struct scsi_xfer *xs)); -static void show_request __P((SC_REQ *, char *)); -/* static void show_phase __P((SC_REQ *, int)); */ -static void show_signals __P((u_char, u_char)); +static void show_data_sense(struct scsi_xfer *xs); +static void show_request(SC_REQ *, char *); +/* static void show_phase(SC_REQ *, int); */ +static void show_signals(u_char, u_char); #endif /* _NCR5380REG_H */ diff --git a/sys/arch/mac68k/dev/ncr5380var.h b/sys/arch/mac68k/dev/ncr5380var.h index 3be2849859a..fe1a1cec391 100644 --- a/sys/arch/mac68k/dev/ncr5380var.h +++ b/sys/arch/mac68k/dev/ncr5380var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr5380var.h,v 1.1 1996/05/26 19:02:08 briggs Exp $ */ +/* $OpenBSD: ncr5380var.h,v 1.2 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: ncr5380var.h,v 1.2 1996/05/25 16:42:31 briggs Exp $ */ /* @@ -34,7 +34,7 @@ static volatile u_char *scsi_enable = NULL; static volatile u_char *scsi_flag = NULL; static __inline__ void -scsi_clear_drq __P((void)) +scsi_clear_drq(void) { int s; @@ -44,7 +44,7 @@ scsi_clear_drq __P((void)) } static __inline__ void -scsi_clear_irq __P((void)) +scsi_clear_irq(void) { int s; @@ -54,7 +54,7 @@ scsi_clear_irq __P((void)) } static __inline__ void -scsi_ienable __P((void)) +scsi_ienable(void) { int s; @@ -64,7 +64,7 @@ scsi_ienable __P((void)) } static __inline__ void -scsi_idisable __P((void)) +scsi_idisable(void) { int s; @@ -73,7 +73,7 @@ scsi_idisable __P((void)) splx(s); } -void pdma_stat __P((void)); -void pdma_cleanup __P((void)); -void scsi_show __P((void)); +void pdma_stat(void); +void pdma_cleanup(void); +void scsi_show(void); diff --git a/sys/arch/mac68k/dev/nubus.c b/sys/arch/mac68k/dev/nubus.c index 211b08bafb4..631d6db420f 100644 --- a/sys/arch/mac68k/dev/nubus.c +++ b/sys/arch/mac68k/dev/nubus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nubus.c,v 1.24 2001/12/10 00:58:04 miod Exp $ */ +/* $OpenBSD: nubus.c,v 1.25 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: nubus.c,v 1.35 1997/04/22 20:20:32 scottr Exp $ */ /* @@ -55,21 +55,21 @@ static int nubus_debug = 0x01; #define NDB_ARITH 0x4 #endif -static int nubus_print __P((void *, const char *)); -static int nubus_match __P((struct device *, void *, void *)); -static void nubus_attach __P((struct device *, struct device *, void *)); -int nubus_video_resource __P((int)); +static int nubus_print(void *, const char *); +static int nubus_match(struct device *, void *, void *); +static void nubus_attach(struct device *, struct device *, void *); +int nubus_video_resource(int); -static int probe_slot __P((int slot, nubus_slot *fmt)); -static u_long IncPtr __P((nubus_slot *fmt, u_long base, long amt)); -static u_long nubus_calc_CRC __P((nubus_slot *fmt)); -static u_char GetByte __P((nubus_slot *fmt, u_long ptr)); +static int probe_slot(int slot, nubus_slot *fmt); +static u_long IncPtr(nubus_slot *fmt, u_long base, long amt); +static u_long nubus_calc_CRC(nubus_slot *fmt); +static u_char GetByte(nubus_slot *fmt, u_long ptr); #ifdef notyet -/* unused */ static u_short GetWord __P((nubus_slot *fmt, u_long ptr)); +/* unused */ static u_short GetWord(nubus_slot *fmt, u_long ptr); #endif -static u_long GetLong __P((nubus_slot *fmt, u_long ptr)); +static u_long GetLong(nubus_slot *fmt, u_long ptr); -static int nubus_peek __P((vm_offset_t, int)); +static int nubus_peek(vm_offset_t, int); struct cfattach nubus_ca = { sizeof(struct nubus_softc), nubus_match, nubus_attach diff --git a/sys/arch/mac68k/dev/nubus.h b/sys/arch/mac68k/dev/nubus.h index e9d200e8ed9..d83d7b61745 100644 --- a/sys/arch/mac68k/dev/nubus.h +++ b/sys/arch/mac68k/dev/nubus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nubus.h,v 1.16 1997/05/08 16:36:37 gene Exp $ */ +/* $OpenBSD: nubus.h,v 1.17 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: nubus.h,v 1.25 1997/05/02 00:54:28 briggs Exp $ */ /* @@ -257,17 +257,17 @@ struct nubus_softc { struct device sc_dev; }; -void nubus_get_main_dir __P((nubus_slot *slot, nubus_dir *dir_return)); -int nubus_find_rsrc __P((nubus_slot *slot, nubus_dir *dir, u_int8_t rsrcid, - nubus_dirent *dirent_return)); -void nubus_get_dir_from_rsrc __P((nubus_slot *slot, nubus_dirent *dirent, - nubus_dir *dir_return)); -int nubus_get_ind_data __P((nubus_slot *slot, nubus_dirent *dirent, - caddr_t data_return, int nbytes)); -int nubus_get_c_string __P((nubus_slot *slot, nubus_dirent *dirent, - caddr_t data_return, int max_bytes)); -char *nubus_get_vendor __P((nubus_slot *slot, int rsrc)); -char *nubus_get_card_name __P((nubus_slot *slot)); -char *nubus_mapin __P((int paddr, int sz)); +void nubus_get_main_dir(nubus_slot *slot, nubus_dir *dir_return); +int nubus_find_rsrc(nubus_slot *slot, nubus_dir *dir, u_int8_t rsrcid, + nubus_dirent *dirent_return); +void nubus_get_dir_from_rsrc(nubus_slot *slot, nubus_dirent *dirent, + nubus_dir *dir_return); +int nubus_get_ind_data(nubus_slot *slot, nubus_dirent *dirent, + caddr_t data_return, int nbytes); +int nubus_get_c_string(nubus_slot *slot, nubus_dirent *dirent, + caddr_t data_return, int max_bytes); +char *nubus_get_vendor(nubus_slot *slot, int rsrc); +char *nubus_get_card_name(nubus_slot *slot); +char *nubus_mapin(int paddr, int sz); int paddr, sz; diff --git a/sys/arch/mac68k/dev/obio.c b/sys/arch/mac68k/dev/obio.c index 3f20bd45623..57b62048859 100644 --- a/sys/arch/mac68k/dev/obio.c +++ b/sys/arch/mac68k/dev/obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: obio.c,v 1.4 1997/03/12 13:36:58 briggs Exp $ */ +/* $OpenBSD: obio.c,v 1.5 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: obio.c,v 1.7 1997/02/13 19:01:07 scottr Exp $ */ /* @@ -45,10 +45,10 @@ #include <mac68k/dev/obiovar.h> -static int obio_match __P((struct device *, void *, void *)); -static void obio_attach __P((struct device *, struct device *, void *)); -static int obio_print __P((void *, const char *)); -static int obio_search __P((struct device *, void *, void *)); +static int obio_match(struct device *, void *, void *); +static void obio_attach(struct device *, struct device *, void *); +static int obio_print(void *, const char *); +static int obio_search(struct device *, void *, void *); struct cfattach obio_ca = { sizeof(struct device), obio_match, obio_attach diff --git a/sys/arch/mac68k/dev/pm_direct.c b/sys/arch/mac68k/dev/pm_direct.c index 87b3a7a6fe5..4ffc444fc7a 100644 --- a/sys/arch/mac68k/dev/pm_direct.c +++ b/sys/arch/mac68k/dev/pm_direct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pm_direct.c,v 1.4 2001/09/20 17:02:30 mpech Exp $ */ +/* $OpenBSD: pm_direct.c,v 1.5 2002/03/14 01:26:35 millert Exp $ */ /* pm_direct.c 1.22 01/09/97 Takashi Hamada */ /* @@ -125,37 +125,37 @@ char pm_receive_cmd_type[] = { /* for debugging */ #ifdef PM_DEBUG -void pm_printerr __P(( char *, int, int, char * )); +void pm_printerr( char *, int, int, char * ); #endif -int pm_wait_busy __P((int)); -int pm_wait_free __P((int)); +int pm_wait_busy(int); +int pm_wait_free(int); /* these functions are for the PB1XX series */ -int pm_receive_pm1 __P((u_char *)); -int pm_send_pm1 __P((u_char,int)); -int pm_pmgrop_pm1 __P((PMData *)); -void pm_intr_pm1 __P((void)); +int pm_receive_pm1(u_char *); +int pm_send_pm1(u_char,int); +int pm_pmgrop_pm1(PMData *); +void pm_intr_pm1(void); /* these functions are for the PB Duo series and the PB 5XX series */ -int pm_receive_pm2 __P((u_char *)); -int pm_send_pm2 __P((u_char)); -int pm_pmgrop_pm2 __P((PMData *)); -void pm_intr_pm2 __P((void)); +int pm_receive_pm2(u_char *); +int pm_send_pm2(u_char); +int pm_pmgrop_pm2(PMData *); +void pm_intr_pm2(void); /* this function is MRG-Based (for testing) */ -int pm_pmgrop_mrg __P((PMData *)); +int pm_pmgrop_mrg(PMData *); /* these functions are called from adb_direct.c */ -void pm_setup_adb __P((void)); -void pm_check_adb_devices __P((int)); -void pm_intr __P((void)); -int pm_adb_op __P((u_char *, void *, void *, int)); +void pm_setup_adb(void); +void pm_check_adb_devices(int); +void pm_intr(void); +int pm_adb_op(u_char *, void *, void *, int); /* these functions also use the valiables of adb_direct.c */ -void pm_adb_get_TALK_result __P((PMData *)); -void pm_adb_get_ADB_data __P((PMData *)); -void pm_adb_poll_next_device_pm1 __P((PMData *)); +void pm_adb_get_TALK_result(PMData *); +void pm_adb_get_ADB_data(PMData *); +void pm_adb_poll_next_device_pm1(PMData *); /* diff --git a/sys/arch/mac68k/dev/pm_direct.h b/sys/arch/mac68k/dev/pm_direct.h index 2ed86036296..8d0bc8301d5 100644 --- a/sys/arch/mac68k/dev/pm_direct.h +++ b/sys/arch/mac68k/dev/pm_direct.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pm_direct.h,v 1.2 2001/07/04 08:52:46 niklas Exp $ */ +/* $OpenBSD: pm_direct.h,v 1.3 2002/03/14 01:26:35 millert Exp $ */ /* pm_direct.h 1.0 01/02/97 Takashi Hamada */ @@ -47,9 +47,9 @@ typedef struct { int pmgrop(PMData *); -extern void pm_setup_adb __P((void)); -extern void pm_check_adb_devices __P((int)); -extern void pm_intr __P((void)); -extern int pm_adb_op __P((u_char *, void *, void *, int)); -extern void pm_init_adb_device __P((void)); +extern void pm_setup_adb(void); +extern void pm_check_adb_devices(int); +extern void pm_intr(void); +extern int pm_adb_op(u_char *, void *, void *, int); +extern void pm_init_adb_device(void); diff --git a/sys/arch/mac68k/dev/sbc.c b/sys/arch/mac68k/dev/sbc.c index cd3f5696f1a..b54ef531080 100644 --- a/sys/arch/mac68k/dev/sbc.c +++ b/sys/arch/mac68k/dev/sbc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbc.c,v 1.13 2001/09/09 21:48:31 miod Exp $ */ +/* $OpenBSD: sbc.c,v 1.14 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: sbc.c,v 1.24 1997/04/18 17:38:08 scottr Exp $ */ /* @@ -76,7 +76,7 @@ int sbc_debug = 0 /* | SBC_DB_INTR | SBC_DB_DMA */; int sbc_link_flags = 0 /* | SDEV_DB2 */; int sbc_options = 0 /* | SBC_PDMA */; -static void sbc_minphys __P((struct buf *bp)); +static void sbc_minphys(struct buf *bp); struct scsi_adapter sbc_ops = { ncr5380_scsi_cmd, /* scsi_cmd() */ @@ -98,8 +98,8 @@ struct cfdriver sbc_cd = { NULL, "sbc", DV_DULL }; -static int sbc_ready __P((struct ncr5380_softc *)); -static void sbc_wait_not_req __P((struct ncr5380_softc *)); +static int sbc_ready(struct ncr5380_softc *); +static void sbc_wait_not_req(struct ncr5380_softc *); static void sbc_minphys(struct buf *bp) diff --git a/sys/arch/mac68k/dev/sbc_obio.c b/sys/arch/mac68k/dev/sbc_obio.c index c009d141bb4..7fc2ac9196f 100644 --- a/sys/arch/mac68k/dev/sbc_obio.c +++ b/sys/arch/mac68k/dev/sbc_obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbc_obio.c,v 1.8 2001/10/01 22:43:33 miod Exp $ */ +/* $OpenBSD: sbc_obio.c,v 1.9 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: sbc_obio.c,v 1.1 1997/03/01 20:18:59 scottr Exp $ */ /* @@ -72,12 +72,12 @@ #define SBC_DMA_OFS_DUO2 0x02000 #define SBC_HSK_OFS_DUO2 0x04000 -static int sbc_obio_match __P((struct device *, void *, void *)); -static void sbc_obio_attach __P((struct device *, struct device *, void *)); +static int sbc_obio_match(struct device *, void *, void *); +static void sbc_obio_attach(struct device *, struct device *, void *); -void sbc_intr_enable __P((struct ncr5380_softc *)); -void sbc_intr_disable __P((struct ncr5380_softc *)); -void sbc_obio_clrintr __P((struct ncr5380_softc *)); +void sbc_intr_enable(struct ncr5380_softc *); +void sbc_intr_disable(struct ncr5380_softc *); +void sbc_obio_clrintr(struct ncr5380_softc *); struct cfattach sbc_obio_ca = { sizeof(struct sbc_softc), sbc_obio_match, sbc_obio_attach diff --git a/sys/arch/mac68k/dev/sbcvar.h b/sys/arch/mac68k/dev/sbcvar.h index 2187e9a79ff..abfbaf51f0f 100644 --- a/sys/arch/mac68k/dev/sbcvar.h +++ b/sys/arch/mac68k/dev/sbcvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sbcvar.h,v 1.2 2001/07/04 08:52:46 niklas Exp $ */ +/* $OpenBSD: sbcvar.h,v 1.3 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: sbcvar.h,v 1.1 1997/03/01 20:19:00 scottr Exp $ */ /* @@ -78,7 +78,7 @@ struct sbc_softc { volatile struct sbc_regs *sc_regs; volatile vm_offset_t sc_drq_addr; volatile vm_offset_t sc_nodrq_addr; - void (*sc_clrintr) __P((struct ncr5380_softc *)); + void (*sc_clrintr)(struct ncr5380_softc *); int sc_options; /* options for this instance. */ struct sbc_pdma_handle sc_pdma[SCI_OPENINGS]; }; @@ -107,17 +107,17 @@ extern int sbc_options; extern struct scsi_adapter sbc_ops; extern struct scsi_device sbc_dev; -int sbc_pdma_in __P((struct ncr5380_softc *, int, int, u_char *)); -int sbc_pdma_out __P((struct ncr5380_softc *, int, int, u_char *)); -void sbc_irq_intr __P((void *)); -void sbc_drq_intr __P((void *)); -void sbc_dma_alloc __P((struct ncr5380_softc *)); -void sbc_dma_free __P((struct ncr5380_softc *)); -void sbc_dma_poll __P((struct ncr5380_softc *)); -void sbc_dma_setup __P((struct ncr5380_softc *)); -void sbc_dma_start __P((struct ncr5380_softc *)); -void sbc_dma_eop __P((struct ncr5380_softc *)); -void sbc_dma_stop __P((struct ncr5380_softc *)); +int sbc_pdma_in(struct ncr5380_softc *, int, int, u_char *); +int sbc_pdma_out(struct ncr5380_softc *, int, int, u_char *); +void sbc_irq_intr(void *); +void sbc_drq_intr(void *); +void sbc_dma_alloc(struct ncr5380_softc *); +void sbc_dma_free(struct ncr5380_softc *); +void sbc_dma_poll(struct ncr5380_softc *); +void sbc_dma_setup(struct ncr5380_softc *); +void sbc_dma_start(struct ncr5380_softc *); +void sbc_dma_eop(struct ncr5380_softc *); +void sbc_dma_stop(struct ncr5380_softc *); #ifdef SBC_DEBUG -void decode_5380_intr __P((struct ncr5380_softc *)); +void decode_5380_intr(struct ncr5380_softc *); #endif diff --git a/sys/arch/mac68k/dev/scsi96.c b/sys/arch/mac68k/dev/scsi96.c index 4fa7a3579d0..ce90af990a0 100644 --- a/sys/arch/mac68k/dev/scsi96.c +++ b/sys/arch/mac68k/dev/scsi96.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsi96.c,v 1.7 2001/08/26 00:45:08 fgsch Exp $ */ +/* $OpenBSD: scsi96.c,v 1.8 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: scsi96.c,v 1.21 1996/10/13 03:21:29 christos Exp $ */ /* @@ -79,8 +79,8 @@ static int ncr53c96_scsi_cmd(struct scsi_xfer * xs); static int ncr53c96_reset_target(int adapter, int target); static int ncr53c96_poll(int adapter, int timeout); static int ncr53c96_send_cmd(struct scsi_xfer * xs); -static int scsiprint __P((void *, const char *)); -static void resetchip __P((void)); +static int scsiprint(void *, const char *); +static void resetchip(void); struct scsi_adapter ncr53c96_switch = { ncr53c96_scsi_cmd, /* scsi_cmd() */ @@ -97,8 +97,8 @@ struct scsi_device ncr53c96_dev = { NULL, /* Use default "done" routine. */ }; -static int ncr96probe __P((struct device *, void *, void *)); -static void ncr96attach __P((struct device *, struct device *, void *)); +static int ncr96probe(struct device *, void *, void *); +static void ncr96attach(struct device *, struct device *, void *); struct cfattach ncr96scsi_ca = { sizeof(struct ncr53c96_softc), ncr96probe, ncr96attach @@ -281,14 +281,14 @@ ncr53c96_show_scsi_cmd(struct scsi_xfer * xs) * Actual chip control. */ -extern void ncr53c96_intr __P((int)); +extern void ncr53c96_intr(int); extern void ncr53c96_intr(int adapter) { } -extern int ncr53c96_irq_intr __P((void)); +extern int ncr53c96_irq_intr(void); extern int ncr53c96_irq_intr(void) @@ -297,7 +297,7 @@ ncr53c96_irq_intr(void) return 1; } -extern int ncr53c96_drq_intr __P((void)); +extern int ncr53c96_drq_intr(void); extern int ncr53c96_drq_intr(void) { diff --git a/sys/arch/mac68k/dev/z8530sc.c b/sys/arch/mac68k/dev/z8530sc.c index 7c4ac4b4dbb..d8db1cf2ebd 100644 --- a/sys/arch/mac68k/dev/z8530sc.c +++ b/sys/arch/mac68k/dev/z8530sc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530sc.c,v 1.3 1996/09/02 15:50:34 briggs Exp $ */ +/* $OpenBSD: z8530sc.c,v 1.4 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: z8530sc.c,v 1.1 1996/05/18 18:54:28 briggs Exp $ */ /* @@ -393,8 +393,8 @@ zsc_intr_soft(arg) return (rval); } -static void zsnull_intr __P((struct zs_chanstate *)); -static void zsnull_softint __P((struct zs_chanstate *)); +static void zsnull_intr(struct zs_chanstate *); +static void zsnull_softint(struct zs_chanstate *); static void zsnull_intr(cs) diff --git a/sys/arch/mac68k/dev/z8530sc.h b/sys/arch/mac68k/dev/z8530sc.h index 8e94386398b..147c303ab8d 100644 --- a/sys/arch/mac68k/dev/z8530sc.h +++ b/sys/arch/mac68k/dev/z8530sc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530sc.h,v 1.3 1996/10/13 15:29:07 briggs Exp $ */ +/* $OpenBSD: z8530sc.h,v 1.4 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: z8530sc.h,v 1.1 1996/05/18 18:54:30 briggs Exp $ */ /* @@ -178,11 +178,11 @@ struct zsc_attach_args { #define ZS_CHIP_8580 2 #define ZS_CHIP_ESCC 3 -void zs_loadchannelregs __P((struct zs_chanstate *)); -int zsc_intr_soft __P((void *)); -int zsc_intr_hard __P((void *)); -int zs_checkchip __P((struct zs_chanstate *)); -int zs_break __P((struct zs_chanstate *, int)); -int zs_getspeed __P((struct zs_chanstate *)); -void zs_iflush __P((struct zs_chanstate *)); +void zs_loadchannelregs(struct zs_chanstate *); +int zsc_intr_soft(void *); +int zsc_intr_hard(void *); +int zs_checkchip(struct zs_chanstate *); +int zs_break(struct zs_chanstate *, int); +int zs_getspeed(struct zs_chanstate *); +void zs_iflush(struct zs_chanstate *); diff --git a/sys/arch/mac68k/dev/z8530tty.c b/sys/arch/mac68k/dev/z8530tty.c index fec15397ad3..57c918e1c87 100644 --- a/sys/arch/mac68k/dev/z8530tty.c +++ b/sys/arch/mac68k/dev/z8530tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530tty.c,v 1.10 1998/03/03 04:54:47 ryker Exp $ */ +/* $OpenBSD: z8530tty.c,v 1.11 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: z8530tty.c,v 1.10 1996/12/18 05:17:44 scottr Exp $ */ /* @@ -103,15 +103,15 @@ struct zsops zsops_tty; /* Routines called from other code. */ cdev_decl(zs); /* open, close, read, write, ioctl, stop, ... */ -static void zsstart __P((struct tty *)); -static int zsparam __P((struct tty *, struct termios *)); -static void zs_modem __P((struct zstty_softc *zst, int onoff)); -static int zshwiflow __P((struct tty *, int)); -static void zs_hwiflow __P((struct zstty_softc *, int)); -static int zsgetbaud __P((register struct zs_chanstate *, +static void zsstart(struct tty *); +static int zsparam(struct tty *, struct termios *); +static void zs_modem(struct zstty_softc *zst, int onoff); +static int zshwiflow(struct tty *, int); +static void zs_hwiflow(struct zstty_softc *, int); +static int zsgetbaud(register struct zs_chanstate *, register int *rate, register int *tc, register u_char *rr4, register u_char *rr11, register u_char *rr14, - register int *source, register int *sourceflag)); + register int *source, register int *sourceflag); /* * zstty_match: how is this zs channel configured? @@ -1091,11 +1091,11 @@ zs_hwiflow(zst, stop) * Interface to the lower layer (zscc) ****************************************************************/ -static void zstty_rxint __P((register struct zs_chanstate *)); -static void zstty_txint __P((register struct zs_chanstate *)); -static void zstty_stint __P((register struct zs_chanstate *)); -static void zsoverrun __P((struct zstty_softc *, long *, char *)); -static void zstty_softint __P((struct zs_chanstate *)); +static void zstty_rxint(register struct zs_chanstate *); +static void zstty_txint(register struct zs_chanstate *); +static void zstty_stint(register struct zs_chanstate *); +static void zsoverrun(struct zstty_softc *, long *, char *); +static void zstty_softint(struct zs_chanstate *); /* * XXX: need to do input flow-control to avoid ring overrun. */ diff --git a/sys/arch/mac68k/dev/zs.c b/sys/arch/mac68k/dev/zs.c index 6b01720a66e..4ad4c79fc21 100644 --- a/sys/arch/mac68k/dev/zs.c +++ b/sys/arch/mac68k/dev/zs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zs.c,v 1.13 1999/11/15 06:12:49 d Exp $ */ +/* $OpenBSD: zs.c,v 1.14 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: zs.c,v 1.12 1996/12/18 05:04:22 scottr Exp $ */ /* @@ -111,8 +111,8 @@ dev_t mac68k_zsdev; /* Mac stuff, some vestages of old mac serial driver here */ volatile unsigned char *sccA = 0; -static struct zschan *zs_get_chan_addr __P((int zsc_unit, int channel)); -void zs_init __P((void)); +static struct zschan *zs_get_chan_addr(int zsc_unit, int channel); +void zs_init(void); static struct zschan * zs_get_chan_addr(zsc_unit, channel) @@ -185,9 +185,9 @@ static u_char zs_init_reg[16] = { ****************************************************************/ /* Definition of the driver for autoconfig. */ -static int zsc_match __P((struct device *, void *, void *)); -static void zsc_attach __P((struct device *, struct device *, void *)); -static int zsc_print __P((void *aux, const char *name)); +static int zsc_match(struct device *, void *, void *); +static void zsc_attach(struct device *, struct device *, void *); +static int zsc_print(void *aux, const char *name); struct cfattach zsc_ca = { sizeof(struct zsc_softc), zsc_match, zsc_attach @@ -197,8 +197,8 @@ struct cfdriver zsc_cd = { NULL, "zsc", DV_DULL }; -int zshard __P((void *)); -int zssoft __P((void *)); +int zshard(void *); +int zssoft(void *); /* @@ -570,10 +570,10 @@ void zs_write_data(cs, val) #define zscnpollc nullcnpollc cons_decl(zs); -static void zs_putc __P((register volatile struct zschan *, int)); -static int zs_getc __P((register volatile struct zschan *)); -static void zscnsetup __P((void)); -extern int zsopen __P(( dev_t dev, int flags, int mode, struct proc *p)); +static void zs_putc(register volatile struct zschan *, int); +static int zs_getc(register volatile struct zschan *); +static void zscnsetup(void); +extern int zsopen( dev_t dev, int flags, int mode, struct proc *p); /* * Console functions. diff --git a/sys/arch/mac68k/include/adbsys.h b/sys/arch/mac68k/include/adbsys.h index 675768d8184..76ab528a82b 100644 --- a/sys/arch/mac68k/include/adbsys.h +++ b/sys/arch/mac68k/include/adbsys.h @@ -1,4 +1,4 @@ -/* $OpenBSD: adbsys.h,v 1.6 1997/11/30 06:12:19 gene Exp $ */ +/* $OpenBSD: adbsys.h,v 1.7 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: adbsys.h,v 1.5 1996/05/05 14:34:07 briggs Exp $ */ /*- @@ -124,6 +124,6 @@ typedef struct adb_listencmd_s { } adb_listencmd_t; #define ADBIOC_LISTENCMD _IOW('A', 133, adb_listencmd_t) -void adb_init __P((void)); +void adb_init(void); #endif /* _MAC68K_ADBSYS_H_ */ diff --git a/sys/arch/mac68k/include/autoconf.h b/sys/arch/mac68k/include/autoconf.h index c95b3b5a8b3..c33b19860d6 100644 --- a/sys/arch/mac68k/include/autoconf.h +++ b/sys/arch/mac68k/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.7 2001/05/05 22:33:50 art Exp $ */ +/* $OpenBSD: autoconf.h,v 1.8 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: autoconf.h,v 1.5 1996/12/17 06:47:40 scottr Exp $ */ /* @@ -43,29 +43,29 @@ #ifdef _KERNEL /* autoconf.c */ -void setconf __P((void)); +void setconf(void); /* machdep.c */ -void mac68k_set_io_offsets __P((vm_offset_t)); -void dumpconf __P((void)); -int badbaddr __P((register caddr_t addr)); -int badwaddr __P((register caddr_t addr)); -int badladdr __P((register caddr_t addr)); +void mac68k_set_io_offsets(vm_offset_t); +void dumpconf(void); +int badbaddr(register caddr_t addr); +int badwaddr(register caddr_t addr); +int badladdr(register caddr_t addr); /* clock.h */ -void enablertclock __P((void)); -void cpu_initclocks __P((void)); -void setstatclockrate __P((int)); -void disablertclock __P((void)); -u_long clkread __P((void)); -void inittodr __P((time_t)); -void resettodr __P((void)); -void mac68k_calibrate_delay __P((void)); -void startrtclock __P((void)); +void enablertclock(void); +void cpu_initclocks(void); +void setstatclockrate(int); +void disablertclock(void); +u_long clkread(void); +void inittodr(time_t); +void resettodr(void); +void mac68k_calibrate_delay(void); +void startrtclock(void); /* macrom.c */ -void mrg_init __P((void)); +void mrg_init(void); #endif /* _KERNEL */ #endif /* _MAC68K_AUTOCONF_H_ */ diff --git a/sys/arch/mac68k/include/bus.h b/sys/arch/mac68k/include/bus.h index a3035070058..43fe05ae9e0 100644 --- a/sys/arch/mac68k/include/bus.h +++ b/sys/arch/mac68k/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.6 2000/03/15 03:56:49 todd Exp $ */ +/* $OpenBSD: bus.h,v 1.7 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: bus.h,v 1.9 1998/01/13 18:32:15 scottr Exp $ */ /*- @@ -85,8 +85,8 @@ typedef int bus_space_tag_t; typedef u_long bus_space_handle_t; /* - * int bus_space_map __P((bus_space_tag_t t, bus_addr_t addr, - * bus_size_t size, int flags, bus_space_handle_t *bshp)); + * int bus_space_map(bus_space_tag_t t, bus_addr_t addr, + * bus_size_t size, int flags, bus_space_handle_t *bshp); * * Map a region of bus space. */ @@ -94,56 +94,56 @@ typedef u_long bus_space_handle_t; #define BUS_SPACE_MAP_CACHEABLE 0x01 #define BUS_SPACE_MAP_LINEAR 0x02 -int bus_space_map __P((bus_space_tag_t, bus_addr_t, bus_size_t, - int, bus_space_handle_t *)); +int bus_space_map(bus_space_tag_t, bus_addr_t, bus_size_t, + int, bus_space_handle_t *); /* - * void bus_space_unmap __P((bus_space_tag_t t, - * bus_space_handle_t bsh, bus_size_t size)); + * void bus_space_unmap(bus_space_tag_t t, + * bus_space_handle_t bsh, bus_size_t size); * * Unmap a region of bus space. */ -void bus_space_unmap __P((bus_space_tag_t, bus_space_handle_t, bus_size_t)); +void bus_space_unmap(bus_space_tag_t, bus_space_handle_t, bus_size_t); /* - * int bus_space_subregion __P((bus_space_tag_t t, + * int bus_space_subregion(bus_space_tag_t t, * bus_space_handle_t bsh, bus_size_t offset, bus_size_t size, - * bus_space_handle_t *nbshp)); + * bus_space_handle_t *nbshp); * * Get a new handle for a subregion of an already-mapped area of bus space. */ -int bus_space_subregion __P((bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp)); +int bus_space_subregion(bus_space_tag_t t, bus_space_handle_t bsh, + bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp); /* - * int bus_space_alloc __P((bus_space_tag_t t, bus_addr_t, rstart, + * int bus_space_alloc(bus_space_tag_t t, bus_addr_t, rstart, * bus_addr_t rend, bus_size_t size, bus_size_t align, * bus_size_t boundary, int flags, bus_addr_t *addrp, - * bus_space_handle_t *bshp)); + * bus_space_handle_t *bshp); * * Allocate a region of bus space. */ -int bus_space_alloc __P((bus_space_tag_t t, bus_addr_t rstart, +int bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart, bus_addr_t rend, bus_size_t size, bus_size_t align, bus_size_t boundary, int cacheable, bus_addr_t *addrp, - bus_space_handle_t *bshp)); + bus_space_handle_t *bshp); /* - * int bus_space_free __P((bus_space_tag_t t, - * bus_space_handle_t bsh, bus_size_t size)); + * int bus_space_free(bus_space_tag_t t, + * bus_space_handle_t bsh, bus_size_t size); * * Free a region of bus space. */ -void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t size)); +void bus_space_free(bus_space_tag_t t, bus_space_handle_t bsh, + bus_size_t size); /* - * int mac68k_bus_space_probe __P((bus_space_tag_t t, - * bus_space_handle_t bsh, bus_size_t offset, int sz)); + * int mac68k_bus_space_probe(bus_space_tag_t t, + * bus_space_handle_t bsh, bus_size_t offset, int sz); * * Probe the bus at t/bsh/offset, using sz as the size of the load. * @@ -151,12 +151,12 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh, * machine-independent code. */ -int mac68k_bus_space_probe __P((bus_space_tag_t t, - bus_space_handle_t bsh, bus_size_t offset, int sz)); +int mac68k_bus_space_probe(bus_space_tag_t t, + bus_space_handle_t bsh, bus_size_t offset, int sz); /* - * u_intN_t bus_space_read_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset)); + * u_intN_t bus_space_read_N(bus_space_tag_t tag, + * bus_space_handle_t bsh, bus_size_t offset); * * Read a 1, 2, 4, or 8 byte quantity from bus space * described by tag/handle/offset. @@ -176,9 +176,9 @@ int mac68k_bus_space_probe __P((bus_space_tag_t t, #endif /* - * void bus_space_read_multi_N __P((bus_space_tag_t tag, + * void bus_space_read_multi_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t *addr, size_t count)); + * u_intN_t *addr, size_t count); * * Read `count' 1, 2, 4, or 8 byte quantities from bus space * described by tag/handle/offset and copy into buffer provided. @@ -231,9 +231,9 @@ int mac68k_bus_space_probe __P((bus_space_tag_t t, #endif /* - * void bus_space_read_region_N __P((bus_space_tag_t tag, + * void bus_space_read_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t *addr, size_t count)); + * u_intN_t *addr, size_t count); * * Read `count' 1, 2, 4, or 8 byte quantities from bus space * described by tag/handle and starting at `offset' and copy into @@ -287,9 +287,9 @@ int mac68k_bus_space_probe __P((bus_space_tag_t t, #endif /* - * void bus_space_write_N __P((bus_space_tag_t tag, + * void bus_space_write_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t value)); + * u_intN_t value); * * Write the 1, 2, 4, or 8 byte value `value' to bus space * described by tag/handle/offset. @@ -309,9 +309,9 @@ int mac68k_bus_space_probe __P((bus_space_tag_t t, #endif /* - * void bus_space_write_multi_N __P((bus_space_tag_t tag, + * void bus_space_write_multi_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * const u_intN_t *addr, size_t count)); + * const u_intN_t *addr, size_t count); * * Write `count' 1, 2, 4, or 8 byte quantities from the buffer * provided to bus space described by tag/handle/offset. @@ -365,9 +365,9 @@ int mac68k_bus_space_probe __P((bus_space_tag_t t, #endif /* - * void bus_space_write_region_N __P((bus_space_tag_t tag, + * void bus_space_write_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * const u_intN_t *addr, size_t count)); + * const u_intN_t *addr, size_t count); * * Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided * to bus space described by tag/handle starting at `offset'. @@ -421,9 +421,9 @@ int mac68k_bus_space_probe __P((bus_space_tag_t t, #endif /* - * void bus_space_set_multi_N __P((bus_space_tag_t tag, + * void bus_space_set_multi_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, u_intN_t val, - * size_t count)); + * size_t count); * * Write the 1, 2, 4, or 8 byte value `val' to bus space described * by tag/handle/offset `count' times. @@ -477,9 +477,9 @@ int mac68k_bus_space_probe __P((bus_space_tag_t t, #endif /* - * void bus_space_set_region_N __P((bus_space_tag_t tag, + * void bus_space_set_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, u_intN_t val, - * size_t count)); + * size_t count); * * Write `count' 1, 2, 4, or 8 byte value `val' to bus space described * by tag/handle starting at `offset'. @@ -533,21 +533,20 @@ int mac68k_bus_space_probe __P((bus_space_tag_t t, #endif /* - * void bus_space_copy_N __P((bus_space_tag_t tag, + * void bus_space_copy_N(bus_space_tag_t tag, * bus_space_handle_t bsh1, bus_size_t off1, * bus_space_handle_t bsh2, bus_size_t off2, - * size_t count)); + * size_t count); * * Copy `count' 1, 2, 4, or 8 byte values from bus space starting * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2. */ #define __MAC68K_copy_region_N(BYTES) \ -static __inline void __CONCAT(bus_space_copy_region_,BYTES) \ - __P((bus_space_tag_t, \ +static __inline void __CONCAT(bus_space_copy_region_,BYTES) \(bus_space_tag_t, \ bus_space_handle_t bsh1, bus_size_t off1, \ bus_space_handle_t bsh2, bus_size_t off2, \ - bus_size_t count)); \ + bus_size_t count); \ \ static __inline void \ __CONCAT(bus_space_copy_region_,BYTES)(t, h1, o1, h2, o2, c) \ @@ -582,9 +581,9 @@ __MAC68K_copy_region_N(4) /* * Bus read/write barrier methods. * - * void bus_space_barrier __P((bus_space_tag_t tag, + * void bus_space_barrier(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * bus_size_t len, int flags)); + * bus_size_t len, int flags); * * Note: the 680x0 does not currently require barriers, but we must * provide the flags to MI code. diff --git a/sys/arch/mac68k/include/cpu.h b/sys/arch/mac68k/include/cpu.h index 807d64e7233..bee0b440bf6 100644 --- a/sys/arch/mac68k/include/cpu.h +++ b/sys/arch/mac68k/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.22 2001/11/06 18:41:09 art Exp $ */ +/* $OpenBSD: cpu.h,v 1.23 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: cpu.h,v 1.45 1997/02/10 22:13:40 scottr Exp $ */ /* @@ -298,29 +298,29 @@ struct pcb; /* machdep.c */ void mac68k_set_bell_callback __P((int (*)(void *, int, int, int), void *)); -int mac68k_ring_bell __P((int, int, int)); -u_int get_mapping __P((void)); +int mac68k_ring_bell(int, int, int); +u_int get_mapping(void); /* locore.s */ -void m68881_restore __P((struct fpframe *)); -void m68881_save __P((struct fpframe *)); -void TBIA __P((void)); -void TBIAS __P((void)); -void TBIS __P((vm_offset_t)); -void DCFP __P((vm_offset_t)); -void ICPP __P((vm_offset_t)); -void DCIU __P((void)); -void DCIS __P((void)); -void ICIA __P((void)); -void DCFL __P((vm_offset_t)); -int suline __P((caddr_t, caddr_t)); -void savectx __P((struct pcb *)); -void proc_trampoline __P((void)); -void loadustp __P((int)); +void m68881_restore(struct fpframe *); +void m68881_save(struct fpframe *); +void TBIA(void); +void TBIAS(void); +void TBIS(vm_offset_t); +void DCFP(vm_offset_t); +void ICPP(vm_offset_t); +void DCIU(void); +void DCIS(void); +void ICIA(void); +void DCFL(vm_offset_t); +int suline(caddr_t, caddr_t); +void savectx(struct pcb *); +void proc_trampoline(void); +void loadustp(int); /* vm_machdep.c */ -void physaccess __P((caddr_t, caddr_t, register int, register int)); -void physunaccess __P((caddr_t, register int)); +void physaccess(caddr_t, caddr_t, register int, register int); +void physunaccess(caddr_t, register int); #endif diff --git a/sys/arch/mac68k/include/intr.h b/sys/arch/mac68k/include/intr.h index 66289f234c0..b69cc1d41d4 100644 --- a/sys/arch/mac68k/include/intr.h +++ b/sys/arch/mac68k/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.5 2001/11/23 00:47:43 miod Exp $ */ +/* $OpenBSD: intr.h,v 1.6 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: intr.h,v 1.8 1997/11/07 07:33:18 scottr Exp $ */ /* @@ -139,7 +139,7 @@ extern volatile u_int8_t ssir; #define setsoftadb() siron(SIR_ADB) /* locore.s */ -int spl0 __P((void)); +int spl0(void); #endif /* _KERNEL */ #endif /* _MAC68K_INTR_H_ */ diff --git a/sys/arch/mac68k/include/param.h b/sys/arch/mac68k/include/param.h index e7464db6a5c..4b7637f12d5 100644 --- a/sys/arch/mac68k/include/param.h +++ b/sys/arch/mac68k/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.17 2002/01/10 22:25:40 miod Exp $ */ +/* $OpenBSD: param.h,v 1.18 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: param.h,v 1.28 1997/03/01 06:57:45 scottr Exp $ */ /* @@ -114,7 +114,7 @@ #define MSGBUFSIZE 4096 #if defined(_KERNEL) && !defined(_LOCORE) -void delay __P((unsigned)); +void delay(unsigned); #define DELAY(ms) delay(ms) #endif /* _KERNEL && !_LOCORE */ diff --git a/sys/arch/mac68k/include/pmap.h b/sys/arch/mac68k/include/pmap.h index 8c896fea08b..e823fea106c 100644 --- a/sys/arch/mac68k/include/pmap.h +++ b/sys/arch/mac68k/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.16 2002/01/10 22:25:40 miod Exp $ */ +/* $OpenBSD: pmap.h,v 1.17 2002/03/14 01:26:35 millert Exp $ */ #ifndef _MAC68K_PMAP_H_ #define _MAC68K_PMAP_H_ @@ -7,9 +7,9 @@ #ifdef _KERNEL -void mac68k_set_pte __P((vaddr_t va, paddr_t pge)); +void mac68k_set_pte(vaddr_t va, paddr_t pge); -void pmap_init_md __P((void)); +void pmap_init_md(void); #define PMAP_INIT_MD() pmap_init_md() #endif /* _KERNEL */ diff --git a/sys/arch/mac68k/include/psc.h b/sys/arch/mac68k/include/psc.h index f6793bc3d1b..4e2a4436a49 100644 --- a/sys/arch/mac68k/include/psc.h +++ b/sys/arch/mac68k/include/psc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psc.h,v 1.2 1998/05/08 22:13:02 gene Exp $ */ +/* $OpenBSD: psc.h,v 1.3 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: psc.h,v 1.3 1998/04/24 05:27:24 scottr Exp $ */ /*- @@ -37,17 +37,17 @@ extern volatile u_int8_t *PSCBase; #define psc_reg2(r) (*((volatile u_int16_t *)(PSCBase+r))) #define psc_reg4(r) (*((volatile u_int32_t *)(PSCBase+r))) -void psc_init __P((void)); +void psc_init(void); int add_psc_lev3_intr __P((void (*)(void *), void *)); int add_psc_lev4_intr __P((int, int (*)(void *), void *)); int add_psc_lev5_intr __P((int, void (*)(void *), void *)); int add_psc_lev6_intr __P((int, void (*)(void *), void *)); -int remove_psc_lev3_intr __P((void)); -int remove_psc_lev4_intr __P((int)); -int remove_psc_lev5_intr __P((int)); -int remove_psc_lev6_intr __P((int)); +int remove_psc_lev3_intr(void); +int remove_psc_lev4_intr(int); +int remove_psc_lev5_intr(int); +int remove_psc_lev6_intr(int); /* * Reading an interrupt status register returns a mask of the diff --git a/sys/arch/mac68k/include/viareg.h b/sys/arch/mac68k/include/viareg.h index a6535ed261c..c864493457a 100644 --- a/sys/arch/mac68k/include/viareg.h +++ b/sys/arch/mac68k/include/viareg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: viareg.h,v 1.8 2001/05/08 17:30:40 aaron Exp $ */ +/* $OpenBSD: viareg.h,v 1.9 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: viareg.h,v 1.6 1997/02/28 07:41:41 scottr Exp $ */ /*- @@ -190,17 +190,17 @@ extern int VIA2; #define vDirA_ADBState 0x30 #ifdef _KERNEL -void via_init __P((void)); -int rbv_vidstatus __P((void)); -void via_shutdown __P((void)); -void via_set_modem __P((int)); -int add_nubus_intr __P((int, void (*) __P((void *, int)), void *)); -void enable_nubus_intr __P((void)); +void via_init(void); +int rbv_vidstatus(void); +void via_shutdown(void); +void via_set_modem(int); +int add_nubus_intr __P((int, void (*)(void *, int), void *)); +void enable_nubus_intr(void); void via1_register_irq __P((int, void (*)(void *), void *)); void via2_register_irq __P((int, void (*)(void *), void *)); -extern void (*via1itab[7]) __P((void *)); -extern void (*via2itab[7]) __P((void *)); +extern void (*via1itab[7])(void *); +extern void (*via2itab[7])(void *); #endif /* _KERNEL */ #endif /* _MAC68K_VIAREG_H_ */ diff --git a/sys/arch/mac68k/include/z8530var.h b/sys/arch/mac68k/include/z8530var.h index adbd0511da3..3b1851ebc2c 100644 --- a/sys/arch/mac68k/include/z8530var.h +++ b/sys/arch/mac68k/include/z8530var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530var.h,v 1.4 1997/11/30 06:10:38 gene Exp $ */ +/* $OpenBSD: z8530var.h,v 1.5 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: z8530var.h,v 1.2 1996/06/07 10:27:19 briggs Exp $ */ /* @@ -60,13 +60,13 @@ * MacII hardware DOES dake care of the delay for us. */ -u_char zs_read_reg __P((struct zs_chanstate *cs, u_char reg)); -u_char zs_read_csr __P((struct zs_chanstate *cs)); -u_char zs_read_data __P((struct zs_chanstate *cs)); +u_char zs_read_reg(struct zs_chanstate *cs, u_char reg); +u_char zs_read_csr(struct zs_chanstate *cs); +u_char zs_read_data(struct zs_chanstate *cs); -void zs_write_reg __P((struct zs_chanstate *cs, u_char reg, u_char val)); -void zs_write_csr __P((struct zs_chanstate *cs, u_char val)); -void zs_write_data __P((struct zs_chanstate *cs, u_char val)); +void zs_write_reg(struct zs_chanstate *cs, u_char reg, u_char val); +void zs_write_csr(struct zs_chanstate *cs, u_char val); +void zs_write_data(struct zs_chanstate *cs, u_char val); #endif /* _KERNEL */ /* @@ -81,21 +81,21 @@ void zs_write_data __P((struct zs_chanstate *cs, u_char val)); * This could be a macro if you like. */ #ifdef _KERNEL -void zsc_req_softint __P((struct zsc_softc *zsc)); +void zsc_req_softint(struct zsc_softc *zsc); /* Handle user request to enter kernel debugger. */ -void zs_abort __P((struct zstty_softc *zst)); +void zs_abort(struct zstty_softc *zst); /* Hook for MD ioctl support */ -int zsmdioctl __P((struct tty *tp, u_long com, caddr_t data, int flag, - struct proc *p)); +int zsmdioctl(struct tty *tp, u_long com, caddr_t data, int flag, + struct proc *p); /* Clean up at end of tty attach */ -void zstty_mdattach __P((struct zsc_softc *zsc, struct zstty_softc *zst, - struct zs_chanstate *cs, struct tty *tp)); +void zstty_mdattach(struct zsc_softc *zsc, struct zstty_softc *zst, + struct zs_chanstate *cs, struct tty *tp); /* Callback for "external" clock sources */ -void zsmd_setclock __P((struct zs_chanstate *cs)); +void zsmd_setclock(struct zs_chanstate *cs); #endif /* _KERNEL */ /* diff --git a/sys/arch/mac68k/mac68k/autoconf.c b/sys/arch/mac68k/mac68k/autoconf.c index 9c923b3045f..eee8aba8224 100644 --- a/sys/arch/mac68k/mac68k/autoconf.c +++ b/sys/arch/mac68k/mac68k/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.14 2001/06/25 00:43:12 mickey Exp $ */ +/* $OpenBSD: autoconf.c,v 1.15 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: autoconf.c,v 1.38 1996/12/18 05:46:09 scottr Exp $ */ /* @@ -81,15 +81,15 @@ struct device *booted_device; int booted_partition; -struct device *parsedisk __P((char *, int, int, dev_t *)); -static struct device *getdisk __P((char *, int, int, dev_t *)); -static int findblkmajor __P((struct device *)); -static int getstr __P((char *, int)); -static void findbootdev __P((void)); -static int target_to_unit __P((u_long, u_long, u_long)); +struct device *parsedisk(char *, int, int, dev_t *); +static struct device *getdisk(char *, int, int, dev_t *); +static int findblkmajor(struct device *); +static int getstr(char *, int); +static void findbootdev(void); +static int target_to_unit(u_long, u_long, u_long); -void setroot __P((void)); -void swapconf __P((void)); +void setroot(void); +void swapconf(void); void cpu_configure() diff --git a/sys/arch/mac68k/mac68k/bus_space.c b/sys/arch/mac68k/mac68k/bus_space.c index bb2255a07a0..e8393027590 100644 --- a/sys/arch/mac68k/mac68k/bus_space.c +++ b/sys/arch/mac68k/mac68k/bus_space.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_space.c,v 1.15 2002/01/16 20:50:16 miod Exp $ */ +/* $OpenBSD: bus_space.c,v 1.16 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: bus_space.c,v 1.5 1999/03/26 23:41:30 mycroft Exp $ */ /*- @@ -50,8 +50,8 @@ #include <uvm/uvm_extern.h> -int bus_mem_add_mapping __P((bus_addr_t, bus_size_t, - int, bus_space_handle_t *)); +int bus_mem_add_mapping(bus_addr_t, bus_size_t, + int, bus_space_handle_t *); extern struct extent *iomem_ex; extern int iomem_malloc_safe; diff --git a/sys/arch/mac68k/mac68k/clock.c b/sys/arch/mac68k/mac68k/clock.c index e628e057b74..4a2d070925d 100644 --- a/sys/arch/mac68k/mac68k/clock.c +++ b/sys/arch/mac68k/mac68k/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.12 1998/05/22 05:26:43 gene Exp $ */ +/* $OpenBSD: clock.c,v 1.13 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: clock.c,v 1.36 1997/10/07 03:04:55 scottr Exp $ */ /* @@ -100,7 +100,7 @@ int clock_debug = 0; #endif -void rtclock_intr __P((void)); +void rtclock_intr(void); #define DIFF19041970 2082844800 #define DIFF19701990 630720000 @@ -288,8 +288,8 @@ profclock(pclk) #endif #endif -static u_long ugmt_2_pramt __P((u_long)); -static u_long pramt_2_ugmt __P((u_long)); +static u_long ugmt_2_pramt(u_long); +static u_long pramt_2_ugmt(u_long); /* * Convert GMT to Mac PRAM time, using rtc_offset @@ -447,7 +447,7 @@ delay(usec) while ((cycles-- > 0) && delay_flag); } -static unsigned dummy_delay __P((unsigned)); +static unsigned dummy_delay(unsigned); /* * Dummy delay calibration. Functionally identical to delay(), but * returns the number of times through the loop. @@ -468,7 +468,7 @@ dummy_delay(usec) return ((delay_factor >> 7) - cycles); } -static void delay_timer1_irq __P((void *)); +static void delay_timer1_irq(void *); static void delay_timer1_irq(dummy) diff --git a/sys/arch/mac68k/mac68k/disksubr.c b/sys/arch/mac68k/mac68k/disksubr.c index 8e31d72e3dc..11265408e29 100644 --- a/sys/arch/mac68k/mac68k/disksubr.c +++ b/sys/arch/mac68k/mac68k/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.15 2001/12/11 20:55:30 miod Exp $ */ +/* $OpenBSD: disksubr.c,v 1.16 2002/03/14 01:26:35 millert Exp $ */ /* $NetBSD: disksubr.c,v 1.22 1997/11/26 04:18:20 briggs Exp $ */ /* @@ -98,16 +98,15 @@ #define HFS_PART 4 #define SCRATCH_PART 5 -static int getFreeLabelEntry __P((struct disklabel *)); -static int whichType __P((struct partmapentry *)); -static void fixPartTable __P((struct partmapentry *, long, char *, int *)); -static void setRoot __P((struct partmapentry *, struct disklabel *, int)); -static void setSwap __P((struct partmapentry *, struct disklabel *, int)); -static void setUfs __P((struct partmapentry *, struct disklabel *, int)); -static void setHfs __P((struct partmapentry *, struct disklabel *, int)); -static void setScratch __P((struct partmapentry *, struct disklabel *, int)); -static int getNamedType -__P((struct partmapentry *, int, struct disklabel *, int, int, int *)); +static int getFreeLabelEntry(struct disklabel *); +static int whichType(struct partmapentry *); +static void fixPartTable(struct partmapentry *, long, char *, int *); +static void setRoot(struct partmapentry *, struct disklabel *, int); +static void setSwap(struct partmapentry *, struct disklabel *, int); +static void setUfs(struct partmapentry *, struct disklabel *, int); +static void setHfs(struct partmapentry *, struct disklabel *, int); +static void setScratch(struct partmapentry *, struct disklabel *, int); +static int getNamedType(struct partmapentry *, int, struct disklabel *, int, int, int *); static char *read_mac_label __P((dev_t, void (*)(struct buf *), register struct disklabel *, struct cpu_disklabel *)); diff --git a/sys/arch/mac68k/mac68k/fpu.c b/sys/arch/mac68k/mac68k/fpu.c index c17268e19ad..0aaf106d4c7 100644 --- a/sys/arch/mac68k/mac68k/fpu.c +++ b/sys/arch/mac68k/mac68k/fpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu.c,v 1.10 1998/02/14 09:22:38 gene Exp $ */ +/* $OpenBSD: fpu.c,v 1.11 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: fpu.c,v 1.23 1998/01/12 19:22:22 thorpej Exp $ */ /*- @@ -59,9 +59,9 @@ int fputype; extern int *nofault; -static int fpu_match __P((struct device *, void *, void *)); -static void fpu_attach __P((struct device *, struct device *, void *)); -static int fpu_probe __P((void)); +static int fpu_match(struct device *, void *, void *); +static void fpu_attach(struct device *, struct device *, void *); +static int fpu_probe(void); struct cfattach fpu_ca = { sizeof(struct device), fpu_match, fpu_attach diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c index 17501d81479..ceb1ca25508 100644 --- a/sys/arch/mac68k/mac68k/machdep.c +++ b/sys/arch/mac68k/mac68k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.94 2002/01/23 17:51:52 art Exp $ */ +/* $OpenBSD: machdep.c,v 1.95 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: machdep.c,v 1.207 1998/07/08 04:39:34 thorpej Exp $ */ /* @@ -125,7 +125,7 @@ #include <machine/pmap.h> #include <net/netisr.h> -void netintr __P((void)); +void netintr(void); #define MAXMEM 64*1024 /* XXX - from cmap.h */ #include <uvm/uvm_extern.h> @@ -176,7 +176,7 @@ u_int32_t mac68k_vidphys; /* physical addr */ u_int32_t mac68k_vidlen; /* mem length */ /* Callback and cookie to run bell */ -int (*mac68k_bell_callback) __P((void *, int, int, int)); +int (*mac68k_bell_callback)(void *, int, int, int); caddr_t mac68k_bell_cookie; struct vm_map *exec_map = NULL; @@ -234,19 +234,19 @@ int iomem_malloc_safe; /* XXX should be in locore.s for consistency */ int astpending = 0; -static void identifycpu __P((void)); -static u_long get_physical __P((u_int, u_long *)); +static void identifycpu(void); +static u_long get_physical(u_int, u_long *); -void initcpu __P((void)); -int cpu_dumpsize __P((void)); +void initcpu(void); +int cpu_dumpsize(void); int cpu_dump __P((int (*)(dev_t, daddr_t, caddr_t, size_t), daddr_t *)); -void cpu_init_kcore_hdr __P((void)); +void cpu_init_kcore_hdr(void); /* functions called from locore.s */ -void dumpsys __P((void)); -void mac68k_init __P((void)); -void straytrap __P((int, int)); -void nmihand __P((struct frame)); +void dumpsys(void); +void mac68k_init(void); +void straytrap(int, int); +void nmihand(struct frame); /* * Machine-dependent crash dump header info. @@ -525,14 +525,14 @@ void initcpu() { #if defined(M68040) || defined(M68060) - extern void (*vectab[256]) __P((void)); - void addrerr4060 __P((void)); + extern void (*vectab[256])(void); + void addrerr4060(void); #endif #ifdef M68060 - void buserr60 __P((void)); + void buserr60(void); #endif #ifdef M68040 - void buserr40 __P((void)); + void buserr40(void); #endif switch (cputype) { @@ -554,9 +554,9 @@ initcpu() DCIS(); } -void doboot __P((void)) +void doboot(void) __attribute__((__noreturn__)); -void via_shutdown __P((void)); +void via_shutdown(void); /* * Set registers on exec. @@ -751,7 +751,7 @@ cpu_dumpsize() */ int cpu_dump(dump, blknop) - int (*dump) __P((dev_t, daddr_t, caddr_t, size_t)); + int (*dump)(dev_t, daddr_t, caddr_t, size_t); daddr_t *blknop; { int buf[dbtob(1) / sizeof(int)]; @@ -835,7 +835,7 @@ dumpsys() cpu_kcore_hdr_t *h = &cpu_kcore_hdr; daddr_t blkno; /* current block to write */ /* dump routine */ - int (*dump) __P((dev_t, daddr_t, caddr_t, size_t)); + int (*dump)(dev_t, daddr_t, caddr_t, size_t); int pg; /* page being dumped */ vm_offset_t maddr; /* PA being dumped */ int seg; /* RAM segment being dumped */ @@ -964,7 +964,7 @@ microtime(tvp) splx(s); } -void straytrap __P((int, int)); +void straytrap(int, int); void straytrap(pc, evec) @@ -980,7 +980,7 @@ straytrap(pc, evec) int *nofault; -int badaddr __P((caddr_t)); +int badaddr(caddr_t); int badaddr(addr) @@ -1123,7 +1123,7 @@ netintr() /* * Level 7 interrupts can be caused by the keyboard or parity errors. */ -void nmihand __P((struct frame)); +void nmihand(struct frame); void nmihand(frame) @@ -1151,7 +1151,7 @@ nmihand(frame) * for RAM to be aliased across all memory--or for it to appear that * there is more RAM than there really is. */ -int get_top_of_ram __P((void)); +int get_top_of_ram(void); int get_top_of_ram() @@ -1207,8 +1207,8 @@ cpu_exec_aout_makecmds(p, epp) #ifdef COMPAT_SUNOS { - extern int sunos_exec_aout_makecmds __P((struct proc *, - struct exec_package *)); + extern int sunos_exec_aout_makecmds(struct proc *, + struct exec_package *); if ((error = sunos_exec_aout_makecmds(p, epp)) == 0) return 0; } @@ -1221,8 +1221,8 @@ static char *envbuf = NULL; /* * getenvvars: Grab a few useful variables */ -void getenvvars __P((u_long, char *)); -static long getenv __P((char *)); +void getenvvars(u_long, char *); +static long getenv(char *); void getenvvars(flag, buf) @@ -1328,7 +1328,7 @@ getenvvars(flag, buf) mrg_ADBIntrPtr = (caddr_t)getenv("ADBINTERRUPT"); } -static char toupper __P((char)); +static char toupper(char); static char toupper(c) @@ -2183,7 +2183,7 @@ struct { char cpu_model[120]; /* for sysctl() */ -int mach_cputype __P((void)); +int mach_cputype(void); int mach_cputype() @@ -2219,7 +2219,7 @@ identifycpu() printf("cpu: delay factor %d\n", delay_factor); } -static void get_machine_info __P((void)); +static void get_machine_info(void); static void get_machine_info() @@ -2242,7 +2242,7 @@ romvec_t *mrg_MacOSROMVectors = 0; /* * Sets a bunch of machine-specific variables */ -void setmachdep __P((void)); +void setmachdep(void); void setmachdep() @@ -2545,8 +2545,8 @@ gray_bar() #endif /* in locore */ -extern u_long ptest040 __P((caddr_t addr, u_int fc)); -extern int get_pte __P((u_int addr, u_long pte[2], u_short * psr)); +extern u_long ptest040(caddr_t addr, u_int fc); +extern int get_pte(u_int addr, u_long pte[2], u_short * psr); /* * LAK (7/24/94): given a logical address, puts the physical address @@ -2610,7 +2610,7 @@ get_physical(u_int addr, u_long * phys) return 1; } -static void check_video __P((char *, u_long, u_long)); +static void check_video(char *, u_long, u_long); static void check_video(id, limit, maxm) @@ -2827,7 +2827,7 @@ get_mapping(void) /* * Debugging code for locore page-traversal routine. */ -void printstar __P((void)); +void printstar(void); void printstar(void) { @@ -2856,7 +2856,7 @@ printstar(void) void mac68k_set_bell_callback(callback, cookie) - int (*callback) __P((void *, int, int, int)); + int (*callback)(void *, int, int, int); void *cookie; { mac68k_bell_callback = callback; diff --git a/sys/arch/mac68k/mac68k/macrom.c b/sys/arch/mac68k/mac68k/macrom.c index c12a461f59b..e6f70dd7e1c 100644 --- a/sys/arch/mac68k/mac68k/macrom.c +++ b/sys/arch/mac68k/mac68k/macrom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macrom.c,v 1.22 2001/11/06 19:53:15 miod Exp $ */ +/* $OpenBSD: macrom.c,v 1.23 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: macrom.c,v 1.31 1997/03/01 17:20:34 scottr Exp $ */ /*- @@ -118,9 +118,9 @@ caddr_t ResHndls[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, caddr_t ResHndls[]={0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; #endif -void setup_egret __P((void)); -void mrg_execute_deferred __P((void)); -void mrg_DTInstall __P((void)); +void setup_egret(void); +void mrg_execute_deferred(void); +void mrg_DTInstall(void); /* * Last straw functions; we didn't set them up, so freak out! @@ -1096,7 +1096,7 @@ setup_egret(void) } #ifdef MRG_ADB -static void setup_pm __P((void)); +static void setup_pm(void); static void setup_pm(void) diff --git a/sys/arch/mac68k/mac68k/macrom.h b/sys/arch/mac68k/mac68k/macrom.h index 04db780782c..1d0cd52770b 100644 --- a/sys/arch/mac68k/mac68k/macrom.h +++ b/sys/arch/mac68k/mac68k/macrom.h @@ -1,4 +1,4 @@ -/* $OpenBSD: macrom.h,v 1.8 1997/04/14 18:48:03 gene Exp $ */ +/* $OpenBSD: macrom.h,v 1.9 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: macrom.h,v 1.9 1996/05/25 14:45:35 briggs Exp $ */ /*- @@ -41,16 +41,16 @@ extern caddr_t ROMBase; /* Base address of ROM space */ extern caddr_t ADBBase; /* Base address of ADB scratch */ extern caddr_t ADBYMM; /* Base address of yet more ADB mem */ extern caddr_t ADBState; /* Base address of ADB scratch ? */ -extern void (*JADBProc) __P((void)); /* ADBReInit pre/post processing */ -extern void (*Lvl1DT[8]) __P((void)); /* VIA1 interrupt table by bit */ -extern void (*Lvl2DT[8]) __P((void)); /* VIA2 interrupt table by bit */ -extern void (*jADBOp) __P((void)); /* low memory pointer to ADBOp */ -extern void (*jUnimplTrap) __P((void)); /* Unimplemented trap */ +extern void (*JADBProc)(void); /* ADBReInit pre/post processing */ +extern void (*Lvl1DT[8])(void); /* VIA1 interrupt table by bit */ +extern void (*Lvl2DT[8])(void); /* VIA2 interrupt table by bit */ +extern void (*jADBOp)(void); /* low memory pointer to ADBOp */ +extern void (*jUnimplTrap)(void); /* Unimplemented trap */ /* loglob(KbdLast, 0x218) * addr of last kbd to send */ /* loglob(KbdType, 0x21E) * type of last kbd to send */ -extern void (*JKybdTask) __P((void)); /* Keyboard task ptr? */ +extern void (*JKybdTask)(void); /* Keyboard task ptr? */ extern u_char CPUFlag; /* Type of CPU in this machine */ -extern void (*MacJmp) __P((void)); /* ??? */ +extern void (*MacJmp)(void); /* ??? */ extern u_long Lo3Bytes; /* 0x00ffffff */ extern u_long MinusOne; /* 0xffffffff */ extern u_short MMU32Bit; /* MMU mode; short? */ @@ -65,13 +65,13 @@ extern caddr_t VIA; /* VIA1 base address */ extern caddr_t mrg_VIA2; /* VIA2 base address */ extern caddr_t SCCRd; /* SCC read base address */ extern u_char FinderName[20]; /* FinderName - Pascal string */ -extern void (*jSwapMMU) __P((void)); /* Pointer to MMU Swap routine */ -extern void (*jEgret) __P((void)); /* Pointer to MMU Swap routine */ +extern void (*jSwapMMU)(void); /* Pointer to MMU Swap routine */ +extern void (*jEgret)(void); /* Pointer to MMU Swap routine */ extern u_int16_t HwCfgFlags; /* Hardware config flags */ extern u_int32_t HwCfgFlags2; /* more hardware config flags */ extern u_int32_t HwCfgFlags3; /* more hardware config flags */ extern u_int32_t ADBReInit_JTBL; /* pointer to patch table */ -extern void (*jClkNoMem) __P((void)); /* pointer to ClkNoMem */ +extern void (*jClkNoMem)(void); /* pointer to ClkNoMem */ extern u_char SysParam[20]; /* Place where PRam data gets stored */ extern caddr_t ExpandMem; /* pointer to Expanded Memory used by */ /* newer ADB routines (since LCIII) */ @@ -227,41 +227,41 @@ typedef struct romvec_s { */ /* macrom.c */ -void mrg_setvectors __P((romvec_t *rom_vectors)); -int mrg_romready __P((void)); -caddr_t *Get_Ind_Resource __P((u_int32_t, u_int16_t)); -void mrg_initadbintr __P((void)); -long mrg_adbintr __P((void)); -long mrg_pmintr __P((void)); -void mrg_fixupROMBase __P((caddr_t, caddr_t)); -int mrg_Delay __P((void)); -void mrg_VBLQueue __P((void)); -void mrg_init_stub_1 __P((void)); -void mrg_init_stub_2 __P((void)); -void mrg_1sec_timer_tick __P((void)); -void mrg_lvl1dtpanic __P((void)); -void mrg_lvl2dtpanic __P((void)); -void mrg_jadbprocpanic __P((void)); -void mrg_jswapmmupanic __P((void)); -void mrg_jkybdtaskpanic __P((void)); -void mrg_notrap __P((void)); -int myowntrap __P((void)); -int mrg_NewPtr __P((void)); -int mrg_DisposPtr __P((void)); -int mrg_GetPtrSize __P((void)); -int mrg_SetPtrSize __P((void)); -int mrg_PostEvent __P((void)); -int mrg_GetTrapAddress __P((void)); -int mrg_SetTrapAddress __P((void)); -void mrg_StripAddress __P((void)); -void mrg_aline_super __P((struct frame *)); -void mrg_aline_user __P((void)); -void mrg_init __P((void)); -void mrg_FixDiv __P((void)); -void mrg_FixMul __P((void)); +void mrg_setvectors(romvec_t *rom_vectors); +int mrg_romready(void); +caddr_t *Get_Ind_Resource(u_int32_t, u_int16_t); +void mrg_initadbintr(void); +long mrg_adbintr(void); +long mrg_pmintr(void); +void mrg_fixupROMBase(caddr_t, caddr_t); +int mrg_Delay(void); +void mrg_VBLQueue(void); +void mrg_init_stub_1(void); +void mrg_init_stub_2(void); +void mrg_1sec_timer_tick(void); +void mrg_lvl1dtpanic(void); +void mrg_lvl2dtpanic(void); +void mrg_jadbprocpanic(void); +void mrg_jswapmmupanic(void); +void mrg_jkybdtaskpanic(void); +void mrg_notrap(void); +int myowntrap(void); +int mrg_NewPtr(void); +int mrg_DisposPtr(void); +int mrg_GetPtrSize(void); +int mrg_SetPtrSize(void); +int mrg_PostEvent(void); +int mrg_GetTrapAddress(void); +int mrg_SetTrapAddress(void); +void mrg_StripAddress(void); +void mrg_aline_super(struct frame *); +void mrg_aline_user(void); +void mrg_init(void); +void mrg_FixDiv(void); +void mrg_FixMul(void); /* machdep.c */ -int mach_cputype __P((void)); +int mach_cputype(void); /* Tracing aids */ diff --git a/sys/arch/mac68k/mac68k/mainbus.c b/sys/arch/mac68k/mac68k/mainbus.c index 8919d0b656a..a138f1ab32d 100644 --- a/sys/arch/mac68k/mac68k/mainbus.c +++ b/sys/arch/mac68k/mac68k/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.6 1997/03/12 13:37:01 briggs Exp $ */ +/* $OpenBSD: mainbus.c,v 1.7 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: mainbus.c,v 1.7 1996/12/17 06:47:41 scottr Exp $ */ /* @@ -41,9 +41,9 @@ #include <sys/device.h> #include <sys/systm.h> -static int mainbus_match __P((struct device *, void *, void *)); -static void mainbus_attach __P((struct device *, struct device *, void *)); -static int mainbus_search __P((struct device *, void *, void *)); +static int mainbus_match(struct device *, void *, void *); +static void mainbus_attach(struct device *, struct device *, void *); +static int mainbus_search(struct device *, void *, void *); struct cfattach mainbus_ca = { sizeof(struct device), mainbus_match, mainbus_attach diff --git a/sys/arch/mac68k/mac68k/pmap_bootstrap.c b/sys/arch/mac68k/mac68k/pmap_bootstrap.c index 540689f3639..6503f559a87 100644 --- a/sys/arch/mac68k/mac68k/pmap_bootstrap.c +++ b/sys/arch/mac68k/mac68k/pmap_bootstrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_bootstrap.c,v 1.19 2002/01/10 22:25:40 miod Exp $ */ +/* $OpenBSD: pmap_bootstrap.c,v 1.20 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: pmap_bootstrap.c,v 1.50 1999/04/07 06:14:33 scottr Exp $ */ /* @@ -100,8 +100,8 @@ extern caddr_t ROMBase; */ caddr_t CADDR1, CADDR2, vmmap; -void pmap_bootstrap __P((paddr_t, paddr_t)); -void bootstrap_mac68k __P((int)); +void pmap_bootstrap(paddr_t, paddr_t); +void bootstrap_mac68k(int); /* * Bootstrap the VM system. @@ -543,7 +543,7 @@ void bootstrap_mac68k(tc) int tc; { - extern void zs_init __P((void)); + extern void zs_init(void); extern caddr_t esym; paddr_t nextpa; caddr_t oldROMBase; diff --git a/sys/arch/mac68k/mac68k/pram.h b/sys/arch/mac68k/mac68k/pram.h index fc0e59edfb7..c348f51f8d8 100644 --- a/sys/arch/mac68k/mac68k/pram.h +++ b/sys/arch/mac68k/mac68k/pram.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pram.h,v 1.5 1997/04/14 18:48:07 gene Exp $ */ +/* $OpenBSD: pram.h,v 1.6 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: pram.h,v 1.3 1996/05/05 06:18:53 briggs Exp $ */ /* @@ -70,8 +70,8 @@ void writeExtPram(char *addr, int loc, int len); unsigned long getPramTime(void); void setPramTime(unsigned long time); -unsigned long pram_readtime __P((void)); -void pram_settime __P((unsigned long)); +unsigned long pram_readtime(void); +void pram_settime(unsigned long); #ifndef MRG_ADB /* These functions exist only when ADB/PRAM/RTC * access isn't done via the MRG_ADB method. */ diff --git a/sys/arch/mac68k/mac68k/psc.c b/sys/arch/mac68k/mac68k/psc.c index 63912d49467..27a0d9c8fa9 100644 --- a/sys/arch/mac68k/mac68k/psc.c +++ b/sys/arch/mac68k/mac68k/psc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: psc.c,v 1.1 1998/05/08 22:13:02 gene Exp $ */ +/* $OpenBSD: psc.c,v 1.2 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: psc.c,v 1.4 1998/04/24 05:27:26 scottr Exp $ */ /*- @@ -39,27 +39,27 @@ #include <machine/cpu.h> #include <machine/psc.h> -void psc_lev3_intr __P((struct frame *)); -static void psc_lev3_noint __P((void *)); -int psc_lev4_intr __P((struct frame *)); -static int psc_lev4_noint __P((void *)); -void psc_lev5_intr __P((struct frame *)); -static void psc_lev5_noint __P((void *)); -void psc_lev6_intr __P((struct frame *)); -static void psc_lev6_noint __P((void *)); -void psc_spurintr __P((struct frame *)); +void psc_lev3_intr(struct frame *); +static void psc_lev3_noint(void *); +int psc_lev4_intr(struct frame *); +static int psc_lev4_noint(void *); +void psc_lev5_intr(struct frame *); +static void psc_lev5_noint(void *); +void psc_lev6_intr(struct frame *); +static void psc_lev6_noint(void *); +void psc_spurintr(struct frame *); -void (*lev3_intrvec) __P((struct frame *)); -int (*lev4_intrvec) __P((struct frame *)); -void (*lev5_intrvec) __P((struct frame *)); -void (*lev6_intrvec) __P((struct frame *)); +void (*lev3_intrvec)(struct frame *); +int (*lev4_intrvec)(struct frame *); +void (*lev5_intrvec)(struct frame *); +void (*lev6_intrvec)(struct frame *); -extern int zshard __P((void *)); /* from zs.c */ +extern int zshard(void *); /* from zs.c */ -void (*psc3_ihandler) __P((void *)) = psc_lev3_noint; +void (*psc3_ihandler)(void *) = psc_lev3_noint; void *psc3_iarg; -int (*psc4_itab[4]) __P((void *)) = { +int (*psc4_itab[4])(void *) = { psc_lev4_noint, /* 0 */ zshard, /* 1 */ zshard, /* 2 */ @@ -70,7 +70,7 @@ void *psc4_iarg[4] = { (void *)0, (void *)1, (void *)2, (void *)3 }; -void (*psc5_itab[2]) __P((void *)) = { +void (*psc5_itab[2])(void *) = { psc_lev5_noint, /* 0 */ psc_lev5_noint /* 1 */ }; @@ -79,7 +79,7 @@ void *psc5_iarg[2] = { (void *)0, (void *)1 }; -void (*psc6_itab[3]) __P((void *)) = { +void (*psc6_itab[3])(void *) = { psc_lev6_noint, /* 0 */ psc_lev6_noint, /* 1 */ psc_lev6_noint /* 2 */ diff --git a/sys/arch/mac68k/mac68k/swapgeneric.c b/sys/arch/mac68k/mac68k/swapgeneric.c index 667b90930f1..85cbbd32859 100644 --- a/sys/arch/mac68k/mac68k/swapgeneric.c +++ b/sys/arch/mac68k/mac68k/swapgeneric.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapgeneric.c,v 1.4 1996/06/23 15:59:43 briggs Exp $ */ +/* $OpenBSD: swapgeneric.c,v 1.5 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: swapgeneric.c,v 1.10 1996/06/19 03:21:06 scottr Exp $ */ /* @@ -43,7 +43,7 @@ #include <sys/param.h> #include <sys/conf.h> -int (*mountroot) __P((void *)) = NULL; /* tells autoconf.c that we are "generic" */ +int (*mountroot)(void *) = NULL; /* tells autoconf.c that we are "generic" */ dev_t rootdev = NODEV; dev_t dumpdev = NODEV; diff --git a/sys/arch/mac68k/mac68k/sys_machdep.c b/sys/arch/mac68k/mac68k/sys_machdep.c index b4cc36c3064..486f01fef6c 100644 --- a/sys/arch/mac68k/mac68k/sys_machdep.c +++ b/sys/arch/mac68k/mac68k/sys_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_machdep.c,v 1.5 2000/06/23 02:14:35 mickey Exp $ */ +/* $OpenBSD: sys_machdep.c,v 1.6 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: sys_machdep.c,v 1.9 1996/05/05 06:18:58 briggs Exp $ */ /* @@ -94,9 +94,9 @@ #define CC_EXTPURGE 0x80000000 /* XXX end should be */ -int cachectl __P((int, caddr_t, int)); -void DCIU __P((void)); -void ICIA __P((void)); +int cachectl(int, caddr_t, int); +void DCIU(void); +void ICIA(void); /*ARGSUSED1*/ int diff --git a/sys/arch/mac68k/mac68k/trap.c b/sys/arch/mac68k/mac68k/trap.c index c43bbe6991f..87709b31667 100644 --- a/sys/arch/mac68k/mac68k/trap.c +++ b/sys/arch/mac68k/mac68k/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.34 2001/12/08 02:24:06 art Exp $ */ +/* $OpenBSD: trap.c,v 1.35 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: trap.c,v 1.68 1998/12/22 08:47:07 scottr Exp $ */ /* @@ -139,14 +139,14 @@ int mmupid = -1; #endif /* trap() and syscall() only called from locore */ -void trap __P((int, u_int, u_int, struct frame)); -void syscall __P((register_t, struct frame)); +void trap(int, u_int, u_int, struct frame); +void syscall(register_t, struct frame); #if defined(M68040) -static int writeback __P((struct frame *, int)); +static int writeback(struct frame *, int); #if DEBUG -static void dumpssw __P((u_short)); -static void dumpwb __P((int, u_short, u_int, u_int)); +static void dumpssw(u_short); +static void dumpwb(int, u_short, u_int, u_int); #endif #endif @@ -519,25 +519,25 @@ copyfault: case T_SSIR: /* Software interrupt */ case T_SSIR|T_USER: if (ssir & SIR_SERIAL) { - void zssoft __P((int)); + void zssoft(int); siroff(SIR_SERIAL); uvmexp.softs++; zssoft(0); } if (ssir & SIR_NET) { - void netintr __P((void)); + void netintr(void); siroff(SIR_NET); uvmexp.softs++; netintr(); } if (ssir & SIR_CLOCK) { - void softclock __P((void)); + void softclock(void); siroff(SIR_CLOCK); uvmexp.softs++; softclock(); } if (ssir & SIR_DTMGR) { - void mrg_execute_deferred __P((void)); + void mrg_execute_deferred(void); siroff(SIR_DTMGR); uvmexp.softs++; mrg_execute_deferred(); diff --git a/sys/arch/mac68k/mac68k/via.c b/sys/arch/mac68k/mac68k/via.c index 2866fe5ef33..09e5fcc7e8e 100644 --- a/sys/arch/mac68k/mac68k/via.c +++ b/sys/arch/mac68k/mac68k/via.c @@ -1,4 +1,4 @@ -/* $OpenBSD: via.c,v 1.16 2001/05/08 17:30:41 aaron Exp $ */ +/* $OpenBSD: via.c,v 1.17 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: via.c,v 1.58 1997/03/04 04:11:52 scottr Exp $ */ /*- @@ -47,20 +47,20 @@ #include <machine/frame.h> #include <machine/viareg.h> -static void via1_noint __P((void *)); -static void via2_noint __P((void *)); -static void slot_ignore __P((void *, int)); -static void slot_noint __P((void *, int)); -void mrg_adbintr __P((void *)); -void mrg_pmintr __P((void *)); -void rtclock_intr __P((void *)); -void profclock __P((void *)); -void via1_intr __P((struct frame *)); -void via2_nubus_intr __P((void *)); -void rbv_nubus_intr __P((void *)); +static void via1_noint(void *); +static void via2_noint(void *); +static void slot_ignore(void *, int); +static void slot_noint(void *, int); +void mrg_adbintr(void *); +void mrg_pmintr(void *); +void rtclock_intr(void *); +void profclock(void *); +void via1_intr(struct frame *); +void via2_nubus_intr(void *); +void rbv_nubus_intr(void *); int VIA2 = 1; /* default for II, IIx, IIcx, SE/30. */ -void (*via1itab[7]) __P((void *))={ +void (*via1itab[7])(void *)={ via1_noint, via1_noint, mrg_adbintr, @@ -70,7 +70,7 @@ void (*via1itab[7]) __P((void *))={ rtclock_intr, }; /* VIA1 interrupt handler table */ -void (*via2itab[7]) __P((void *))={ +void (*via2itab[7])(void *)={ via2_noint, via2_nubus_intr, via2_noint, @@ -85,10 +85,10 @@ void *via2iarg[7] = { (void *) 4, (void *) 5, (void *) 6 }; /* Arg array for VIA2 interrupts. */ -void via2_intr __P((struct frame *)); -void rbv_intr __P((struct frame *)); +void via2_intr(struct frame *); +void rbv_intr(struct frame *); -void (*real_via2_intr) __P((struct frame *)); +void (*real_via2_intr)(struct frame *); /* * Nubus slot interrupt routines and parameters for slots 9-15. Note @@ -96,7 +96,7 @@ void (*real_via2_intr) __P((struct frame *)); * as a slot 15 interrupt; this slot is quite fictitious in real-world * Macs. See also GMFH, pp. 165-167, and "Monster, Loch Ness." */ -void (*slotitab[7]) __P((void *, int)) = { +void (*slotitab[7])(void *, int) = { slot_noint, slot_noint, slot_noint, @@ -292,7 +292,7 @@ static int nubus_intr_mask = 0; int add_nubus_intr(slot, func, client_data) int slot; - void (*func) __P((void *, int)); + void (*func)(void *, int); void *client_data; { int s; diff --git a/sys/arch/mac68k/mac68k/vm_machdep.c b/sys/arch/mac68k/mac68k/vm_machdep.c index eddc3f3a209..0fe63089041 100644 --- a/sys/arch/mac68k/mac68k/vm_machdep.c +++ b/sys/arch/mac68k/mac68k/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.28 2001/12/08 02:24:06 art Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.29 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: vm_machdep.c,v 1.29 1998/07/28 18:34:55 thorpej Exp $ */ /* @@ -62,7 +62,7 @@ #include <machine/pte.h> #include <machine/reg.h> -void savectx __P((struct pcb *)); +void savectx(struct pcb *); /* * Finish a fork operation, with process p2 nearly set up. @@ -115,7 +115,7 @@ cpu_fork(p1, p2, stack, stacksize, func, arg) pcb->pcb_regs[11] = (int)sf; /* SSP */ } -void switch_exit __P((struct proc *)); +void switch_exit(struct proc *); /* * cpu_exit is called as the last action during exit. @@ -281,7 +281,7 @@ physunaccess(vaddr, size) TBIAS(); } -int kvtop __P((caddr_t addr)); +int kvtop(caddr_t addr); /* * Convert kernel VA to physical address diff --git a/sys/arch/macppc/dev/abtn.c b/sys/arch/macppc/dev/abtn.c index f570a9d9c5f..fb6c6837984 100644 --- a/sys/arch/macppc/dev/abtn.c +++ b/sys/arch/macppc/dev/abtn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: abtn.c,v 1.2 2001/09/01 17:43:08 drahn Exp $ */ +/* $OpenBSD: abtn.c,v 1.3 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: abtn.c,v 1.1 1999/07/12 17:48:26 tsubai Exp $ */ /*- @@ -48,9 +48,9 @@ struct abtn_softc { int volume; /* speaker volume (not yet) */ }; -static int abtn_match __P((struct device *, void *, void *)); -static void abtn_attach __P((struct device *, struct device *, void *)); -static void abtn_adbcomplete __P((caddr_t, caddr_t, int)); +static int abtn_match(struct device *, void *, void *); +static void abtn_attach(struct device *, struct device *, void *); +static void abtn_adbcomplete(caddr_t, caddr_t, int); struct cfattach abtn_ca = { sizeof(struct abtn_softc), abtn_match, abtn_attach diff --git a/sys/arch/macppc/dev/adb.c b/sys/arch/macppc/dev/adb.c index d7ddcc277ab..b79bd37743a 100644 --- a/sys/arch/macppc/dev/adb.c +++ b/sys/arch/macppc/dev/adb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adb.c,v 1.3 2001/10/03 14:45:37 drahn Exp $ */ +/* $OpenBSD: adb.c,v 1.4 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: adb.c,v 1.6 1999/08/16 06:28:09 tsubai Exp $ */ /*- @@ -52,9 +52,9 @@ /* * Function declarations. */ -static int adbmatch __P((struct device *, void *, void *)); -static void adbattach __P((struct device *, struct device *, void *)); -static int adbprint __P((void *, const char *)); +static int adbmatch(struct device *, void *, void *); +static void adbattach(struct device *, struct device *, void *); +static int adbprint(void *, const char *); /* * Global variables. diff --git a/sys/arch/macppc/dev/adb_direct.c b/sys/arch/macppc/dev/adb_direct.c index 747279f5acb..eb25d2c239a 100644 --- a/sys/arch/macppc/dev/adb_direct.c +++ b/sys/arch/macppc/dev/adb_direct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adb_direct.c,v 1.2 2001/09/01 17:43:08 drahn Exp $ */ +/* $OpenBSD: adb_direct.c,v 1.3 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: adb_direct.c,v 1.14 2000/06/08 22:10:45 tsubai Exp $ */ /* From: adb_direct.c 2.02 4/18/97 jpw */ @@ -165,7 +165,7 @@ * A structure for storing information about each ADB device. */ struct ADBDevEntry { - void (*ServiceRtPtr) __P((void)); + void (*ServiceRtPtr)(void); void *DataAreaAddr; int devType; int origAddr; @@ -252,48 +252,48 @@ struct timeout adb_softintr_timeout; volatile u_char *Via1Base; extern int adb_polling; /* Are we polling? */ -void pm_setup_adb __P((void)); -void pm_check_adb_devices __P((int)); -void pm_intr __P((void)); -int pm_adb_op __P((u_char *, void *, void *, int)); -void pm_init_adb_device __P((void)); +void pm_setup_adb(void); +void pm_check_adb_devices(int); +void pm_intr(void); +int pm_adb_op(u_char *, void *, void *, int); +void pm_init_adb_device(void); /* * The following are private routines. */ #ifdef ADB_DEBUG -void print_single __P((u_char *)); +void print_single(u_char *); #endif -void adb_intr_II __P((void)); -void adb_intr_IIsi __P((void)); -void adb_intr_cuda __P((void)); -void adb_soft_intr __P((void)); -int send_adb_II __P((u_char *, u_char *, void *, void *, int)); -int send_adb_IIsi __P((u_char *, u_char *, void *, void *, int)); -int send_adb_cuda __P((u_char *, u_char *, void *, void *, int)); -void adb_intr_cuda_test __P((void)); -void adb_cuda_tickle __P((void)); -void adb_pass_up __P((struct adbCommand *)); -void adb_op_comprout __P((caddr_t, caddr_t, int)); -void adb_reinit __P((void)); -int count_adbs __P((void)); -int get_ind_adb_info __P((ADBDataBlock *, int)); -int get_adb_info __P((ADBDataBlock *, int)); -int set_adb_info __P((ADBSetInfoBlock *, int)); -void adb_setup_hw_type __P((void)); -int adb_op __P((Ptr, Ptr, Ptr, short)); -void adb_read_II __P((u_char *)); -void adb_hw_setup __P((void)); -void adb_hw_setup_IIsi __P((u_char *)); -void adb_comp_exec __P((void)); -int adb_cmd_result __P((u_char *)); -int adb_cmd_extra __P((u_char *)); -int adb_guess_next_device __P((void)); -int adb_prog_switch_enable __P((void)); -int adb_prog_switch_disable __P((void)); +void adb_intr_II(void); +void adb_intr_IIsi(void); +void adb_intr_cuda(void); +void adb_soft_intr(void); +int send_adb_II(u_char *, u_char *, void *, void *, int); +int send_adb_IIsi(u_char *, u_char *, void *, void *, int); +int send_adb_cuda(u_char *, u_char *, void *, void *, int); +void adb_intr_cuda_test(void); +void adb_cuda_tickle(void); +void adb_pass_up(struct adbCommand *); +void adb_op_comprout(caddr_t, caddr_t, int); +void adb_reinit(void); +int count_adbs(void); +int get_ind_adb_info(ADBDataBlock *, int); +int get_adb_info(ADBDataBlock *, int); +int set_adb_info(ADBSetInfoBlock *, int); +void adb_setup_hw_type(void); +int adb_op(Ptr, Ptr, Ptr, short); +void adb_read_II(u_char *); +void adb_hw_setup(void); +void adb_hw_setup_IIsi(u_char *); +void adb_comp_exec(void); +int adb_cmd_result(u_char *); +int adb_cmd_extra(u_char *); +int adb_guess_next_device(void); +int adb_prog_switch_enable(void); +int adb_prog_switch_disable(void); /* we should create this and it will be the public version */ -int send_adb __P((u_char *, void *, void *)); -int setsoftadb __P((void)); +int send_adb(u_char *, void *, void *); +int setsoftadb(void); #ifdef ADB_DEBUG /* @@ -1007,7 +1007,7 @@ adb_soft_intr(void) /* call default completion routine if it's valid */ if (comprout) { - ((int (*) __P((u_char *, u_char*, int))) comprout) + ((int (*)(u_char *, u_char*, int)) comprout) (buffer, compdata, cmd); #if 0 #ifdef __NetBSD__ diff --git a/sys/arch/macppc/dev/adb_direct.h b/sys/arch/macppc/dev/adb_direct.h index 007d2fc9d61..bc96f0a51e2 100644 --- a/sys/arch/macppc/dev/adb_direct.h +++ b/sys/arch/macppc/dev/adb_direct.h @@ -1,4 +1,4 @@ -/* $OpenBSD: adb_direct.h,v 1.1 2001/09/01 15:50:00 drahn Exp $ */ +/* $OpenBSD: adb_direct.h,v 1.2 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: adb_direct.h,v 1.1 1998/05/15 10:15:47 tsubai Exp $ */ /* @@ -43,13 +43,13 @@ #define ADB_HW_PB 0x04 /* PowerBook series */ #define ADB_HW_CUDA 0x05 /* Machines with a Cuda chip */ -int adb_poweroff __P((void)); -int CountADBs __P((void)); -void ADBReInit __P((void)); -int GetIndADB __P((ADBDataBlock *info, int index)); -int GetADBInfo __P((ADBDataBlock *info, int adbAddr)); -int SetADBInfo __P((ADBSetInfoBlock *info, int adbAddr)); -int ADBOp __P((Ptr buffer, Ptr compRout, Ptr data, short commandNum)); -int adb_read_date_time __P((unsigned long *)); -int adb_set_date_time __P((unsigned long)); -int adb_op_sync __P((Ptr, Ptr, Ptr, short)); +int adb_poweroff(void); +int CountADBs(void); +void ADBReInit(void); +int GetIndADB(ADBDataBlock *info, int index); +int GetADBInfo(ADBDataBlock *info, int adbAddr); +int SetADBInfo(ADBSetInfoBlock *info, int adbAddr); +int ADBOp(Ptr buffer, Ptr compRout, Ptr data, short commandNum); +int adb_read_date_time(unsigned long *); +int adb_set_date_time(unsigned long); +int adb_op_sync(Ptr, Ptr, Ptr, short); diff --git a/sys/arch/macppc/dev/adbvar.h b/sys/arch/macppc/dev/adbvar.h index b84babcc68c..b4997addc41 100644 --- a/sys/arch/macppc/dev/adbvar.h +++ b/sys/arch/macppc/dev/adbvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: adbvar.h,v 1.2 2001/10/03 14:45:37 drahn Exp $ */ +/* $OpenBSD: adbvar.h,v 1.3 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: adbvar.h,v 1.3 2000/06/08 22:10:46 tsubai Exp $ */ /*- @@ -86,25 +86,25 @@ struct adb_softc { /* adb.c */ -void adb_enqevent __P((adb_event_t *event)); -void adb_handoff __P((adb_event_t *event)); -void adb_autorepeat __P((void *keyp)); -void adb_dokeyupdown __P((adb_event_t *event)); -void adb_keymaybemouse __P((adb_event_t *event)); -void adb_processevent __P((adb_event_t *event)); -int adbopen __P((dev_t dev, int flag, int mode, struct proc *p)); -int adbclose __P((dev_t dev, int flag, int mode, struct proc *p)); -int adbread __P((dev_t dev, struct uio *uio, int flag)); -int adbwrite __P((dev_t dev, struct uio *uio, int flag)); -int adbioctl __P((dev_t , int , caddr_t , int , struct proc *)); -int adbpoll __P((dev_t dev, int events, struct proc *p)); +void adb_enqevent(adb_event_t *event); +void adb_handoff(adb_event_t *event); +void adb_autorepeat(void *keyp); +void adb_dokeyupdown(adb_event_t *event); +void adb_keymaybemouse(adb_event_t *event); +void adb_processevent(adb_event_t *event); +int adbopen(dev_t dev, int flag, int mode, struct proc *p); +int adbclose(dev_t dev, int flag, int mode, struct proc *p); +int adbread(dev_t dev, struct uio *uio, int flag); +int adbwrite(dev_t dev, struct uio *uio, int flag); +int adbioctl(dev_t , int , caddr_t , int , struct proc *); +int adbpoll(dev_t dev, int events, struct proc *p); /* adbsys.c */ -void adb_complete __P((caddr_t buffer, caddr_t data_area, int adb_command)); -void adb_msa3_complete __P((caddr_t buffer, caddr_t data_area, int adb_command)); -void adb_mm_nonemp_complete __P((caddr_t buffer, caddr_t data_area, int adb_command)); -void extdms_init __P((int)); -void extdms_complete __P((caddr_t, caddr_t, int)); +void adb_complete(caddr_t buffer, caddr_t data_area, int adb_command); +void adb_msa3_complete(caddr_t buffer, caddr_t data_area, int adb_command); +void adb_mm_nonemp_complete(caddr_t buffer, caddr_t data_area, int adb_command); +void extdms_init(int); +void extdms_complete(caddr_t, caddr_t, int); /* types of adb hardware that we (will eventually) support */ #define ADB_HW_UNKNOWN 0x01 /* don't know */ @@ -121,14 +121,14 @@ extern int adbHardware; /* in adb_direct.c */ #define ADBTALK(dev, reg) ((((u_int8_t)(dev) & 0x0f) << 4) | 0x0c | (reg)) /* adb_direct.c */ -int adb_poweroff __P((void)); -int CountADBs __P((void)); -void ADBReInit __P((void)); -int GetIndADB __P((ADBDataBlock * info, int index)); -int GetADBInfo __P((ADBDataBlock * info, int adbAddr)); -int SetADBInfo __P((ADBSetInfoBlock * info, int adbAddr)); -int ADBOp __P((Ptr buffer, Ptr compRout, Ptr data, short commandNum)); -int adb_read_date_time __P((unsigned long *t)); -int adb_set_date_time __P((unsigned long t)); -int adb_intr __P((void *arg)); -void adb_cuda_autopoll __P((void)); +int adb_poweroff(void); +int CountADBs(void); +void ADBReInit(void); +int GetIndADB(ADBDataBlock * info, int index); +int GetADBInfo(ADBDataBlock * info, int adbAddr); +int SetADBInfo(ADBSetInfoBlock * info, int adbAddr); +int ADBOp(Ptr buffer, Ptr compRout, Ptr data, short commandNum); +int adb_read_date_time(unsigned long *t); +int adb_set_date_time(unsigned long t); +int adb_intr(void *arg); +void adb_cuda_autopoll(void); diff --git a/sys/arch/macppc/dev/aed.c b/sys/arch/macppc/dev/aed.c index d5ac8136064..75f56ca69fa 100644 --- a/sys/arch/macppc/dev/aed.c +++ b/sys/arch/macppc/dev/aed.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aed.c,v 1.2 2001/09/01 17:43:08 drahn Exp $ */ +/* $OpenBSD: aed.c,v 1.3 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: aed.c,v 1.5 2000/03/23 06:40:33 thorpej Exp $ */ /* @@ -54,17 +54,17 @@ * Function declarations. */ #ifdef __NetBSD__ -static int aedmatch __P((struct device *, struct cfdata *, void *)); +static int aedmatch(struct device *, struct cfdata *, void *); #endif /* __NetBSD__ */ #ifdef __OpenBSD__ -static int aedmatch __P((struct device *, void *, void *)); +static int aedmatch(struct device *, void *, void *); #endif /* __OpenBSD__ */ -static void aedattach __P((struct device *, struct device *, void *)); -static void aed_emulate_mouse __P((adb_event_t *event)); -static void aed_kbdrpt __P((void *kstate)); -static void aed_dokeyupdown __P((adb_event_t *event)); -static void aed_handoff __P((adb_event_t *event)); -static void aed_enqevent __P((adb_event_t *event)); +static void aedattach(struct device *, struct device *, void *); +static void aed_emulate_mouse(adb_event_t *event); +static void aed_kbdrpt(void *kstate); +static void aed_dokeyupdown(adb_event_t *event); +static void aed_handoff(adb_event_t *event); +static void aed_enqevent(adb_event_t *event); /* * Global variables. diff --git a/sys/arch/macppc/dev/aedvar.h b/sys/arch/macppc/dev/aedvar.h index f53770e0de3..e27f7394a24 100644 --- a/sys/arch/macppc/dev/aedvar.h +++ b/sys/arch/macppc/dev/aedvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aedvar.h,v 1.1 2001/09/01 15:50:00 drahn Exp $ */ +/* $OpenBSD: aedvar.h,v 1.2 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: aedvar.h,v 1.2 2000/03/23 06:40:33 thorpej Exp $ */ /* @@ -83,10 +83,10 @@ struct aed_softc { /* Options */ #define AED_MSEMUL 0x1 /* emulate mouse buttons */ -void aed_input __P((adb_event_t *event)); -int aedopen __P((dev_t dev, int flag, int mode, struct proc *p)); -int aedclose __P((dev_t dev, int flag, int mode, struct proc *p)); -int aedread __P((dev_t dev, struct uio *uio, int flag)); -int aedwrite __P((dev_t dev, struct uio *uio, int flag)); -int aedioctl __P((dev_t , int , caddr_t , int , struct proc *)); -int aedpoll __P((dev_t dev, int events, struct proc *p)); +void aed_input(adb_event_t *event); +int aedopen(dev_t dev, int flag, int mode, struct proc *p); +int aedclose(dev_t dev, int flag, int mode, struct proc *p); +int aedread(dev_t dev, struct uio *uio, int flag); +int aedwrite(dev_t dev, struct uio *uio, int flag); +int aedioctl(dev_t , int , caddr_t , int , struct proc *); +int aedpoll(dev_t dev, int events, struct proc *p); diff --git a/sys/arch/macppc/dev/akbd.c b/sys/arch/macppc/dev/akbd.c index 2bc7f43ab1c..1d352be0277 100644 --- a/sys/arch/macppc/dev/akbd.c +++ b/sys/arch/macppc/dev/akbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: akbd.c,v 1.2 2001/09/01 17:43:08 drahn Exp $ */ +/* $OpenBSD: akbd.c,v 1.3 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: akbd.c,v 1.13 2001/01/25 14:08:55 tsubai Exp $ */ /* @@ -62,14 +62,14 @@ /* * Function declarations. */ -static int akbdmatch __P((struct device *, void *, void *)); -static void akbdattach __P((struct device *, struct device *, void *)); -void kbd_adbcomplete __P((caddr_t buffer, caddr_t data_area, int adb_command)); -static void kbd_processevent __P((adb_event_t *event, struct akbd_softc *)); +static int akbdmatch(struct device *, void *, void *); +static void akbdattach(struct device *, struct device *, void *); +void kbd_adbcomplete(caddr_t buffer, caddr_t data_area, int adb_command); +static void kbd_processevent(adb_event_t *event, struct akbd_softc *); #ifdef notyet -static u_char getleds __P((int)); -static int setleds __P((struct akbd_softc *, u_char)); -static void blinkleds __P((struct akbd_softc *)); +static u_char getleds(int); +static int setleds(struct akbd_softc *, u_char); +static void blinkleds(struct akbd_softc *); #endif /* Driver definition. */ @@ -83,10 +83,10 @@ struct cfdriver akbd_cd = { extern struct cfdriver akbd_cd; -int akbd_enable __P((void *, int)); -void akbd_set_leds __P((void *, int)); -int akbd_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); -int akbd_intr __P((adb_event_t *event)); +int akbd_enable(void *, int); +void akbd_set_leds(void *, int); +int akbd_ioctl(void *, u_long, caddr_t, int, struct proc *); +int akbd_intr(adb_event_t *event); struct wskbd_accessops akbd_accessops = { akbd_enable, @@ -94,8 +94,8 @@ struct wskbd_accessops akbd_accessops = { akbd_ioctl, }; -void akbd_cngetc __P((void *, u_int *, int *)); -void akbd_cnpollc __P((void *, int)); +void akbd_cngetc(void *, u_int *, int *); +void akbd_cnpollc(void *, int); struct wskbd_consops akbd_consops = { akbd_cngetc, diff --git a/sys/arch/macppc/dev/akbdvar.h b/sys/arch/macppc/dev/akbdvar.h index ff1a56d5365..50964ec27e4 100644 --- a/sys/arch/macppc/dev/akbdvar.h +++ b/sys/arch/macppc/dev/akbdvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: akbdvar.h,v 1.1 2001/09/01 15:50:00 drahn Exp $ */ +/* $OpenBSD: akbdvar.h,v 1.2 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: akbdvar.h,v 1.4 1999/02/17 14:56:56 tsubai Exp $ */ /* @@ -56,7 +56,7 @@ struct akbd_softc { #define LED_CAPSLOCK 0x2 #define LED_SCROLL_LOCK 0x4 -void kbd_adbcomplete __P((caddr_t buffer, caddr_t data_area, int adb_command)); +void kbd_adbcomplete(caddr_t buffer, caddr_t data_area, int adb_command); int akbd_cnattach(void); #endif /* _MACPPC_KBDVAR_H_ */ diff --git a/sys/arch/macppc/dev/ams.c b/sys/arch/macppc/dev/ams.c index be431ed5ed0..eef607cdea9 100644 --- a/sys/arch/macppc/dev/ams.c +++ b/sys/arch/macppc/dev/ams.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ams.c,v 1.2 2001/09/01 17:43:08 drahn Exp $ */ +/* $OpenBSD: ams.c,v 1.3 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: ams.c,v 1.11 2000/12/19 03:13:40 tsubai Exp $ */ /* @@ -55,10 +55,10 @@ /* * Function declarations. */ -static int amsmatch __P((struct device *, void *, void *)); -static void amsattach __P((struct device *, struct device *, void *)); -static void ems_init __P((struct ams_softc *)); -static void ms_processevent __P((adb_event_t *event, struct ams_softc *)); +static int amsmatch(struct device *, void *, void *); +static void amsattach(struct device *, struct device *, void *); +static void ems_init(struct ams_softc *); +static void ms_processevent(adb_event_t *event, struct ams_softc *); /* Driver definition. */ struct cfattach ams_ca = { @@ -70,9 +70,9 @@ struct cfdriver ams_cd = { }; -int ams_enable __P((void *)); -int ams_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); -void ams_disable __P((void *)); +int ams_enable(void *); +int ams_ioctl(void *, u_long, caddr_t, int, struct proc *); +void ams_disable(void *); const struct wsmouse_accessops ams_accessops = { ams_enable, diff --git a/sys/arch/macppc/dev/amsvar.h b/sys/arch/macppc/dev/amsvar.h index 059131689d6..51fe68b6671 100644 --- a/sys/arch/macppc/dev/amsvar.h +++ b/sys/arch/macppc/dev/amsvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: amsvar.h,v 1.1 2001/09/01 15:50:00 drahn Exp $ */ +/* $OpenBSD: amsvar.h,v 1.2 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: amsvar.h,v 1.4 1999/06/17 06:59:05 tsubai Exp $ */ /* @@ -61,7 +61,7 @@ struct ams_softc { #define MSCLASS_TRACKBALL 2 #define MSCLASS_TRACKPAD 3 -void ms_adbcomplete __P((caddr_t buffer, caddr_t data_area, int adb_command)); -void ms_handoff __P((adb_event_t *event, struct ams_softc *)); +void ms_adbcomplete(caddr_t buffer, caddr_t data_area, int adb_command); +void ms_handoff(adb_event_t *event, struct ams_softc *); #endif /* _MACPPC_AMSVAR_H_ */ diff --git a/sys/arch/macppc/dev/apm.c b/sys/arch/macppc/dev/apm.c index 7cb4450ff52..49952497b99 100644 --- a/sys/arch/macppc/dev/apm.c +++ b/sys/arch/macppc/dev/apm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apm.c,v 1.2 2001/10/03 20:06:00 drahn Exp $ */ +/* $OpenBSD: apm.c,v 1.3 2002/03/14 01:26:36 millert Exp $ */ /*- * Copyright (c) 2001 Alexander Guy. All rights reserved. @@ -69,16 +69,16 @@ struct apm_softc { int sc_flags; }; -int apmmatch __P((struct device *, void *, void *)); -void apmattach __P((struct device *, struct device *, void *)); +int apmmatch(struct device *, void *, void *); +void apmattach(struct device *, struct device *, void *); struct cfattach apm_ca = { sizeof(struct apm_softc), apmmatch, apmattach }; -int apmopen __P((dev_t dev, int flag, int mode, struct proc *p)); -int apmclose __P((dev_t dev, int flag, int mode, struct proc *p)); -int apmioctl __P((dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)); +int apmopen(dev_t dev, int flag, int mode, struct proc *p); +int apmclose(dev_t dev, int flag, int mode, struct proc *p); +int apmioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p); struct cfdriver apm_cd = { NULL, "apm", DV_DULL @@ -89,9 +89,9 @@ struct cfdriver apm_cd = { #define APMDEV_NORMAL 0 #define APMDEV_CTL 8 -void filt_apmrdetach __P((struct knote *kn)); -int filt_apmread __P((struct knote *kn, long hint)); -int apmkqfilter __P((dev_t dev, struct knote *kn)); +void filt_apmrdetach(struct knote *kn); +int filt_apmread(struct knote *kn, long hint); +int apmkqfilter(dev_t dev, struct knote *kn); struct filterops apmread_filtops = { 1, NULL, filt_apmrdetach, filt_apmread}; diff --git a/sys/arch/macppc/dev/awacs.c b/sys/arch/macppc/dev/awacs.c index 40b4524e133..6dde84af2de 100644 --- a/sys/arch/macppc/dev/awacs.c +++ b/sys/arch/macppc/dev/awacs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: awacs.c,v 1.8 2002/01/30 06:53:56 drahn Exp $ */ +/* $OpenBSD: awacs.c,v 1.9 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: awacs.c,v 1.4 2001/02/26 21:07:51 wiz Exp $ */ /*- @@ -114,7 +114,7 @@ int awacs_query_devinfo(void *, mixer_devinfo_t *); size_t awacs_round_buffersize(void *, int, size_t); paddr_t awacs_mappage(void *, void *, off_t, int); int awacs_get_props(void *); -void *awacs_allocm __P((void *, int, size_t, int, int)); +void *awacs_allocm(void *, int, size_t, int, int); static inline u_int awacs_read_reg(struct awacs_softc *, int); static inline void awacs_write_reg(struct awacs_softc *, int, int); @@ -122,7 +122,7 @@ void awacs_write_codec(struct awacs_softc *, int); void awacs_set_speaker_volume(struct awacs_softc *, int, int); void awacs_set_ext_volume(struct awacs_softc *, int, int); int awacs_set_rate(struct awacs_softc *, int); -void awacs_mono16_to_stereo16 __P((void *v, u_char *p, int cc)); +void awacs_mono16_to_stereo16(void *v, u_char *p, int cc); struct cfattach awacs_ca = { sizeof(struct awacs_softc), awacs_match, awacs_attach diff --git a/sys/arch/macppc/dev/if_bm.c b/sys/arch/macppc/dev/if_bm.c index bbc11040fbc..1997e6f8bf0 100644 --- a/sys/arch/macppc/dev/if_bm.c +++ b/sys/arch/macppc/dev/if_bm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bm.c,v 1.6 2002/03/12 09:51:20 kjc Exp $ */ +/* $OpenBSD: if_bm.c,v 1.7 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: if_bm.c,v 1.1 1999/01/01 01:27:52 tsubai Exp $ */ /*- @@ -100,39 +100,39 @@ struct bmac_softc { extern u_int *heathrow_FCR; -static __inline int bmac_read_reg __P((struct bmac_softc *, int)); -static __inline void bmac_write_reg __P((struct bmac_softc *, int, int)); -static __inline void bmac_set_bits __P((struct bmac_softc *, int, int)); -static __inline void bmac_reset_bits __P((struct bmac_softc *, int, int)); - -static int bmac_match __P((struct device *, void *, void *)); -static void bmac_attach __P((struct device *, struct device *, void *)); -static void bmac_reset_chip __P((struct bmac_softc *)); -static void bmac_init __P((struct bmac_softc *)); -static void bmac_init_dma __P((struct bmac_softc *)); -static int bmac_intr __P((void *)); +static __inline int bmac_read_reg(struct bmac_softc *, int); +static __inline void bmac_write_reg(struct bmac_softc *, int, int); +static __inline void bmac_set_bits(struct bmac_softc *, int, int); +static __inline void bmac_reset_bits(struct bmac_softc *, int, int); + +static int bmac_match(struct device *, void *, void *); +static void bmac_attach(struct device *, struct device *, void *); +static void bmac_reset_chip(struct bmac_softc *); +static void bmac_init(struct bmac_softc *); +static void bmac_init_dma(struct bmac_softc *); +static int bmac_intr(void *); #ifdef WHY_IS_THIS_XXXX -static int bmac_tx_intr __P((void *)); +static int bmac_tx_intr(void *); #endif /* WHY_IS_THIS_XXXX */ -static int bmac_rint __P((void *)); -static void bmac_reset __P((struct bmac_softc *)); -static void bmac_stop __P((struct bmac_softc *)); -static void bmac_start __P((struct ifnet *)); -static void bmac_transmit_packet __P((struct bmac_softc *, void *, int)); -static int bmac_put __P((struct bmac_softc *, caddr_t, struct mbuf *)); -static struct mbuf *bmac_get __P((struct bmac_softc *, caddr_t, int)); -static void bmac_watchdog __P((struct ifnet *)); -static int bmac_ioctl __P((struct ifnet *, u_long, caddr_t)); -static int bmac_mediachange __P((struct ifnet *)); -static void bmac_mediastatus __P((struct ifnet *, struct ifmediareq *)); -static void bmac_setladrf __P((struct bmac_softc *)); - -int bmac_mii_readreg __P((struct device *, int, int)); -void bmac_mii_writereg __P((struct device *, int, int, int)); -void bmac_mii_statchg __P((struct device *)); -void bmac_mii_tick __P((void *)); -u_int32_t bmac_mbo_read __P((struct device *)); -void bmac_mbo_write __P((struct device *, u_int32_t)); +static int bmac_rint(void *); +static void bmac_reset(struct bmac_softc *); +static void bmac_stop(struct bmac_softc *); +static void bmac_start(struct ifnet *); +static void bmac_transmit_packet(struct bmac_softc *, void *, int); +static int bmac_put(struct bmac_softc *, caddr_t, struct mbuf *); +static struct mbuf *bmac_get(struct bmac_softc *, caddr_t, int); +static void bmac_watchdog(struct ifnet *); +static int bmac_ioctl(struct ifnet *, u_long, caddr_t); +static int bmac_mediachange(struct ifnet *); +static void bmac_mediastatus(struct ifnet *, struct ifmediareq *); +static void bmac_setladrf(struct bmac_softc *); + +int bmac_mii_readreg(struct device *, int, int); +void bmac_mii_writereg(struct device *, int, int, int); +void bmac_mii_statchg(struct device *); +void bmac_mii_tick(void *); +u_int32_t bmac_mbo_read(struct device *); +void bmac_mbo_write(struct device *, u_int32_t); struct cfattach bm_ca = { sizeof(struct bmac_softc), bmac_match, bmac_attach diff --git a/sys/arch/macppc/dev/if_gm.c b/sys/arch/macppc/dev/if_gm.c index 655509c56b0..437a558e1d1 100644 --- a/sys/arch/macppc/dev/if_gm.c +++ b/sys/arch/macppc/dev/if_gm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gm.c,v 1.5 2002/03/12 09:51:20 kjc Exp $ */ +/* $OpenBSD: if_gm.c,v 1.6 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: if_gm.c,v 1.14 2001/07/22 11:29:46 wiz Exp $ */ /*- @@ -104,40 +104,40 @@ struct gmac_softc { }; -int gmac_match __P((struct device *, void *, void *)); -void gmac_attach __P((struct device *, struct device *, void *)); - -static __inline u_int gmac_read_reg __P((struct gmac_softc *, int)); -static __inline void gmac_write_reg __P((struct gmac_softc *, int, u_int)); - -static __inline void gmac_start_txdma __P((struct gmac_softc *)); -static __inline void gmac_start_rxdma __P((struct gmac_softc *)); -static __inline void gmac_stop_txdma __P((struct gmac_softc *)); -static __inline void gmac_stop_rxdma __P((struct gmac_softc *)); - -int gmac_intr __P((void *)); -void gmac_tint __P((struct gmac_softc *)); -void gmac_rint __P((struct gmac_softc *)); -struct mbuf * gmac_get __P((struct gmac_softc *, caddr_t, int)); -void gmac_start __P((struct ifnet *)); -int gmac_put __P((struct gmac_softc *, caddr_t, struct mbuf *)); - -void gmac_stop __P((struct gmac_softc *)); -void gmac_reset __P((struct gmac_softc *)); -void gmac_init __P((struct gmac_softc *)); -void gmac_init_mac __P((struct gmac_softc *)); -void gmac_setladrf __P((struct gmac_softc *)); - -int gmac_ioctl __P((struct ifnet *, u_long, caddr_t)); -void gmac_watchdog __P((struct ifnet *)); -void gmac_enable_hack __P((void)); - -int gmac_mediachange __P((struct ifnet *)); -void gmac_mediastatus __P((struct ifnet *, struct ifmediareq *)); -int gmac_mii_readreg __P((struct device *, int, int)); -void gmac_mii_writereg __P((struct device *, int, int, int)); -void gmac_mii_statchg __P((struct device *)); -void gmac_mii_tick __P((void *)); +int gmac_match(struct device *, void *, void *); +void gmac_attach(struct device *, struct device *, void *); + +static __inline u_int gmac_read_reg(struct gmac_softc *, int); +static __inline void gmac_write_reg(struct gmac_softc *, int, u_int); + +static __inline void gmac_start_txdma(struct gmac_softc *); +static __inline void gmac_start_rxdma(struct gmac_softc *); +static __inline void gmac_stop_txdma(struct gmac_softc *); +static __inline void gmac_stop_rxdma(struct gmac_softc *); + +int gmac_intr(void *); +void gmac_tint(struct gmac_softc *); +void gmac_rint(struct gmac_softc *); +struct mbuf * gmac_get(struct gmac_softc *, caddr_t, int); +void gmac_start(struct ifnet *); +int gmac_put(struct gmac_softc *, caddr_t, struct mbuf *); + +void gmac_stop(struct gmac_softc *); +void gmac_reset(struct gmac_softc *); +void gmac_init(struct gmac_softc *); +void gmac_init_mac(struct gmac_softc *); +void gmac_setladrf(struct gmac_softc *); + +int gmac_ioctl(struct ifnet *, u_long, caddr_t); +void gmac_watchdog(struct ifnet *); +void gmac_enable_hack(void); + +int gmac_mediachange(struct ifnet *); +void gmac_mediastatus(struct ifnet *, struct ifmediareq *); +int gmac_mii_readreg(struct device *, int, int); +void gmac_mii_writereg(struct device *, int, int, int); +void gmac_mii_statchg(struct device *); +void gmac_mii_tick(void *); u_int32_t ether_crc32_le(const u_int8_t *buf, size_t len); diff --git a/sys/arch/macppc/dev/if_wi_obio.c b/sys/arch/macppc/dev/if_wi_obio.c index bbf516c25d4..f1a71aabe67 100644 --- a/sys/arch/macppc/dev/if_wi_obio.c +++ b/sys/arch/macppc/dev/if_wi_obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_obio.c,v 1.3 2001/09/19 20:18:57 miod Exp $ */ +/* $OpenBSD: if_wi_obio.c,v 1.4 2002/03/14 01:26:36 millert Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -69,19 +69,19 @@ #include <dev/ic/if_wi_ieee.h> #include <dev/ic/if_wivar.h> -int wi_obio_match __P((struct device *, void *, void *)); -void wi_obio_attach __P((struct device *, struct device *, void *)); -int wi_obio_detach __P((struct device *, int)); -int wi_obio_activate __P((struct device *, enum devact)); -void wi_obio_attach __P((struct device *, struct device *, void *)); +int wi_obio_match(struct device *, void *, void *); +void wi_obio_attach(struct device *, struct device *, void *); +int wi_obio_detach(struct device *, int); +int wi_obio_activate(struct device *, enum devact); +void wi_obio_attach(struct device *, struct device *, void *); int wi_obio_enable(struct wi_softc *sc); void wi_obio_disable(struct wi_softc *sc); -int wi_intr __P((void *)); -int wi_attach __P((struct wi_softc *)); -void wi_init __P((void *)); -void wi_stop __P((struct wi_softc *)); +int wi_intr(void *); +int wi_attach(struct wi_softc *); +void wi_init(void *); +void wi_stop(struct wi_softc *); struct wi_obio_softc { struct wi_softc sc_wi; diff --git a/sys/arch/macppc/dev/macintr.c b/sys/arch/macppc/dev/macintr.c index 76daa1ecdf8..7175a8b85bd 100644 --- a/sys/arch/macppc/dev/macintr.c +++ b/sys/arch/macppc/dev/macintr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macintr.c,v 1.12 2002/03/08 20:33:43 drahn Exp $ */ +/* $OpenBSD: macintr.c,v 1.13 2002/03/14 01:26:36 millert Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -69,14 +69,14 @@ int m_virq_max = 0; struct evcnt evirq[ICU_LEN*2]; -static int fakeintr __P((void *)); -static char *intr_typename __P((int type)); -static void intr_calculatemasks __P((void)); -static void enable_irq __P((int x)); -static __inline int cntlzw __P((int x)); -static int mapirq __P((int irq)); -static int read_irq __P((void)); -static void mac_intr_do_pending_int __P((void)); +static int fakeintr(void *); +static char *intr_typename(int type); +static void intr_calculatemasks(void); +static void enable_irq(int x); +static __inline int cntlzw(int x); +static int mapirq(int irq); +static int read_irq(void); +static void mac_intr_do_pending_int(void); extern u_int32_t *heathrow_FCR; @@ -96,10 +96,10 @@ struct macintr_softc { struct device sc_dev; }; -int macintr_match __P((struct device *parent, void *cf, void *aux)); -void macintr_attach __P((struct device *, struct device *, void *)); -void mac_do_pending_int __P((void)); -void mac_ext_intr __P((void)); +int macintr_match(struct device *parent, void *cf, void *aux); +void macintr_attach(struct device *, struct device *, void *); +void mac_do_pending_int(void); +void mac_ext_intr(void); struct cfattach macintr_ca = { sizeof(struct macintr_softc), @@ -150,7 +150,7 @@ intr_establish_t macintr_establish; intr_disestablish_t macintr_disestablish; extern intr_establish_t *mac_intr_establish_func; extern intr_disestablish_t *mac_intr_disestablish_func; -void macintr_collect_preconf_intr __P((void)); +void macintr_collect_preconf_intr(void); void macintr_attach(parent, self, aux) @@ -237,7 +237,7 @@ macintr_establish(lcv, irq, type, level, ih_fun, ih_arg, name) int irq; int type; int level; - int (*ih_fun) __P((void *)); + int (*ih_fun)(void *); void *ih_arg; char *name; { diff --git a/sys/arch/macppc/dev/mesh.c b/sys/arch/macppc/dev/mesh.c index f846159524a..d49c29503b2 100644 --- a/sys/arch/macppc/dev/mesh.c +++ b/sys/arch/macppc/dev/mesh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mesh.c,v 1.3 2001/11/06 19:53:15 miod Exp $ */ +/* $OpenBSD: mesh.c,v 1.4 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: mesh.c,v 1.1 1999/02/19 13:06:03 tsubai Exp $ */ /*- @@ -142,35 +142,35 @@ struct mesh_softc { #define scsipi_done scsi_done #endif -static __inline int mesh_read_reg __P((struct mesh_softc *, int)); -static __inline void mesh_set_reg __P((struct mesh_softc *, int, int)); - -int mesh_match __P((struct device *, struct cfdata *, void *)); -void mesh_attach __P((struct device *, struct device *, void *)); -void mesh_shutdownhook __P((void *)); -int mesh_intr __P((void *)); -void mesh_error __P((struct mesh_softc *, struct mesh_scb *, int, int)); -void mesh_select __P((struct mesh_softc *, struct mesh_scb *)); -void mesh_identify __P((struct mesh_softc *, struct mesh_scb *)); -void mesh_command __P((struct mesh_softc *, struct mesh_scb *)); -int mesh_dma_setup __P((struct mesh_softc *, struct mesh_scb *)); -int mesh_dataio __P((struct mesh_softc *, struct mesh_scb *)); -void mesh_status __P((struct mesh_softc *, struct mesh_scb *)); -void mesh_msgin __P((struct mesh_softc *, struct mesh_scb *)); -void mesh_msgout __P((struct mesh_softc *, int)); -void mesh_bus_reset __P((struct mesh_softc *)); -void mesh_reset __P((struct mesh_softc *)); -int mesh_stp __P((struct mesh_softc *, int)); -void mesh_setsync __P((struct mesh_softc *, struct mesh_tinfo *)); -struct mesh_scb *mesh_get_scb __P((struct mesh_softc *)); -void mesh_free_scb __P((struct mesh_softc *, struct mesh_scb *)); -int mesh_scsi_cmd __P((struct scsi_xfer *)); -void mesh_sched __P((struct mesh_softc *)); -int mesh_poll __P((struct mesh_softc *, struct scsi_xfer *)); -void mesh_done __P((struct mesh_softc *, struct mesh_scb *)); -void mesh_timeout __P((void *)); -void mesh_sense __P((struct mesh_softc *, struct mesh_scb *)); -void mesh_minphys __P((struct buf *)); +static __inline int mesh_read_reg(struct mesh_softc *, int); +static __inline void mesh_set_reg(struct mesh_softc *, int, int); + +int mesh_match(struct device *, struct cfdata *, void *); +void mesh_attach(struct device *, struct device *, void *); +void mesh_shutdownhook(void *); +int mesh_intr(void *); +void mesh_error(struct mesh_softc *, struct mesh_scb *, int, int); +void mesh_select(struct mesh_softc *, struct mesh_scb *); +void mesh_identify(struct mesh_softc *, struct mesh_scb *); +void mesh_command(struct mesh_softc *, struct mesh_scb *); +int mesh_dma_setup(struct mesh_softc *, struct mesh_scb *); +int mesh_dataio(struct mesh_softc *, struct mesh_scb *); +void mesh_status(struct mesh_softc *, struct mesh_scb *); +void mesh_msgin(struct mesh_softc *, struct mesh_scb *); +void mesh_msgout(struct mesh_softc *, int); +void mesh_bus_reset(struct mesh_softc *); +void mesh_reset(struct mesh_softc *); +int mesh_stp(struct mesh_softc *, int); +void mesh_setsync(struct mesh_softc *, struct mesh_tinfo *); +struct mesh_scb *mesh_get_scb(struct mesh_softc *); +void mesh_free_scb(struct mesh_softc *, struct mesh_scb *); +int mesh_scsi_cmd(struct scsi_xfer *); +void mesh_sched(struct mesh_softc *); +int mesh_poll(struct mesh_softc *, struct scsi_xfer *); +void mesh_done(struct mesh_softc *, struct mesh_scb *); +void mesh_timeout(void *); +void mesh_sense(struct mesh_softc *, struct mesh_scb *); +void mesh_minphys(struct buf *); #define MESH_DATAOUT 0 diff --git a/sys/arch/macppc/dev/openpic.c b/sys/arch/macppc/dev/openpic.c index 38e226a6a0b..fff9bda75c1 100644 --- a/sys/arch/macppc/dev/openpic.c +++ b/sys/arch/macppc/dev/openpic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: openpic.c,v 1.14 2002/03/08 20:33:43 drahn Exp $ */ +/* $OpenBSD: openpic.c,v 1.15 2002/03/14 01:26:36 millert Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -69,35 +69,35 @@ int o_virq_max; struct evcnt evirq[ICU_LEN]; -static int fakeintr __P((void *)); -static char *intr_typename __P((int type)); -static void intr_calculatemasks __P((void)); -static __inline int cntlzw __P((int x)); -static int mapirq __P((int irq)); -int openpic_prog_button __P((void *arg)); -void openpic_enable_irq_mask __P((int irq_mask)); +static int fakeintr(void *); +static char *intr_typename(int type); +static void intr_calculatemasks(void); +static __inline int cntlzw(int x); +static int mapirq(int irq); +int openpic_prog_button(void *arg); +void openpic_enable_irq_mask(int irq_mask); #define HWIRQ_MAX 27 #define HWIRQ_MASK 0x0fffffff -static __inline u_int openpic_read __P((int)); -static __inline void openpic_write __P((int, u_int)); -void openpic_enable_irq __P((int, int)); -void openpic_disable_irq __P((int)); -void openpic_init __P((void)); -void openpic_set_priority __P((int, int)); -static __inline int openpic_read_irq __P((int)); -static __inline void openpic_eoi __P((int)); +static __inline u_int openpic_read(int); +static __inline void openpic_write(int, u_int); +void openpic_enable_irq(int, int); +void openpic_disable_irq(int); +void openpic_init(void); +void openpic_set_priority(int, int); +static __inline int openpic_read_irq(int); +static __inline void openpic_eoi(int); struct openpic_softc { struct device sc_dev; }; -int openpic_match __P((struct device *parent, void *cf, void *aux)); -void openpic_attach __P((struct device *, struct device *, void *)); -void openpic_do_pending_int __P((void)); -void openpic_collect_preconf_intr __P((void)); -void ext_intr_openpic __P((void)); +int openpic_match(struct device *parent, void *cf, void *aux); +void openpic_attach(struct device *, struct device *, void *); +void openpic_do_pending_int(void); +void openpic_collect_preconf_intr(void); +void ext_intr_openpic(void); struct cfattach openpic_ca = { sizeof(struct openpic_softc), @@ -134,9 +134,9 @@ extern void_f *pending_int_f; vaddr_t openpic_base; void * openpic_intr_establish( void * lcv, int irq, int type, int level, - int (*ih_fun) __P((void *)), void *ih_arg, char *name); + int (*ih_fun)(void *), void *ih_arg, char *name); void openpic_intr_disestablish( void *lcp, void *arg); -void openpic_collect_preconf_intr __P((void)); +void openpic_collect_preconf_intr(void); void openpic_attach(parent, self, aux) @@ -214,7 +214,7 @@ openpic_intr_establish(lcv, irq, type, level, ih_fun, ih_arg, name) int irq; int type; int level; - int (*ih_fun) __P((void *)); + int (*ih_fun)(void *); void *ih_arg; char *name; { diff --git a/sys/arch/macppc/dev/pm_direct.c b/sys/arch/macppc/dev/pm_direct.c index 45612b48cb9..58c22669d34 100644 --- a/sys/arch/macppc/dev/pm_direct.c +++ b/sys/arch/macppc/dev/pm_direct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pm_direct.c,v 1.4 2001/10/03 14:45:37 drahn Exp $ */ +/* $OpenBSD: pm_direct.c,v 1.5 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: pm_direct.c,v 1.9 2000/06/08 22:10:46 tsubai Exp $ */ /* @@ -168,37 +168,37 @@ signed char pm_receive_cmd_type[] = { /* for debugging */ #ifdef ADB_DEBUG -void pm_printerr __P((char *, int, int, char *)); +void pm_printerr(char *, int, int, char *); #endif -int pm_wait_busy __P((int)); -int pm_wait_free __P((int)); +int pm_wait_busy(int); +int pm_wait_free(int); /* these functions are for the PB1XX series */ -int pm_receive_pm1 __P((u_char *)); -int pm_send_pm1 __P((u_char,int)); -int pm_pmgrop_pm1 __P((PMData *)); -void pm_intr_pm1 __P((void)); +int pm_receive_pm1(u_char *); +int pm_send_pm1(u_char,int); +int pm_pmgrop_pm1(PMData *); +void pm_intr_pm1(void); /* these functions are for the PB Duo series and the PB 5XX series */ -int pm_receive_pm2 __P((u_char *)); -int pm_send_pm2 __P((u_char)); -int pm_pmgrop_pm2 __P((PMData *)); -void pm_intr_pm2 __P((void)); +int pm_receive_pm2(u_char *); +int pm_send_pm2(u_char); +int pm_pmgrop_pm2(PMData *); +void pm_intr_pm2(void); /* this function is MRG-Based (for testing) */ -int pm_pmgrop_mrg __P((PMData *)); +int pm_pmgrop_mrg(PMData *); /* these functions are called from adb_direct.c */ -void pm_setup_adb __P((void)); -void pm_check_adb_devices __P((int)); -void pm_intr __P((void)); -int pm_adb_op __P((u_char *, void *, void *, int)); +void pm_setup_adb(void); +void pm_check_adb_devices(int); +void pm_intr(void); +int pm_adb_op(u_char *, void *, void *, int); /* these functions also use the variables of adb_direct.c */ -void pm_adb_get_TALK_result __P((PMData *)); -void pm_adb_get_ADB_data __P((PMData *)); -void pm_adb_poll_next_device_pm1 __P((PMData *)); +void pm_adb_get_TALK_result(PMData *); +void pm_adb_get_ADB_data(PMData *); +void pm_adb_poll_next_device_pm1(PMData *); /* @@ -223,13 +223,13 @@ struct adbCommand { u_int unsol; /* 1 if packet was unsolicited */ u_int ack_only; /* 1 for no special processing */ }; -extern void adb_pass_up __P((struct adbCommand *)); +extern void adb_pass_up(struct adbCommand *); #if 0 /* * Define the external functions */ -extern int zshard __P((int)); /* from zs.c */ +extern int zshard(int); /* from zs.c */ #endif #ifdef ADB_DEBUG diff --git a/sys/arch/macppc/dev/pm_direct.h b/sys/arch/macppc/dev/pm_direct.h index b77edff5300..c43745ca5d6 100644 --- a/sys/arch/macppc/dev/pm_direct.h +++ b/sys/arch/macppc/dev/pm_direct.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pm_direct.h,v 1.2 2001/10/03 14:45:37 drahn Exp $ */ +/* $OpenBSD: pm_direct.h,v 1.3 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: pm_direct.h,v 1.5 1999/07/12 15:54:55 tsubai Exp $ */ /* @@ -47,11 +47,11 @@ typedef struct { char data[32]; /* data buffer (is it too much?) */ } PMData; -int pmgrop __P((PMData *)); -void pm_adb_restart __P((void)); -void pm_adb_poweroff __P((void)); -void pm_read_date_time __P((u_long *)); -void pm_set_date_time __P((u_long)); +int pmgrop(PMData *); +void pm_adb_restart(void); +void pm_adb_poweroff(void); +void pm_read_date_time(u_long *); +void pm_set_date_time(u_long); struct pmu_battery_info { @@ -62,14 +62,14 @@ struct pmu_battery_info unsigned int voltage; }; -int pm_battery_info __P((int, struct pmu_battery_info *)); +int pm_battery_info(int, struct pmu_battery_info *); -int pm_read_nvram __P((int)); -void pm_write_nvram __P((int, int)); -int pm_read_brightness __P((void)); -void pm_set_brightness __P((int)); -void pm_init_brightness __P((void)); -void pm_eject_pcmcia __P((int)); +int pm_read_nvram(int); +void pm_write_nvram(int, int); +int pm_read_brightness(void); +void pm_set_brightness(int); +void pm_init_brightness(void); +void pm_eject_pcmcia(int); /* PMU commands */ #define PMU_POWER_OFF 0x7e /* Turn Power off */ diff --git a/sys/arch/macppc/dev/uni_n.c b/sys/arch/macppc/dev/uni_n.c index 5802866ec4f..8c8d8fd6022 100644 --- a/sys/arch/macppc/dev/uni_n.c +++ b/sys/arch/macppc/dev/uni_n.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uni_n.c,v 1.2 2001/12/07 00:49:06 miod Exp $ */ +/* $OpenBSD: uni_n.c,v 1.3 2002/03/14 01:26:36 millert Exp $ */ /* * Copyright (c) 1998-2001 Dale Rahn. All rights reserved. @@ -39,8 +39,8 @@ #include <dev/ofw/openfirm.h> -static int memcmatch __P((struct device *, void *, void *)); -static void memcattach __P((struct device *, struct device *, void *)); +static int memcmatch(struct device *, void *, void *); +static void memcattach(struct device *, struct device *, void *); struct memc_softc { struct device sc_dev; diff --git a/sys/arch/macppc/dev/viareg.h b/sys/arch/macppc/dev/viareg.h index c034f7fb990..43bd20ccbac 100644 --- a/sys/arch/macppc/dev/viareg.h +++ b/sys/arch/macppc/dev/viareg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: viareg.h,v 1.1 2001/09/01 15:50:00 drahn Exp $ */ +/* $OpenBSD: viareg.h,v 1.2 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: viareg.h,v 1.2 1998/10/20 14:56:30 tsubai Exp $ */ /*- @@ -231,14 +231,14 @@ write_via_reg(int ign, int reg, int val) #define vDirA_ADBState 0x30 -void via_init __P((void)); -int rbv_vidstatus __P((void)); -void via_shutdown __P((void)); -void via_set_modem __P((int)); -int add_nubus_intr __P((int, void (*) __P((void *, int)), void *)); -void enable_nubus_intr __P((void)); +void via_init(void); +int rbv_vidstatus(void); +void via_shutdown(void); +void via_set_modem(int); +int add_nubus_intr __P((int, void (*)(void *, int), void *)); +void enable_nubus_intr(void); void via1_register_irq __P((int, void (*)(void *), void *)); void via2_register_irq __P((int, void (*)(void *), void *)); -extern void (*via1itab[7]) __P((void *)); -extern void (*via2itab[7]) __P((void *)); +extern void (*via1itab[7])(void *); +extern void (*via2itab[7])(void *); diff --git a/sys/arch/macppc/dev/wdc_obio.c b/sys/arch/macppc/dev/wdc_obio.c index 7fa3316321f..c1b046b63ae 100644 --- a/sys/arch/macppc/dev/wdc_obio.c +++ b/sys/arch/macppc/dev/wdc_obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc_obio.c,v 1.4 2001/11/06 19:53:15 miod Exp $ */ +/* $OpenBSD: wdc_obio.c,v 1.5 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: wdc_obio.c,v 1.15 2001/07/25 20:26:33 bouyer Exp $ */ /*- @@ -75,16 +75,16 @@ struct wdc_obio_softc { dbdma_t sc_dbdma; }; -u_int8_t wdc_obio_read_reg __P((struct channel_softc *, enum wdc_regs)); -void wdc_obio_write_reg __P((struct channel_softc *, enum wdc_regs, u_int8_t)); -void wdc_default_read_raw_multi_2 __P((struct channel_softc *, - void *, unsigned int)); -void wdc_default_write_raw_multi_2 __P((struct channel_softc *, - void *, unsigned int)); -void wdc_default_read_raw_multi_4 __P((struct channel_softc *, - void *, unsigned int)); -void wdc_default_write_raw_multi_4 __P((struct channel_softc *, - void *, unsigned int)); +u_int8_t wdc_obio_read_reg(struct channel_softc *, enum wdc_regs); +void wdc_obio_write_reg(struct channel_softc *, enum wdc_regs, u_int8_t); +void wdc_default_read_raw_multi_2(struct channel_softc *, + void *, unsigned int); +void wdc_default_write_raw_multi_2(struct channel_softc *, + void *, unsigned int); +void wdc_default_read_raw_multi_4(struct channel_softc *, + void *, unsigned int); +void wdc_default_write_raw_multi_4(struct channel_softc *, + void *, unsigned int); struct channel_softc_vtbl wdc_obio_vtbl = { wdc_obio_read_reg, wdc_obio_write_reg, @@ -94,18 +94,18 @@ struct channel_softc_vtbl wdc_obio_vtbl = { wdc_default_write_raw_multi_4 }; -int wdc_obio_probe __P((struct device *, void *, void *)); -void wdc_obio_attach __P((struct device *, struct device *, void *)); +int wdc_obio_probe(struct device *, void *, void *); +void wdc_obio_attach(struct device *, struct device *, void *); struct cfattach wdc_obio_ca = { sizeof(struct wdc_obio_softc), wdc_obio_probe, wdc_obio_attach }; -int wdc_obio_dma_init __P((void *, int, int, void *, size_t, int)); -void wdc_obio_dma_start __P((void *, int, int)); -int wdc_obio_dma_finish __P((void *, int, int)); -void wdc_obio_adjust_timing __P((struct channel_softc *)); -void wdc_obio_ata4_adjust_timing __P((struct channel_softc *)); +int wdc_obio_dma_init(void *, int, int, void *, size_t, int); +void wdc_obio_dma_start(void *, int, int); +int wdc_obio_dma_finish(void *, int, int); +void wdc_obio_adjust_timing(struct channel_softc *); +void wdc_obio_ata4_adjust_timing(struct channel_softc *); int wdc_obio_probe(parent, match, aux) diff --git a/sys/arch/macppc/dev/zs.c b/sys/arch/macppc/dev/zs.c index 1d2ba22505e..4d7cfebdee6 100644 --- a/sys/arch/macppc/dev/zs.c +++ b/sys/arch/macppc/dev/zs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zs.c,v 1.5 2002/02/25 16:15:04 drahn Exp $ */ +/* $OpenBSD: zs.c,v 1.6 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: zs.c,v 1.17 2001/06/19 13:42:15 wiz Exp $ */ /* @@ -128,7 +128,7 @@ int zs_cons_canabort = 0; /* device to which the console is attached--if serial. */ /* Mac stuff */ -static int zs_get_speed __P((struct zs_chanstate *)); +static int zs_get_speed(struct zs_chanstate *); /* * Even though zsparam will set up the clock multiples, etc., we @@ -165,9 +165,9 @@ struct cfdriver zsc_cd = { }; /* Definition of the driver for autoconfig. */ -int zsc_match __P((struct device *, void *, void *)); -void zsc_attach __P((struct device *, struct device *, void *)); -int zsc_print __P((void *, const char *name)); +int zsc_match(struct device *, void *, void *); +void zsc_attach(struct device *, struct device *, void *); +int zsc_print(void *, const char *name); struct cfattach zsc_ca = { sizeof(struct zsc_softc), zsc_match, zsc_attach @@ -175,17 +175,17 @@ struct cfattach zsc_ca = { extern struct cfdriver zsc_cd; -int zshard __P((void *)); -int zssoft __P((void *)); +int zshard(void *); +int zssoft(void *); #ifdef ZS_TXDMA -static int zs_txdma_int __P((void *)); +static int zs_txdma_int(void *); #endif -void zscnprobe __P((struct consdev *)); -void zscninit __P((struct consdev *)); -int zscngetc __P((dev_t)); -void zscnputc __P((dev_t, int)); -void zscnpollc __P((dev_t, int)); +void zscnprobe(struct consdev *); +void zscninit(struct consdev *); +int zscngetc(dev_t); +void zscnputc(dev_t, int); +void zscnpollc(dev_t, int); /* * Is the zs chip present? @@ -638,9 +638,9 @@ void zs_write_data(cs, val) #define zscnpollc nullcnpollc cons_decl(zs); -static void zs_putc __P((register volatile struct zschan *, int)); -static int zs_getc __P((register volatile struct zschan *)); -extern int zsopen __P(( dev_t dev, int flags, int mode, struct proc *p)); +static void zs_putc(register volatile struct zschan *, int); +static int zs_getc(register volatile struct zschan *); +extern int zsopen( dev_t dev, int flags, int mode, struct proc *p); static int stdin, stdout; @@ -753,8 +753,8 @@ zscnputc(dev, c) } } -extern int ofccngetc __P((dev_t)); -extern void ofccnputc __P((dev_t, int)); +extern int ofccngetc(dev_t); +extern void ofccnputc(dev_t, int); struct consdev consdev_zs = { zscnprobe, diff --git a/sys/arch/macppc/include/adbsys.h b/sys/arch/macppc/include/adbsys.h index 4457e598a7a..0daa86b47dc 100644 --- a/sys/arch/macppc/include/adbsys.h +++ b/sys/arch/macppc/include/adbsys.h @@ -1,4 +1,4 @@ -/* $OpenBSD: adbsys.h,v 1.2 2001/10/03 14:45:37 drahn Exp $ */ +/* $OpenBSD: adbsys.h,v 1.3 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: adbsys.h,v 1.4 2000/12/19 02:59:24 tsubai Exp $ */ /*- @@ -171,14 +171,14 @@ typedef struct adb_listencmd_s{ } adb_listencmd_t; #define ADBIOCLISTENCMD _IOW('A', 133, adb_listencmd_t) -void adb_init __P((void)); +void adb_init(void); #ifdef _KERNEL -int adb_poweroff __P((void)); -void adb_restart __P((void)); -int CountADBs __P((void)); -void ADBReInit __P((void)); -int adb_read_date_time __P((unsigned long *)); +int adb_poweroff(void); +void adb_restart(void); +int CountADBs(void); +void ADBReInit(void); +int adb_read_date_time(unsigned long *); #endif #endif /* _ADBSYS_MACHINE_ */ diff --git a/sys/arch/macppc/include/autoconf.h b/sys/arch/macppc/include/autoconf.h index f989d8707c6..137191816bb 100644 --- a/sys/arch/macppc/include/autoconf.h +++ b/sys/arch/macppc/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.2 2001/09/15 01:42:55 mickey Exp $ */ +/* $OpenBSD: autoconf.h,v 1.3 2002/03/14 01:26:36 millert Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -53,17 +53,14 @@ extern int system_type; /**/ struct confargs; -typedef int (*intr_handler_t) __P((void *)); +typedef int (*intr_handler_t)(void *); typedef struct bushook { struct device *bh_dv; int bh_type; - void (*bh_intr_establish) - __P((struct confargs *, intr_handler_t, void *)); - void (*bh_intr_disestablish) - __P((struct confargs *)); - int (*bh_matchname) - __P((struct confargs *, char *)); + void (*bh_intr_establish)(struct confargs *, intr_handler_t, void *); + void (*bh_intr_disestablish)(struct confargs *); + int (*bh_matchname)(struct confargs *, char *); } bushook_t; #define BUS_MAIN 1 /* mainbus */ @@ -98,14 +95,14 @@ struct confargs { void set_clockintr __P((void (*)(struct clockframe *))); void set_iointr __P((void (*)(void *, int))); -int badaddr __P((void *, u_int32_t)); +int badaddr(void *, u_int32_t); void calc_delayconst(void); void ofrootfound(void); typedef int mac_intr_handle_t; typedef void *(intr_establish_t) __P((void *, mac_intr_handle_t, int, int, int (*func)(void *), void *, char *)); -typedef void (intr_disestablish_t) __P((void *, void *)); +typedef void (intr_disestablish_t)(void *, void *); intr_establish_t mac_intr_establish; intr_disestablish_t mac_intr_disestablish; diff --git a/sys/arch/macppc/include/bus.h b/sys/arch/macppc/include/bus.h index c377b90e679..757d8bb0a90 100644 --- a/sys/arch/macppc/include/bus.h +++ b/sys/arch/macppc/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.4 2002/03/07 18:08:08 jason Exp $ */ +/* $OpenBSD: bus.h,v 1.5 2002/03/14 01:26:36 millert Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom. All rights reserved. @@ -64,18 +64,18 @@ extern struct ppc_bus_space ppc_isa_io, ppc_isa_mem; /* * Access methods for bus resources */ -int bus_space_map __P((bus_space_tag_t t, bus_addr_t addr, - bus_size_t size, int cacheable, bus_space_handle_t *bshp)); -void bus_space_unmap __P((bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t size)); -int bus_space_subregion __P((bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp)); -int bus_space_alloc __P((bus_space_tag_t tag, bus_addr_t rstart, +int bus_space_map(bus_space_tag_t t, bus_addr_t addr, + bus_size_t size, int cacheable, bus_space_handle_t *bshp); +void bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, + bus_size_t size); +int bus_space_subregion(bus_space_tag_t t, bus_space_handle_t bsh, + bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp); +int bus_space_alloc(bus_space_tag_t tag, bus_addr_t rstart, bus_addr_t rend, bus_size_t size, bus_size_t alignment, bus_size_t boundary, int cacheable, bus_addr_t *addrp, - bus_space_handle_t *handlep)); -void bus_space_free __P((bus_space_tag_t tag, bus_space_handle_t handle, - bus_size_t size)); + bus_space_handle_t *handlep); +void bus_space_free(bus_space_tag_t tag, bus_space_handle_t handle, + bus_size_t size); #define bus_space_read(n,m) \ static __inline CAT3(u_int,m,_t) \ @@ -145,9 +145,9 @@ bus_space_write_multi(4,32) #define bus_space_write_multi_8 !!! bus_space_write_multi_8 not implemented !!! /* - * void bus_space_read_region_N __P((bus_space_tag_t tag, + * void bus_space_read_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t *addr, size_t count)); + * u_intN_t *addr, size_t count); * * Read `count' 1, 2, 4, or 8 byte quantities from bus space * described by tag/handle and starting at `offset' and copy into @@ -196,9 +196,9 @@ bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, /* - * void bus_space_write_region_N __P((bus_space_tag_t tag, + * void bus_space_write_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * const u_intN_t *addr, size_t count)); + * const u_intN_t *addr, size_t count); * * Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided * to bus space described by tag/handle starting at `offset'. @@ -244,19 +244,19 @@ bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, #endif /* - * void bus_space_set_multi_N __P((bus_space_tag_t tag, + * void bus_space_set_multi_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, u_intN_t val, - * size_t count)); + * size_t count); * * Write the 1, 2, 4, or 8 byte value `val' to bus space described * by tag/handle/offset `count' times. */ -static __inline void bus_space_set_multi_1 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int8_t, size_t)); -static __inline void bus_space_set_multi_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int16_t, size_t)); -static __inline void bus_space_set_multi_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int32_t, size_t)); +static __inline void bus_space_set_multi_1(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int8_t, size_t); +static __inline void bus_space_set_multi_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int16_t, size_t); +static __inline void bus_space_set_multi_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int32_t, size_t); static __inline void bus_space_set_multi_1(tag, bsh, offset, val, count) @@ -333,35 +333,35 @@ bus_space_write_raw_multi_4(bus_space_tag_t bst, bus_space_handle_t bsh, !!! bus_space_write_raw_multi_8 not implemented !!! void -bus_space_set_region_1 __P((void *v, bus_space_handle_t h, bus_size_t o, - u_int8_t val, bus_size_t c)); +bus_space_set_region_1(void *v, bus_space_handle_t h, bus_size_t o, + u_int8_t val, bus_size_t c); void -bus_space_set_region_2 __P((void *v, bus_space_handle_t h, bus_size_t o, - u_int16_t val, bus_size_t c)); +bus_space_set_region_2(void *v, bus_space_handle_t h, bus_size_t o, + u_int16_t val, bus_size_t c); void -bus_space_set_region_4 __P((void *v, bus_space_handle_t h, bus_size_t o, - u_int32_t val, bus_size_t c)); +bus_space_set_region_4(void *v, bus_space_handle_t h, bus_size_t o, + u_int32_t val, bus_size_t c); #define bus_space_set_region_8 \ !!! bus_space_write_raw_multi_8 not implemented !!! void -bus_space_copy_1 __P((void *v, bus_space_handle_t h1, bus_space_handle_t h2, - bus_size_t o1, bus_size_t o2, bus_size_t c)); +bus_space_copy_1(void *v, bus_space_handle_t h1, bus_space_handle_t h2, + bus_size_t o1, bus_size_t o2, bus_size_t c); void -bus_space_copy_2 __P((void *v, bus_space_handle_t h1, bus_space_handle_t h2, - bus_size_t o1, bus_size_t o2, bus_size_t c)); +bus_space_copy_2(void *v, bus_space_handle_t h1, bus_space_handle_t h2, + bus_size_t o1, bus_size_t o2, bus_size_t c); void -bus_space_copy_4 __P((void *v, bus_space_handle_t h1, bus_space_handle_t h2, - bus_size_t o1, bus_size_t o2, bus_size_t c)); +bus_space_copy_4(void *v, bus_space_handle_t h1, bus_space_handle_t h2, + bus_size_t o1, bus_size_t o2, bus_size_t c); #define bus_space_copy_8 \ !!! bus_space_write_raw_multi_8 not implemented !!! /* * Bus read/write barrier methods. * - * void bus_space_barrier __P((bus_space_tag_t tag, + * void bus_space_barrier(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * bus_size_t len, int flags)); + * bus_size_t len, int flags); * * Note: powerpc does not currently implement barriers, but we must * provide the flags to MI code. @@ -430,32 +430,32 @@ struct powerpc_bus_dma_tag { /* * DMA mapping methods. */ - int (*_dmamap_create) __P((bus_dma_tag_t , bus_size_t, int, - bus_size_t, bus_size_t, int, bus_dmamap_t *)); - void (*_dmamap_destroy) __P((bus_dma_tag_t , bus_dmamap_t)); - int (*_dmamap_load) __P((bus_dma_tag_t , bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); - int (*_dmamap_load_mbuf) __P((bus_dma_tag_t , bus_dmamap_t, - struct mbuf *, int)); - int (*_dmamap_load_uio) __P((bus_dma_tag_t , bus_dmamap_t, - struct uio *, int)); - int (*_dmamap_load_raw) __P((bus_dma_tag_t , bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int)); - void (*_dmamap_unload) __P((bus_dma_tag_t , bus_dmamap_t)); - void (*_dmamap_sync) __P((bus_dma_tag_t , bus_dmamap_t, - bus_addr_t, bus_size_t, int)); + int (*_dmamap_create)(bus_dma_tag_t , bus_size_t, int, + bus_size_t, bus_size_t, int, bus_dmamap_t *); + void (*_dmamap_destroy)(bus_dma_tag_t , bus_dmamap_t); + int (*_dmamap_load)(bus_dma_tag_t , bus_dmamap_t, void *, + bus_size_t, struct proc *, int); + int (*_dmamap_load_mbuf)(bus_dma_tag_t , bus_dmamap_t, + struct mbuf *, int); + int (*_dmamap_load_uio)(bus_dma_tag_t , bus_dmamap_t, + struct uio *, int); + int (*_dmamap_load_raw)(bus_dma_tag_t , bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int); + void (*_dmamap_unload)(bus_dma_tag_t , bus_dmamap_t); + void (*_dmamap_sync)(bus_dma_tag_t , bus_dmamap_t, + bus_addr_t, bus_size_t, int); /* * DMA memory utility functions. */ - int (*_dmamem_alloc) __P((bus_dma_tag_t, bus_size_t, bus_size_t, - bus_size_t, bus_dma_segment_t *, int, int *, int)); - void (*_dmamem_free) __P((bus_dma_tag_t, bus_dma_segment_t *, int)); - int (*_dmamem_map) __P((bus_dma_tag_t, bus_dma_segment_t *, - int, size_t, caddr_t *, int)); - void (*_dmamem_unmap) __P((bus_dma_tag_t, caddr_t, size_t)); - paddr_t (*_dmamem_mmap) __P((bus_dma_tag_t, bus_dma_segment_t *, - int, off_t, int, int)); + int (*_dmamem_alloc)(bus_dma_tag_t, bus_size_t, bus_size_t, + bus_size_t, bus_dma_segment_t *, int, int *, int); + void (*_dmamem_free)(bus_dma_tag_t, bus_dma_segment_t *, int); + int (*_dmamem_map)(bus_dma_tag_t, bus_dma_segment_t *, + int, size_t, caddr_t *, int); + void (*_dmamem_unmap)(bus_dma_tag_t, caddr_t, size_t); + paddr_t (*_dmamem_mmap)(bus_dma_tag_t, bus_dma_segment_t *, + int, off_t, int, int); }; #define bus_dmamap_create(t, s, n, m, b, f, p) \ @@ -487,26 +487,26 @@ struct powerpc_bus_dma_tag { #define bus_dmamem_mmap(t, sg, n, o, p, f) \ (*(t)->_dmamem_mmap)((t)->_cookie, (sg), (n), (o), (p), (f)) -int _dmamap_create __P((bus_dma_tag_t, bus_size_t, int, - bus_size_t, bus_size_t, int, bus_dmamap_t *)); -void _dmamap_destroy __P((bus_dma_tag_t, bus_dmamap_t)); -int _dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); -int _dmamap_load_mbuf __P((bus_dma_tag_t, bus_dmamap_t, struct mbuf *, int)); -int _dmamap_load_uio __P((bus_dma_tag_t, bus_dmamap_t, struct uio *, int)); -int _dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int)); -void _dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t)); -void _dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t, bus_addr_t, bus_size_t, - int)); - -int _dmamem_alloc __P((bus_dma_tag_t, bus_size_t, bus_size_t, - bus_size_t, bus_dma_segment_t *, int, int *, int)); -void _dmamem_free __P((bus_dma_tag_t, bus_dma_segment_t *, int)); -int _dmamem_map __P((bus_dma_tag_t, bus_dma_segment_t *, - int, size_t, caddr_t *, int)); -void _dmamem_unmap __P((bus_dma_tag_t, caddr_t, size_t)); -paddr_t _dmamem_mmap __P((bus_dma_tag_t, bus_dma_segment_t *, int, off_t, int, int)); +int _dmamap_create(bus_dma_tag_t, bus_size_t, int, + bus_size_t, bus_size_t, int, bus_dmamap_t *); +void _dmamap_destroy(bus_dma_tag_t, bus_dmamap_t); +int _dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int); +int _dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t, struct mbuf *, int); +int _dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t, struct uio *, int); +int _dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int); +void _dmamap_unload(bus_dma_tag_t, bus_dmamap_t); +void _dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t, bus_size_t, + int); + +int _dmamem_alloc(bus_dma_tag_t, bus_size_t, bus_size_t, + bus_size_t, bus_dma_segment_t *, int, int *, int); +void _dmamem_free(bus_dma_tag_t, bus_dma_segment_t *, int); +int _dmamem_map(bus_dma_tag_t, bus_dma_segment_t *, + int, size_t, caddr_t *, int); +void _dmamem_unmap(bus_dma_tag_t, caddr_t, size_t); +paddr_t _dmamem_mmap(bus_dma_tag_t, bus_dma_segment_t *, int, off_t, int, int); /* * bus_dmamap_t diff --git a/sys/arch/macppc/include/db_machdep.h b/sys/arch/macppc/include/db_machdep.h index 1b1de590573..8729634e918 100644 --- a/sys/arch/macppc/include/db_machdep.h +++ b/sys/arch/macppc/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.2 2001/11/06 00:30:38 art Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.3 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: db_machdep.h,v 1.13 1996/04/29 20:50:08 leo Exp $ */ /* @@ -92,11 +92,11 @@ db_regs_t ddb_regs; /* register state */ #ifdef _KERNEL -void kdb_kintr __P((void *)); -int kdb_trap __P((int, void *)); +void kdb_kintr(void *); +int kdb_trap(int, void *); void db_save_regs(struct trapframe *frame); -void ddb_trap __P((void)); -db_expr_t db_dumpframe __P((u_int32_t pframe)); +void ddb_trap(void); +db_expr_t db_dumpframe(u_int32_t pframe); #endif /* _KERNEL */ diff --git a/sys/arch/macppc/include/disklabel.h b/sys/arch/macppc/include/disklabel.h index b3e13648d3f..300836b658a 100644 --- a/sys/arch/macppc/include/disklabel.h +++ b/sys/arch/macppc/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.1 2001/09/01 15:49:06 drahn Exp $ */ +/* $OpenBSD: disklabel.h,v 1.2 2002/03/14 01:26:36 millert Exp $ */ /* * Copyright (c) 1994 Christopher G. Demetriou @@ -84,7 +84,7 @@ struct dos_partition { #define DPSECT(s) ((s) & 0x3f) #define DPCYL(c, s) ((c) + (((s) & 0xc0) << 2)) -static __inline u_int32_t get_le __P((void *p)); +static __inline u_int32_t get_le(void *p); static __inline u_int32_t #ifdef __cplusplus diff --git a/sys/arch/macppc/include/pmap.h b/sys/arch/macppc/include/pmap.h index ff16bfbf647..86ae405a116 100644 --- a/sys/arch/macppc/include/pmap.h +++ b/sys/arch/macppc/include/pmap.h @@ -1,7 +1,7 @@ -/* $OpenBSD: pmap.h,v 1.3 2001/09/10 17:48:09 drahn Exp $ */ +/* $OpenBSD: pmap.h,v 1.4 2002/03/14 01:26:36 millert Exp $ */ #include <powerpc/pmap.h> #ifndef _LOCORE -paddr_t vtophys __P((vaddr_t)); +paddr_t vtophys(vaddr_t); #endif /* _LOCORE */ diff --git a/sys/arch/macppc/include/powerpc.h b/sys/arch/macppc/include/powerpc.h index 937dab7c7f3..e5cb3674d17 100644 --- a/sys/arch/macppc/include/powerpc.h +++ b/sys/arch/macppc/include/powerpc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: powerpc.h,v 1.1 2001/09/01 15:49:06 drahn Exp $ */ +/* $OpenBSD: powerpc.h,v 1.2 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: powerpc.h,v 1.1 1996/09/30 16:34:30 ws Exp $ */ /* @@ -39,16 +39,16 @@ struct mem_region { vm_size_t size; }; -void mem_regions __P((struct mem_region **, struct mem_region **)); +void mem_regions(struct mem_region **, struct mem_region **); /* * These two functions get used solely in boot() in machdep.c. * * Not sure whether boot itself should be implementation dependent instead. XXX */ -typedef void (exit_f) __P((void)) /*__attribute__((__noreturn__))*/ ; -typedef void (boot_f) __P((char *bootspec)) /* __attribute__((__noreturn__))*/ ; -typedef void (vmon_f) __P((void)); +typedef void (exit_f)(void) /*__attribute__((__noreturn__))*/ ; +typedef void (boot_f)(char *bootspec) /* __attribute__((__noreturn__))*/ ; +typedef void (vmon_f)(void); /* firmware interface. * regardless of type of firmware used several items @@ -62,8 +62,8 @@ typedef void (vmon_f) __P((void)); * vmon - tell firmware the bsd vm is active. */ -typedef void (mem_regions_f)__P((struct mem_region **memp, - struct mem_region **availp)); +typedef void (mem_regions_f)(struct mem_region **memp, + struct mem_region **availp); struct firmware { mem_regions_f *mem_regions; @@ -77,10 +77,10 @@ struct firmware { }; extern struct firmware *fw; void ofwconprobe(void); -int ppc_open_pci_bridge __P((void)); -void ppc_close_pci_bridge __P((int)); +int ppc_open_pci_bridge(void); +void ppc_close_pci_bridge(int); void install_extint __P((void (*handler) (void))); -void ppc_intr_enable __P((int enable)); -int ppc_intr_disable __P((void)); +void ppc_intr_enable(int enable); +int ppc_intr_disable(void); #endif /* _MACHINE_POWERPC_H_ */ diff --git a/sys/arch/macppc/include/z8530var.h b/sys/arch/macppc/include/z8530var.h index 9e383d6ec12..cb0fe2bd2ed 100644 --- a/sys/arch/macppc/include/z8530var.h +++ b/sys/arch/macppc/include/z8530var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530var.h,v 1.1 2001/09/26 22:45:43 mickey Exp $ */ +/* $OpenBSD: z8530var.h,v 1.2 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: z8530var.h,v 1.1 1998/05/15 10:15:57 tsubai Exp $ */ /* @@ -116,28 +116,28 @@ struct zsc_softc { * XXX - no one seems to want to try and check this -wrs */ -u_char zs_read_reg __P((struct zs_chanstate *cs, u_char reg)); -u_char zs_read_csr __P((struct zs_chanstate *cs)); -u_char zs_read_data __P((struct zs_chanstate *cs)); +u_char zs_read_reg(struct zs_chanstate *cs, u_char reg); +u_char zs_read_csr(struct zs_chanstate *cs); +u_char zs_read_data(struct zs_chanstate *cs); -void zs_write_reg __P((struct zs_chanstate *cs, u_char reg, u_char val)); -void zs_write_csr __P((struct zs_chanstate *cs, u_char val)); -void zs_write_data __P((struct zs_chanstate *cs, u_char val)); +void zs_write_reg(struct zs_chanstate *cs, u_char reg, u_char val); +void zs_write_csr(struct zs_chanstate *cs, u_char val); +void zs_write_data(struct zs_chanstate *cs, u_char val); /* XXX - Could define splzs() here instead of in psl.h */ #define splzs spltty /* Hook for MD ioctl support */ -int zsmdioctl __P((struct zs_chanstate *cs, u_long cmd, caddr_t data)); +int zsmdioctl(struct zs_chanstate *cs, u_long cmd, caddr_t data); /* XXX - This is a bit gross... */ #define ZS_MD_IOCTL zsmdioctl(cs, cmd, data) /* Callback for "external" clock sources */ -void zsmd_setclock __P((struct zs_chanstate *cs)); +void zsmd_setclock(struct zs_chanstate *cs); #define ZS_MD_SETCLK(cs) zsmd_setclock(cs) #define zsc_req_softint(zsc) (void)(zsc) -void zs_abort __P((void)); +void zs_abort(void); #define ZSTTY_MAJOR 7 diff --git a/sys/arch/macppc/macppc/autoconf.c b/sys/arch/macppc/macppc/autoconf.c index 573e5ff8a8f..c36dec253e5 100644 --- a/sys/arch/macppc/macppc/autoconf.c +++ b/sys/arch/macppc/macppc/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.2 2001/12/05 23:58:41 tdeval Exp $ */ +/* $OpenBSD: autoconf.c,v 1.3 2002/03/14 01:26:36 millert Exp $ */ /* * Copyright (c) 1996, 1997 Per Fogelstrom * Copyright (c) 1995 Theo de Raadt @@ -41,7 +41,7 @@ * from: Utah Hdr: autoconf.c 1.31 91/01/21 * * from: @(#)autoconf.c 8.1 (Berkeley) 6/10/93 - * $Id: autoconf.c,v 1.2 2001/12/05 23:58:41 tdeval Exp $ + * $Id: autoconf.c,v 1.3 2002/03/14 01:26:36 millert Exp $ */ /* @@ -62,17 +62,17 @@ #include <machine/autoconf.h> -struct device *parsedisk __P((char *, int, int, dev_t *)); -void setroot __P((void)); -void swapconf __P((void)); -extern void dumpconf __P((void)); -int findblkmajor __P((struct device *)); -char *findblkname __P((int)); -static struct device * getdisk __P((char *, int, int, dev_t *)); -struct device * getdevunit __P((char *, int)); -static struct devmap * findtype __P((char **)); -void makebootdev __P((char *cp)); -int getpno __P((char **)); +struct device *parsedisk(char *, int, int, dev_t *); +void setroot(void); +void swapconf(void); +extern void dumpconf(void); +int findblkmajor(struct device *); +char *findblkname(int); +static struct device * getdisk(char *, int, int, dev_t *); +struct device * getdevunit(char *, int); +static struct devmap * findtype(char **); +void makebootdev(char *cp); +int getpno(char **); void diskconf(void); /* diff --git a/sys/arch/macppc/macppc/cpu.c b/sys/arch/macppc/macppc/cpu.c index f1b090ceb03..1a790f8d143 100644 --- a/sys/arch/macppc/macppc/cpu.c +++ b/sys/arch/macppc/macppc/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.1 2001/09/01 15:44:20 drahn Exp $ */ +/* $OpenBSD: cpu.c,v 1.2 2002/03/14 01:26:36 millert Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -75,7 +75,7 @@ struct cfdriver cpu_cd = { NULL, "cpu", DV_DULL, NULL, 0 }; -void config_l2cr __P((void)); +void config_l2cr(void); int cpumatch(parent, cfdata, aux) diff --git a/sys/arch/macppc/macppc/db_interface.c b/sys/arch/macppc/macppc/db_interface.c index 53d68fd004a..54bfb0f7f82 100644 --- a/sys/arch/macppc/macppc/db_interface.c +++ b/sys/arch/macppc/macppc/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.1 2001/09/01 15:44:20 drahn Exp $ */ +/* $OpenBSD: db_interface.c,v 1.2 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: db_interface.c,v 1.12 2001/07/22 11:29:46 wiz Exp $ */ #include <sys/param.h> @@ -8,7 +8,7 @@ #include <machine/db_machdep.h> #include <ddb/db_extern.h> -int ddb_trap_glue __P((struct trapframe *frame)); /* called from locore */ +int ddb_trap_glue(struct trapframe *frame); /* called from locore */ void Debugger() diff --git a/sys/arch/macppc/macppc/disksubr.c b/sys/arch/macppc/macppc/disksubr.c index e6fc78d6404..7c624719aec 100644 --- a/sys/arch/macppc/macppc/disksubr.c +++ b/sys/arch/macppc/macppc/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.2 2002/02/19 02:46:40 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.3 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -79,7 +79,7 @@ dk_establish(dk, dev) char * readdisklabel(dev, strat, lp, osdep, spoofonly) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); register struct disklabel *lp; struct cpu_disklabel *osdep; int spoofonly; @@ -486,7 +486,7 @@ setdisklabel(olp, nlp, openmask, osdep) int writedisklabel(dev, strat, lp, osdep) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); register struct disklabel *lp; struct cpu_disklabel *osdep; { diff --git a/sys/arch/macppc/macppc/dma.c b/sys/arch/macppc/macppc/dma.c index cbaecb8fb99..e97be65635c 100644 --- a/sys/arch/macppc/macppc/dma.c +++ b/sys/arch/macppc/macppc/dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dma.c,v 1.12 2002/02/18 14:26:24 drahn Exp $ */ +/* $OpenBSD: dma.c,v 1.13 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -122,8 +122,8 @@ _dmamap_destroy(t, map) free(map, M_DEVBUF); } -int _dmamap_load_buffer __P((bus_dma_tag_t, bus_dmamap_t, void *, bus_size_t, - struct proc *, int, paddr_t *, int *, int)); +int _dmamap_load_buffer(bus_dma_tag_t, bus_dmamap_t, void *, bus_size_t, + struct proc *, int, paddr_t *, int *, int); int _dmamap_load_buffer(t, map, buf, buflen, p, flags, lastaddrp, segp, first) diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c index fd3388b6c1b..5ed759c7b5c 100644 --- a/sys/arch/macppc/macppc/machdep.c +++ b/sys/arch/macppc/macppc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.28 2002/03/13 18:27:36 drahn Exp $ */ +/* $OpenBSD: machdep.c,v 1.29 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -160,18 +160,18 @@ int allowaperture = 0; void ofw_dbg(char *str); -caddr_t allocsys __P((caddr_t)); -void dumpsys __P((void)); -void systype __P((char *name)); -int lcsplx __P((int ipl)); /* called from LCore */ -int power4e_get_eth_addr __P((void)); -void nameinterrupt __P((int replace, char *newstr)); -void ppc_intr_setup __P((intr_establish_t *establish, - intr_disestablish_t *disestablish)); +caddr_t allocsys(caddr_t); +void dumpsys(void); +void systype(char *name); +int lcsplx(int ipl); /* called from LCore */ +int power4e_get_eth_addr(void); +void nameinterrupt(int replace, char *newstr); +void ppc_intr_setup(intr_establish_t *establish, + intr_disestablish_t *disestablish); void *ppc_intr_establish __P((void *lcv, pci_intr_handle_t ih, int type, - int level, int (*func) __P((void *)), void *arg, char *name)); -int bus_mem_add_mapping __P((bus_addr_t bpa, bus_size_t size, int cacheable, - bus_space_handle_t *bshp)); + int level, int (*func)(void *), void *arg, char *name)); +int bus_mem_add_mapping(bus_addr_t bpa, bus_size_t size, int cacheable, + bus_space_handle_t *bshp); /* * Extent maps to manage I/O. Allocate storage for 8 regions in each, @@ -208,8 +208,8 @@ initppc(startkernel, endkernel, args) #if NIPKDB > 0 extern ipkdblow, ipkdbsize; #endif - extern void consinit __P((void)); - extern void callback __P((void *)); + extern void consinit(void); + extern void callback(void *); extern void *msgbuf_addr; int exc, scratch; @@ -491,10 +491,10 @@ void ofw_dbg(char *str) void install_extint(handler) - void (*handler) __P((void)); + void (*handler)(void); { - void extint __P((void)); - void extsize __P((void)); + void extint(void); + void extsize(void); extern u_long extint_call; u_long offset = (u_long)handler - (u_long)&extint_call; int omsr, msr; @@ -1038,7 +1038,7 @@ ppc_intr_establish(lcv, ih, type, level, func, arg, name) pci_intr_handle_t ih; int type; int level; - int (*func) __P((void *)); + int (*func)(void *); void *arg; char *name; { @@ -1132,10 +1132,10 @@ bus_space_map(t, bpa, size, cacheable, bshp) } return 0; } -bus_addr_t bus_space_unmap_p __P((bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t size)); -void bus_space_unmap __P((bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t size)); +bus_addr_t bus_space_unmap_p(bus_space_tag_t t, bus_space_handle_t bsh, + bus_size_t size); +void bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, + bus_size_t size); bus_addr_t bus_space_unmap_p(t, bsh, size) bus_space_tag_t t; diff --git a/sys/arch/macppc/macppc/mainbus.c b/sys/arch/macppc/macppc/mainbus.c index 24b014340ea..b70fe629442 100644 --- a/sys/arch/macppc/macppc/mainbus.c +++ b/sys/arch/macppc/macppc/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.2 2001/09/21 17:55:39 miod Exp $ */ +/* $OpenBSD: mainbus.c,v 1.3 2002/03/14 01:26:36 millert Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -41,9 +41,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 @@ -53,9 +53,9 @@ struct cfdriver mainbus_cd = { }; void mb_intr_establish __P((struct confargs *, int (*)(void *), void *)); -void mb_intr_disestablish __P((struct confargs *)); -caddr_t mb_cvtaddr __P((struct confargs *)); -int mb_matchname __P((struct confargs *, char *)); +void mb_intr_disestablish(struct confargs *); +caddr_t mb_cvtaddr(struct confargs *); +int mb_matchname(struct confargs *, char *); /*ARGSUSED*/ static int @@ -162,7 +162,7 @@ mbprint(aux, pnp) void mb_intr_establish(ca, handler, val) struct confargs *ca; - int (*handler) __P((void *)); + int (*handler)(void *); void *val; { panic("can never mb_intr_establish"); diff --git a/sys/arch/macppc/macppc/ofw_machdep.c b/sys/arch/macppc/macppc/ofw_machdep.c index b967861cc67..84d72163b8d 100644 --- a/sys/arch/macppc/macppc/ofw_machdep.c +++ b/sys/arch/macppc/macppc/ofw_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofw_machdep.c,v 1.7 2002/03/09 21:46:05 drahn Exp $ */ +/* $OpenBSD: ofw_machdep.c,v 1.8 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: ofw_machdep.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */ /* @@ -59,10 +59,10 @@ int save_ofw_mapping(void); int restore_ofw_mapping(void); -void OF_exit __P((void)) __attribute__((__noreturn__)); -void OF_boot __P((char *bootspec)) __attribute__((__noreturn__)); -void ofw_mem_regions __P((struct mem_region **memp, struct mem_region **availp)); -void ofw_vmon __P((void)); +void OF_exit(void) __attribute__((__noreturn__)); +void OF_boot(char *bootspec) __attribute__((__noreturn__)); +void ofw_mem_regions(struct mem_region **memp, struct mem_region **availp); +void ofw_vmon(void); struct firmware ofw_firmware = { ofw_mem_regions, @@ -109,7 +109,7 @@ ofw_mem_regions(memp, availp) *availp = OFavail; } -typedef void (fwcall_f) __P((int, int)); +typedef void (fwcall_f)(int, int); extern fwcall_f *fwcall; fwcall_f fwentry; extern u_int32_t ofmsr; diff --git a/sys/arch/macppc/macppc/opendev.c b/sys/arch/macppc/macppc/opendev.c index 95d7f83fddb..db389363803 100644 --- a/sys/arch/macppc/macppc/opendev.c +++ b/sys/arch/macppc/macppc/opendev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: opendev.c,v 1.3 2002/01/03 19:28:37 jason Exp $ */ +/* $OpenBSD: opendev.c,v 1.4 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: openfirm.c,v 1.1 1996/09/30 16:34:52 ws Exp $ */ /* @@ -39,8 +39,8 @@ #include <dev/ofw/openfirm.h> #include <lib/libkern/libkern.h> -extern void ofw_stack __P((void)); -extern void ofbcopy __P((const void *, void *, size_t)); +extern void ofw_stack(void); +extern void ofbcopy(const void *, void *, size_t); int OF_instance_to_package(ihandle) diff --git a/sys/arch/macppc/macppc/openfirm.c b/sys/arch/macppc/macppc/openfirm.c index d28baa59202..8ffaa76be3d 100644 --- a/sys/arch/macppc/macppc/openfirm.c +++ b/sys/arch/macppc/macppc/openfirm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: openfirm.c,v 1.1 2001/09/01 15:44:20 drahn Exp $ */ +/* $OpenBSD: openfirm.c,v 1.2 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: openfirm.c,v 1.1 1996/09/30 16:34:52 ws Exp $ */ /* @@ -39,8 +39,8 @@ #include <dev/ofw/openfirm.h> -extern void ofw_stack __P((void)); -extern void ofbcopy __P((const void *, void *, size_t)); +extern void ofw_stack(void); +extern void ofbcopy(const void *, void *, size_t); int OF_peer(phandle) diff --git a/sys/arch/macppc/macppc/swapgeneric.c b/sys/arch/macppc/macppc/swapgeneric.c index 6d59e1a50b3..fdb8f369884 100644 --- a/sys/arch/macppc/macppc/swapgeneric.c +++ b/sys/arch/macppc/macppc/swapgeneric.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapgeneric.c,v 1.2 2001/09/29 18:40:32 miod Exp $ */ +/* $OpenBSD: swapgeneric.c,v 1.3 2002/03/14 01:26:36 millert Exp $ */ /* $NetBSD: swapgeneric.c,v 1.1 1996/09/30 16:34:55 ws Exp $ */ /*- @@ -43,7 +43,7 @@ #include <sys/param.h> #include <sys/conf.h> -int (*mountroot) __P((void *)) = NULL; /* tells autoconf.c that we are "generic" */ +int (*mountroot)(void *) = NULL; /* tells autoconf.c that we are "generic" */ dev_t rootdev = NODEV; dev_t dumpdev = NODEV; diff --git a/sys/arch/macppc/macppc/wscons_machdep.c b/sys/arch/macppc/macppc/wscons_machdep.c index 63b76da8ea5..e6257e74d76 100644 --- a/sys/arch/macppc/macppc/wscons_machdep.c +++ b/sys/arch/macppc/macppc/wscons_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wscons_machdep.c,v 1.1 2001/09/01 15:44:20 drahn Exp $ */ +/* $OpenBSD: wscons_machdep.c,v 1.2 2002/03/14 01:26:36 millert Exp $ */ /* * Copyright (c) 2001 Aaron Campbell @@ -48,11 +48,11 @@ #endif #include <dev/wscons/wskbdvar.h> -void wscnprobe __P((struct consdev *)); -void wscninit __P((struct consdev *)); -void wscnputc __P((dev_t, char)); -int wscngetc __P((dev_t)); -void wscnpollc __P((dev_t, int)); +void wscnprobe(struct consdev *); +void wscninit(struct consdev *); +void wscnputc(dev_t, char); +int wscngetc(dev_t); +void wscnpollc(dev_t, int); void wscnprobe(cp) diff --git a/sys/arch/macppc/pci/macobio.c b/sys/arch/macppc/pci/macobio.c index 91d7527ff4d..47ff27afab2 100644 --- a/sys/arch/macppc/pci/macobio.c +++ b/sys/arch/macppc/pci/macobio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macobio.c,v 1.2 2001/09/15 01:42:55 mickey Exp $ */ +/* $OpenBSD: macobio.c,v 1.3 2002/03/14 01:26:37 millert Exp $ */ /* $NetBSD: obio.c,v 1.6 1999/05/01 10:36:08 tsubai Exp $ */ /*- @@ -46,12 +46,12 @@ #include <machine/bus.h> #include <machine/autoconf.h> -void macobio_attach __P((struct device *, struct device *, void *)); -int macobio_match __P((struct device *, void *, void *)); -int macobio_print __P((void *, const char *)); +void macobio_attach(struct device *, struct device *, void *); +int macobio_match(struct device *, void *, void *); +int macobio_print(void *, const char *); void *undef_mac_establish __P((void * lcv, int irq, int type, int level, - int (*ih_fun) __P((void *)), void *ih_arg, char *name)); -void mac_intr_disestab __P((void *lcp, void *arg)); + int (*ih_fun)(void *), void *ih_arg, char *name)); +void mac_intr_disestab(void *lcp, void *arg); struct macobio_softc { struct device sc_dev; @@ -232,7 +232,7 @@ undef_mac_establish(lcv, irq, type, level, ih_fun, ih_arg, name) int irq; int type; int level; - int (*ih_fun) __P((void *)); + int (*ih_fun)(void *); void *ih_arg; char *name; { @@ -257,7 +257,7 @@ mac_intr_establish(lcv, irq, type, level, ih_fun, ih_arg, name) int irq; int type; int level; - int (*ih_fun) __P((void *)); + int (*ih_fun)(void *); void *ih_arg; char *name; { diff --git a/sys/arch/macppc/pci/mpcpcibus.c b/sys/arch/macppc/pci/mpcpcibus.c index 79124385a8e..4899cf4ba72 100644 --- a/sys/arch/macppc/pci/mpcpcibus.c +++ b/sys/arch/macppc/pci/mpcpcibus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpcpcibus.c,v 1.7 2002/03/02 17:44:58 drahn Exp $ */ +/* $OpenBSD: mpcpcibus.c,v 1.8 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -64,28 +64,28 @@ #include <dev/ofw/openfirm.h> -int mpcpcibrmatch __P((struct device *, void *, void *)); -void mpcpcibrattach __P((struct device *, struct device *, void *)); +int mpcpcibrmatch(struct device *, void *, void *); +void mpcpcibrattach(struct device *, struct device *, void *); -void mpc_attach_hook __P((struct device *, struct device *, - struct pcibus_attach_args *)); -int mpc_bus_maxdevs __P((void *, int)); -pcitag_t mpc_make_tag __P((void *, int, int, int)); -void mpc_decompose_tag __P((void *, pcitag_t, int *, int *, int *)); -pcireg_t mpc_conf_read __P((void *, pcitag_t, int)); -void mpc_conf_write __P((void *, pcitag_t, int, pcireg_t)); +void mpc_attach_hook(struct device *, struct device *, + struct pcibus_attach_args *); +int mpc_bus_maxdevs(void *, int); +pcitag_t mpc_make_tag(void *, int, int, int); +void mpc_decompose_tag(void *, pcitag_t, int *, int *, int *); +pcireg_t mpc_conf_read(void *, pcitag_t, int); +void mpc_conf_write(void *, pcitag_t, int, pcireg_t); -int mpc_intr_map __P((void *, pcitag_t, int, int, pci_intr_handle_t *)); -const char *mpc_intr_string __P((void *, pci_intr_handle_t)); -int mpc_intr_line __P((void *, pci_intr_handle_t)); +int mpc_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *); +const char *mpc_intr_string(void *, pci_intr_handle_t); +int mpc_intr_line(void *, pci_intr_handle_t); void *mpc_intr_establish __P((void *, pci_intr_handle_t, int, int (*func)(void *), void *, char *)); -void mpc_intr_disestablish __P((void *, void *)); -int mpc_ether_hw_addr __P((struct ppc_pci_chipset *, u_int8_t *)); -u_int32_t mpc_gen_config_reg __P((void *cpv, pcitag_t tag, int offset)); -int of_ether_hw_addr __P((struct ppc_pci_chipset *, u_int8_t *)); +void mpc_intr_disestablish(void *, void *); +int mpc_ether_hw_addr(struct ppc_pci_chipset *, u_int8_t *); +u_int32_t mpc_gen_config_reg(void *cpv, pcitag_t tag, int offset); +int of_ether_hw_addr(struct ppc_pci_chipset *, u_int8_t *); int find_node_intr (int parent, u_int32_t *addr, u_int32_t *intr); -u_int32_t pci_iack __P((void)); +u_int32_t pci_iack(void); struct cfattach mpcpcibr_ca = { sizeof(struct pcibr_softc), mpcpcibrmatch, mpcpcibrattach, @@ -95,7 +95,7 @@ struct cfdriver mpcpcibr_cd = { NULL, "mpcpcibr", DV_DULL, }; -static int mpcpcibrprint __P((void *, const char *pnp)); +static int mpcpcibrprint(void *, const char *pnp); struct pcibr_config mpc_config; @@ -1014,7 +1014,7 @@ mpc_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/macppc/pci/pchb.c b/sys/arch/macppc/pci/pchb.c index 6b19dd8839d..71bfe35d7a5 100644 --- a/sys/arch/macppc/pci/pchb.c +++ b/sys/arch/macppc/pci/pchb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pchb.c,v 1.2 2001/12/18 17:33:34 drahn Exp $ */ +/* $OpenBSD: pchb.c,v 1.3 2002/03/14 01:26:37 millert Exp $ */ /* $NetBSD: pchb.c,v 1.4 2000/01/25 07:19:11 tsubai Exp $ */ /*- @@ -48,8 +48,8 @@ #include <dev/pci/pcireg.h> #include <dev/pci/pcidevs.h> -int pchbmatch __P((struct device *, void *, void *)); -void pchbattach __P((struct device *, struct device *, void *)); +int pchbmatch(struct device *, void *, void *); +void pchbattach(struct device *, struct device *, void *); struct cfattach pchb_ca = { sizeof(struct device), pchbmatch, pchbattach diff --git a/sys/arch/macppc/pci/pcibrvar.h b/sys/arch/macppc/pci/pcibrvar.h index 134373fdc7f..6efdbc8af38 100644 --- a/sys/arch/macppc/pci/pcibrvar.h +++ b/sys/arch/macppc/pci/pcibrvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcibrvar.h,v 1.1 2001/09/01 15:55:17 drahn Exp $ */ +/* $OpenBSD: pcibrvar.h,v 1.2 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -68,10 +68,10 @@ struct pci_reserve_mem { char *name; }; -void pci_addr_fixup __P((struct pcibr_softc *, pci_chipset_tag_t, int, - struct pci_reserve_mem *)); +void pci_addr_fixup(struct pcibr_softc *, pci_chipset_tag_t, int, + struct pci_reserve_mem *); #define PCIADDR_SEARCH_IO 0 #define PCIADDR_SEARCH_MEM 1 -struct extent *pciaddr_search __P((struct device *, int, bus_addr_t *, bus_size_t)); +struct extent *pciaddr_search(struct device *, int, bus_addr_t *, bus_size_t); diff --git a/sys/arch/macppc/pci/pciide_machdep.c b/sys/arch/macppc/pci/pciide_machdep.c index 2af6c35e1e5..c1757dad19e 100644 --- a/sys/arch/macppc/pci/pciide_machdep.c +++ b/sys/arch/macppc/pci/pciide_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide_machdep.c,v 1.1 2001/09/01 15:55:17 drahn Exp $ */ +/* $OpenBSD: pciide_machdep.c,v 1.2 2002/03/14 01:26:37 millert Exp $ */ /* $NetBSD: pciide_machdep.c,v 1.2 1999/02/19 18:01:27 mycroft Exp $ */ /* @@ -57,7 +57,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; { int irq; diff --git a/sys/arch/macppc/pci/vgafb.c b/sys/arch/macppc/pci/vgafb.c index 118c4e1f0cd..e97cddf3385 100644 --- a/sys/arch/macppc/pci/vgafb.c +++ b/sys/arch/macppc/pci/vgafb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vgafb.c,v 1.5 2001/12/14 03:08:54 jason Exp $ */ +/* $OpenBSD: vgafb.c,v 1.6 2002/03/14 01:26:37 millert Exp $ */ /* $NetBSD: vga.c,v 1.3 1996/12/02 22:24:54 cgd Exp $ */ /* @@ -63,15 +63,15 @@ struct cfdriver vgafb_cd = { NULL, "vgafb", DV_DULL, }; -void vgafb_cursor __P((void *, int, int, int)); -void vgafb_putchar __P((void *, int, int, u_int, long)); -void vgafb_copycols __P((void *, int, int, int, int)); -void vgafb_erasecols __P((void *, int, int, int)); -void vgafb_copyrows __P((void *, int, int, int)); -void vgafb_eraserows __P((void *, int, int)); -void vgafb_alloc_attr __P((void *c, int fg, int bg, int flags, long *)); +void vgafb_cursor(void *, int, int, int); +void vgafb_putchar(void *, int, int, u_int, long); +void vgafb_copycols(void *, int, int, int, int); +void vgafb_erasecols(void *, int, int, int); +void vgafb_copyrows(void *, int, int, int); +void vgafb_eraserows(void *, int, int); +void vgafb_alloc_attr(void *c, int fg, int bg, int flags, long *); -void vgafb_setcolor __P((unsigned int index, u_int8_t r, u_int8_t g, u_int8_t b)); +void vgafb_setcolor(unsigned int index, u_int8_t r, u_int8_t g, u_int8_t b); struct vgafb_devconfig { struct rcons dc_ri; @@ -118,8 +118,8 @@ struct wsdisplay_accessops vgafb_accessops = { 0 /* load_font */ }; -int vgafb_getcmap __P((struct vgafb_config *vc, struct wsdisplay_cmap *cm)); -int vgafb_putcmap __P((struct vgafb_config *vc, struct wsdisplay_cmap *cm)); +int vgafb_getcmap(struct vgafb_config *vc, struct wsdisplay_cmap *cm); +int vgafb_putcmap(struct vgafb_config *vc, struct wsdisplay_cmap *cm); #define FONT_WIDTH 8 #define FONT_HEIGHT 16 diff --git a/sys/arch/macppc/pci/vgafb_pci.c b/sys/arch/macppc/pci/vgafb_pci.c index ea27e674ddd..0b98fe61c56 100644 --- a/sys/arch/macppc/pci/vgafb_pci.c +++ b/sys/arch/macppc/pci/vgafb_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vgafb_pci.c,v 1.2 2001/10/31 12:26:18 art Exp $ */ +/* $OpenBSD: vgafb_pci.c,v 1.3 2002/03/14 01:26:37 millert Exp $ */ /* $NetBSD: vga_pci.c,v 1.4 1996/12/05 01:39:38 cgd Exp $ */ /* @@ -63,18 +63,18 @@ struct vgafb_pci_softc { int nscreens; }; -int vgafb_pci_probe __P((struct pci_attach_args *pa, int id, u_int32_t *ioaddr, +int vgafb_pci_probe(struct pci_attach_args *pa, int id, u_int32_t *ioaddr, u_int32_t *iosize, u_int32_t *memaddr, u_int32_t *memsize, - u_int32_t *cacheable, u_int32_t *mmioaddr, u_int32_t *mmiosize)); + u_int32_t *cacheable, u_int32_t *mmioaddr, u_int32_t *mmiosize); #ifdef __BROKEN_INDIRECT_CONFIG -int vgafb_pci_match __P((struct device *, void *, void *)); +int vgafb_pci_match(struct device *, void *, void *); #else -int vgafb_pci_match __P((struct device *, struct cfdata *, void *)); +int vgafb_pci_match(struct device *, struct cfdata *, void *); #endif -void vgafb_pci_attach __P((struct device *, struct device *, void *)); +void vgafb_pci_attach(struct device *, struct device *, void *); -paddr_t vgafbpcimmap __P((void *, off_t, int)); -int vgafbpciioctl __P((void *, u_long, caddr_t, int, struct proc *)); +paddr_t vgafbpcimmap(void *, off_t, int); +int vgafbpciioctl(void *, u_long, caddr_t, int, struct proc *); struct cfattach vgafb_pci_ca = { sizeof(struct vgafb_pci_softc), (cfmatch_t)vgafb_pci_match, vgafb_pci_attach, @@ -440,7 +440,7 @@ vgafb_show_screen(v, cookie, waitok, cb, cbarg) void *v; void *cookie; int waitok; - void (*cb) __P((void *, int, int)); + void (*cb)(void *, int, int); void *cbarg; { diff --git a/sys/arch/macppc/pci/vgafb_pcivar.h b/sys/arch/macppc/pci/vgafb_pcivar.h index 9639905ccd5..69b387eaa41 100644 --- a/sys/arch/macppc/pci/vgafb_pcivar.h +++ b/sys/arch/macppc/pci/vgafb_pcivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vgafb_pcivar.h,v 1.1 2001/09/01 15:55:18 drahn Exp $ */ +/* $OpenBSD: vgafb_pcivar.h,v 1.2 2002/03/14 01:26:37 millert Exp $ */ /* $NetBSD: vga_pcivar.h,v 1.1 1996/11/19 04:38:36 cgd Exp $ */ /* @@ -36,8 +36,8 @@ (PCI_CLASS(class) == PCI_CLASS_PREHISTORIC && \ PCI_SUBCLASS(class) == PCI_SUBCLASS_PREHISTORIC_VGA)) ? 1 : 0) -void vgafb_pci_console __P((bus_space_tag_t, +void vgafb_pci_console(bus_space_tag_t, u_int32_t ioaddr, u_int32_t iosize, bus_space_tag_t, u_int32_t memaddr, u_int32_t memsize, - pci_chipset_tag_t, int, int, int)); + pci_chipset_tag_t, int, int, int); diff --git a/sys/arch/macppc/pci/vgafbvar.h b/sys/arch/macppc/pci/vgafbvar.h index c769aecdc47..cfb9cd1c7aa 100644 --- a/sys/arch/macppc/pci/vgafbvar.h +++ b/sys/arch/macppc/pci/vgafbvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vgafbvar.h,v 1.2 2001/10/31 12:26:18 art Exp $ */ +/* $OpenBSD: vgafbvar.h,v 1.3 2002/03/14 01:26:37 millert Exp $ */ /* $NetBSD: vgavar.h,v 1.2 1996/11/23 06:06:43 cgd Exp $ */ /* @@ -51,9 +51,9 @@ struct vgafb_config { char vc_at; /* normal attributes */ char vc_so_at; /* standout attributes */ - int (*vc_ioctl) __P((void *, u_long, - caddr_t, int, struct proc *)); - paddr_t (*vc_mmap) __P((void *, off_t, int)); + int (*vc_ioctl)(void *, u_long, + caddr_t, int, struct proc *); + paddr_t (*vc_mmap)(void *, off_t, int); #if 0 struct raster dc_raster; /* raster description */ #endif @@ -62,24 +62,24 @@ struct vgafb_config { }; -int vgafb_common_probe __P((bus_space_tag_t, bus_space_tag_t, - u_int32_t, size_t, u_int32_t, size_t, u_int32_t, size_t )); -void vgafb_common_setup __P((bus_space_tag_t, bus_space_tag_t, +int vgafb_common_probe(bus_space_tag_t, bus_space_tag_t, + u_int32_t, size_t, u_int32_t, size_t, u_int32_t, size_t ); +void vgafb_common_setup(bus_space_tag_t, bus_space_tag_t, struct vgafb_config *, u_int32_t, size_t, u_int32_t, size_t, - u_int32_t, size_t)); -void vgafb_wscons_attach __P((struct device *, struct vgafb_config *, int)); -void vgafb_wscons_console __P((struct vgafb_config *)); -void vgafb_cnprobe __P((struct consdev *cp)); -void vgafb_cnattach __P((bus_space_tag_t iot, bus_space_tag_t memt, - void *pc, int bus, int device, int function)); -void vgafb_wsdisplay_attach __P((struct device *parent, - struct vgafb_config *vc, int console)); -int vgafbioctl __P((void *, u_long, caddr_t, int, struct proc *)); -paddr_t vgafbmmap __P((void *, off_t, int)); -int vgafb_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); -paddr_t vgafb_mmap __P((void *, off_t, int)); -int vgafb_alloc_screen __P((void *v, const struct wsscreen_descr *type, - void **cookiep, int *curxp, int *curyp, long *attrp)); -void vgafb_free_screen __P((void *v, void *cookie)); + u_int32_t, size_t); +void vgafb_wscons_attach(struct device *, struct vgafb_config *, int); +void vgafb_wscons_console(struct vgafb_config *); +void vgafb_cnprobe(struct consdev *cp); +void vgafb_cnattach(bus_space_tag_t iot, bus_space_tag_t memt, + void *pc, int bus, int device, int function); +void vgafb_wsdisplay_attach(struct device *parent, + struct vgafb_config *vc, int console); +int vgafbioctl(void *, u_long, caddr_t, int, struct proc *); +paddr_t vgafbmmap(void *, off_t, int); +int vgafb_ioctl(void *, u_long, caddr_t, int, struct proc *); +paddr_t vgafb_mmap(void *, off_t, int); +int vgafb_alloc_screen(void *v, const struct wsscreen_descr *type, + void **cookiep, int *curxp, int *curyp, long *attrp); +void vgafb_free_screen(void *v, void *cookie); int vgafb_show_screen __P((void *v, void *cookie, int waitok, - void (*cb) __P((void *, int, int)), void *cbarg)); + void (*cb)(void *, int, int), void *cbarg)); diff --git a/sys/arch/macppc/stand/Locore.c b/sys/arch/macppc/stand/Locore.c index 30677a05b61..452b5a66685 100644 --- a/sys/arch/macppc/stand/Locore.c +++ b/sys/arch/macppc/stand/Locore.c @@ -1,4 +1,4 @@ -/* $OpenBSD: Locore.c,v 1.3 2001/10/01 22:44:26 drahn Exp $ */ +/* $OpenBSD: Locore.c,v 1.4 2002/03/14 01:26:37 millert Exp $ */ /* $NetBSD: Locore.c,v 1.1 1997/04/16 20:29:11 thorpej Exp $ */ /* @@ -41,7 +41,7 @@ static int (*openfirmware)(void *); -static void setup __P((void)); +static void setup(void); #ifdef XCOFF_GLUE asm (".text; .globl _entry; _entry: .long _start,0,0"); diff --git a/sys/arch/macppc/stand/boot.c b/sys/arch/macppc/stand/boot.c index e8bb39a3ba2..906e5f3222b 100644 --- a/sys/arch/macppc/stand/boot.c +++ b/sys/arch/macppc/stand/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.3 2001/12/15 22:26:18 deraadt Exp $ */ +/* $OpenBSD: boot.c,v 1.4 2002/03/14 01:26:37 millert Exp $ */ /* $NetBSD: boot.c,v 1.1 1997/04/16 20:29:17 thorpej Exp $ */ /* @@ -67,11 +67,11 @@ int boothowto; int debug; #ifdef POWERPC_BOOT_ELF -int elf_exec __P((int, Elf32_Ehdr *, u_int32_t *, void **)); +int elf_exec(int, Elf32_Ehdr *, u_int32_t *, void **); #endif #ifdef POWERPC_BOOT_AOUT -int aout_exec __P((int, struct exec *, u_int32_t *, void **)); +int aout_exec(int, struct exec *, u_int32_t *, void **); #endif static void diff --git a/sys/arch/macppc/stand/ofdev.c b/sys/arch/macppc/stand/ofdev.c index 85e3c000dc9..a9d1f23d7eb 100644 --- a/sys/arch/macppc/stand/ofdev.c +++ b/sys/arch/macppc/stand/ofdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofdev.c,v 1.1 2001/09/01 15:39:02 drahn Exp $ */ +/* $OpenBSD: ofdev.c,v 1.2 2002/03/14 01:26:37 millert Exp $ */ /* $NetBSD: ofdev.c,v 1.1 1997/04/16 20:29:20 thorpej Exp $ */ /* @@ -144,7 +144,7 @@ devclose(of) static struct devsw devsw[1] = { "OpenFirmware", strategy, - (int (*)__P((struct open_file *, ...)))nodev, + (int (*)(struct open_file *, ...))nodev, devclose, noioctl }; diff --git a/sys/arch/macppc/stand/openfirm.h b/sys/arch/macppc/stand/openfirm.h index 0ce8e563a33..b1cd3fefad3 100644 --- a/sys/arch/macppc/stand/openfirm.h +++ b/sys/arch/macppc/stand/openfirm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: openfirm.h,v 1.1 2001/09/01 15:39:02 drahn Exp $ */ +/* $OpenBSD: openfirm.h,v 1.2 2002/03/14 01:26:37 millert Exp $ */ /* $NetBSD: openfirm.h,v 1.1 1997/04/16 20:29:23 thorpej Exp $ */ /* @@ -38,19 +38,19 @@ #include <sys/cdefs.h> #include <sys/types.h> -int OF_finddevice __P((char *name)); -int OF_instance_to_package __P((int ihandle)); -int OF_getprop __P((int handle, char *prop, void *buf, int buflen)); +int OF_finddevice(char *name); +int OF_instance_to_package(int ihandle); +int OF_getprop(int handle, char *prop, void *buf, int buflen); #ifdef __notyet__ -int OF_setprop __P((int handle, char *prop, void *buf, int len)); +int OF_setprop(int handle, char *prop, void *buf, int len); #endif -int OF_open __P((char *dname)); -void OF_close __P((int handle)); -int OF_write __P((int handle, void *addr, int len)); -int OF_read __P((int handle, void *addr, int len)); -int OF_seek __P((int handle, u_quad_t pos)); -void *OF_claim __P((void *virt, u_int size, u_int align)); -void OF_release __P((void *virt, u_int size)); -int OF_milliseconds __P((void)); +int OF_open(char *dname); +void OF_close(int handle); +int OF_write(int handle, void *addr, int len); +int OF_read(int handle, void *addr, int len); +int OF_seek(int handle, u_quad_t pos); +void *OF_claim(void *virt, u_int size, u_int align); +void OF_release(void *virt, u_int size); +int OF_milliseconds(void); void OF_chain __P((void *addr, u_int size, void (*entry)(), void *parm, u_int parmlen)); diff --git a/sys/arch/mvme68k/dev/bugtty.c b/sys/arch/mvme68k/dev/bugtty.c index aa88ca53765..91815f82be1 100644 --- a/sys/arch/mvme68k/dev/bugtty.c +++ b/sys/arch/mvme68k/dev/bugtty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bugtty.c,v 1.5 2002/02/15 20:45:30 nordin Exp $ */ +/* $OpenBSD: bugtty.c,v 1.6 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Dale Rahn. @@ -47,8 +47,8 @@ #include "bugtty.h" -int bugttymatch __P((struct device *parent, void *self, void *aux)); -void bugttyattach __P((struct device *parent, struct device *self, void *aux)); +int bugttymatch(struct device *parent, void *self, void *aux); +void bugttyattach(struct device *parent, struct device *self, void *aux); struct cfattach bugtty_ca = { sizeof(struct device), bugttymatch, bugttyattach @@ -59,17 +59,17 @@ struct cfdriver bugtty_cd = { }; /* prototypes */ -int bugttycnprobe __P((struct consdev *cp)); -int bugttycninit __P((struct consdev *cp)); -int bugttycngetc __P((dev_t dev)); -int bugttycnputc __P((dev_t dev, char c)); - -int bugttyopen __P((dev_t dev, int flag, int mode, struct proc *p)); -int bugttyclose __P((dev_t dev, int flag, int mode, struct proc *p)); -int bugttyread __P((dev_t dev, struct uio *uio, int flag)); -int bugttywrite __P((dev_t dev, struct uio *uio, int flag)); -int bugttyioctl __P((dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)); -int bugttystop __P((struct tty *tp, int flag)); +int bugttycnprobe(struct consdev *cp); +int bugttycninit(struct consdev *cp); +int bugttycngetc(dev_t dev); +int bugttycnputc(dev_t dev, char c); + +int bugttyopen(dev_t dev, int flag, int mode, struct proc *p); +int bugttyclose(dev_t dev, int flag, int mode, struct proc *p); +int bugttyread(dev_t dev, struct uio *uio, int flag); +int bugttywrite(dev_t dev, struct uio *uio, int flag); +int bugttyioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p); +int bugttystop(struct tty *tp, int flag); #define DIALOUT(x) ((x) & 0x80) #define SWFLAGS(dev) (bugttyswflags | (DIALOUT(dev) ? TIOCFLAG_SOFTCAR : 0)) @@ -116,7 +116,7 @@ bugttyattach(parent, self, aux) printf("\n"); } -void bugttyoutput __P((struct tty *tp)); +void bugttyoutput(struct tty *tp); int bugttydefaultrate = TTYDEF_SPEED; int bugttyswflags; diff --git a/sys/arch/mvme68k/dev/cl.c b/sys/arch/mvme68k/dev/cl.c index a84881a26a4..66deacb69a6 100644 --- a/sys/arch/mvme68k/dev/cl.c +++ b/sys/arch/mvme68k/dev/cl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cl.c,v 1.23 2002/02/15 20:45:30 nordin Exp $ */ +/* $OpenBSD: cl.c,v 1.24 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Dale Rahn. All rights reserved. @@ -158,44 +158,44 @@ struct { }; /* prototypes */ -int clcnprobe __P((struct consdev *cp)); -int clcninit __P((struct consdev *cp)); -int clcngetc __P((dev_t dev)); -int clcnputc __P((dev_t dev, u_char c)); -u_char cl_clkdiv __P((int speed)); -u_char cl_clknum __P((int speed)); -u_char cl_clkrxtimeout __P((int speed)); -void clstart __P((struct tty *tp)); -void cl_unblock __P((struct tty *tp)); -int clccparam __P((struct clsoftc *sc, struct termios *par, int channel)); - -int clparam __P((struct tty *tp, struct termios *t)); -int cl_mintr __P((struct clsoftc *sc)); -int cl_txintr __P((struct clsoftc *sc)); -int cl_rxintr __P((struct clsoftc *sc)); -void cl_overflow __P((struct clsoftc *sc, int channel, time_t *ptime, u_char *msg)); -void cl_parity __P((struct clsoftc *sc, int channel)); -void cl_frame __P((struct clsoftc *sc, int channel)); -void cl_break __P(( struct clsoftc *sc, int channel)); -int clmctl __P((dev_t dev, int bits, int how)); -void cl_dumpport __P((int channel)); - -int clprobe __P((struct device *parent, void *self, void *aux)); -void clattach __P((struct device *parent, struct device *self, void *aux)); - -int clopen __P((dev_t dev, int flag, int mode, struct proc *p)); -int clclose __P((dev_t dev, int flag, int mode, struct proc *p)); -int clread __P((dev_t dev, struct uio *uio, int flag)); -int clwrite __P((dev_t dev, struct uio *uio, int flag)); -int clioctl __P((dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)); -int clstop __P((struct tty *tp, int flag)); - -static void cl_initchannel __P((struct clsoftc *sc, int channel)); -static void clputc __P((struct clsoftc *sc, int unit, u_char c)); -static u_char clgetc __P((struct clsoftc *sc, int *channel)); +int clcnprobe(struct consdev *cp); +int clcninit(struct consdev *cp); +int clcngetc(dev_t dev); +int clcnputc(dev_t dev, u_char c); +u_char cl_clkdiv(int speed); +u_char cl_clknum(int speed); +u_char cl_clkrxtimeout(int speed); +void clstart(struct tty *tp); +void cl_unblock(struct tty *tp); +int clccparam(struct clsoftc *sc, struct termios *par, int channel); + +int clparam(struct tty *tp, struct termios *t); +int cl_mintr(struct clsoftc *sc); +int cl_txintr(struct clsoftc *sc); +int cl_rxintr(struct clsoftc *sc); +void cl_overflow(struct clsoftc *sc, int channel, time_t *ptime, u_char *msg); +void cl_parity(struct clsoftc *sc, int channel); +void cl_frame(struct clsoftc *sc, int channel); +void cl_break( struct clsoftc *sc, int channel); +int clmctl(dev_t dev, int bits, int how); +void cl_dumpport(int channel); + +int clprobe(struct device *parent, void *self, void *aux); +void clattach(struct device *parent, struct device *self, void *aux); + +int clopen(dev_t dev, int flag, int mode, struct proc *p); +int clclose(dev_t dev, int flag, int mode, struct proc *p); +int clread(dev_t dev, struct uio *uio, int flag); +int clwrite(dev_t dev, struct uio *uio, int flag); +int clioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p); +int clstop(struct tty *tp, int flag); + +static void cl_initchannel(struct clsoftc *sc, int channel); +static void clputc(struct clsoftc *sc, int unit, u_char c); +static u_char clgetc(struct clsoftc *sc, int *channel); static void cloutput __P( (struct tty *tp)); -void cl_softint __P((struct clsoftc *sc)); -void cl_appendbufn __P((struct clsoftc *sc, u_char channel, u_char *buf, u_short cnt)); +void cl_softint(struct clsoftc *sc); +void cl_appendbufn(struct clsoftc *sc, u_char channel, u_char *buf, u_short cnt); struct cfattach cl_ca = { sizeof(struct clsoftc), clprobe, clattach diff --git a/sys/arch/mvme68k/dev/clock.c b/sys/arch/mvme68k/dev/clock.c index 01157b04684..28d05823924 100644 --- a/sys/arch/mvme68k/dev/clock.c +++ b/sys/arch/mvme68k/dev/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.3 1996/04/28 11:06:02 deraadt Exp $ */ +/* $OpenBSD: clock.c,v 1.4 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -116,8 +116,8 @@ struct clocksoftc { struct intrhand sc_statih; }; -void clockattach __P((struct device *, struct device *, void *)); -int clockmatch __P((struct device *, void *, void *)); +void clockattach(struct device *, struct device *, void *); +int clockmatch(struct device *, void *, void *); struct cfattach clock_ca = { sizeof(struct clocksoftc), clockmatch, clockattach @@ -127,8 +127,8 @@ struct cfdriver clock_cd = { NULL, "clock", DV_DULL, 0 }; -int clockintr __P((void *)); -int statintr __P((void *)); +int clockintr(void *); +int statintr(void *); int clockbus; u_char stat_reset, prof_reset; diff --git a/sys/arch/mvme68k/dev/flash.c b/sys/arch/mvme68k/dev/flash.c index bd1907c403f..fbb994480e4 100644 --- a/sys/arch/mvme68k/dev/flash.c +++ b/sys/arch/mvme68k/dev/flash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: flash.c,v 1.9 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: flash.c,v 1.10 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -66,8 +66,8 @@ struct flashsoftc { int sc_zonesize; }; -void flashattach __P((struct device *, struct device *, void *)); -int flashmatch __P((struct device *, void *, void *)); +void flashattach(struct device *, struct device *, void *); +int flashmatch(struct device *, void *, void *); struct cfattach flash_ca = { sizeof(struct flashsoftc), flashmatch, flashattach @@ -77,8 +77,8 @@ struct cfdriver flash_cd = { NULL, "flash", DV_DULL, 0 }; -int flashwritebyte __P((struct flashsoftc *sc, int addr, u_char val)); -int flasherasezone __P((struct flashsoftc *sc, int addr)); +int flashwritebyte(struct flashsoftc *sc, int addr, u_char val); +int flasherasezone(struct flashsoftc *sc, int addr); struct flashii intel_flashii[] = { { "28F008SA", FLII_INTEL_28F008SA, 1024*1024, 64*1024 }, diff --git a/sys/arch/mvme68k/dev/fooip.c b/sys/arch/mvme68k/dev/fooip.c index 4d27d78da48..4edd4024a01 100644 --- a/sys/arch/mvme68k/dev/fooip.c +++ b/sys/arch/mvme68k/dev/fooip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fooip.c,v 1.4 2000/03/26 23:31:59 deraadt Exp $ */ +/* $OpenBSD: fooip.c,v 1.5 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -64,8 +64,8 @@ struct fooipsoftc { struct fooipregs *sc_regs; }; -void fooipattach __P((struct device *, struct device *, void *)); -int fooipmatch __P((struct device *, void *, void *)); +void fooipattach(struct device *, struct device *, void *); +int fooipmatch(struct device *, void *, void *); struct cfattach fooip_ca = { sizeof(struct fooipsoftc), fooipmatch, fooipattach @@ -75,7 +75,7 @@ struct cfdriver fooip_cd = { NULL, "fooip", DV_DULL, 0 }; -int fooipintr __P((void *)); +int fooipintr(void *); int fooipmatch(parent, cf, args) diff --git a/sys/arch/mvme68k/dev/if_ie.c b/sys/arch/mvme68k/dev/if_ie.c index 81bb9908036..ed0eb95e9d0 100644 --- a/sys/arch/mvme68k/dev/if_ie.c +++ b/sys/arch/mvme68k/dev/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.17 2001/11/28 16:13:28 art Exp $ */ +/* $OpenBSD: if_ie.c,v 1.18 2002/03/14 01:26:37 millert Exp $ */ /*- * Copyright (c) 1999 Steve Murphree, Jr. @@ -185,9 +185,9 @@ struct ie_softc { void (*reset_596)(); /* card dependent reset function */ void (*chan_attn)(); /* card dependent attn function */ void (*run_596)(); /* card depenent "go on-line" function */ - void (*memcopy) __P((const void *, void *, u_int)); + void (*memcopy)(const void *, void *, u_int); /* card dependent memory copy function */ - void (*memzero) __P((void *, u_int)); + void (*memzero)(void *, u_int); /* card dependent memory zero function */ int want_mcsetup; /* mcsetup flag */ int promisc; /* are we in promisc mode? */ @@ -241,31 +241,31 @@ struct ie_softc { #endif }; -static void ie_obreset __P((struct ie_softc *)); -static void ie_obattend __P((struct ie_softc *)); -static void ie_obrun __P((struct ie_softc *)); - -void iewatchdog __P((struct ifnet *)); -int ieintr __P((void *)); -int iefailintr __P((void *)); -int ieinit __P((struct ie_softc *)); -int ieioctl __P((struct ifnet *, u_long, caddr_t)); -void iestart __P((struct ifnet *)); -void iereset __P((struct ie_softc *)); -static void ie_readframe __P((struct ie_softc *, int)); -static void ie_drop_packet_buffer __P((struct ie_softc *)); -static int command_and_wait __P((struct ie_softc *, int, - void volatile *, int)); -/*static*/ void ierint __P((struct ie_softc *)); -/*static*/ void ietint __P((struct ie_softc *)); -static int ieget __P((struct ie_softc *, struct mbuf **, - struct ether_header *, int *)); -static void setup_bufs __P((struct ie_softc *)); -static int mc_setup __P((struct ie_softc *, void *)); -static void mc_reset __P((struct ie_softc *)); +static void ie_obreset(struct ie_softc *); +static void ie_obattend(struct ie_softc *); +static void ie_obrun(struct ie_softc *); + +void iewatchdog(struct ifnet *); +int ieintr(void *); +int iefailintr(void *); +int ieinit(struct ie_softc *); +int ieioctl(struct ifnet *, u_long, caddr_t); +void iestart(struct ifnet *); +void iereset(struct ie_softc *); +static void ie_readframe(struct ie_softc *, int); +static void ie_drop_packet_buffer(struct ie_softc *); +static int command_and_wait(struct ie_softc *, int, + void volatile *, int); +/*static*/ void ierint(struct ie_softc *); +/*static*/ void ietint(struct ie_softc *); +static int ieget(struct ie_softc *, struct mbuf **, + struct ether_header *, int *); +static void setup_bufs(struct ie_softc *); +static int mc_setup(struct ie_softc *, void *); +static void mc_reset(struct ie_softc *); #ifdef IEDEBUG -void print_rbd __P((volatile struct ie_recv_buf_desc *)); +void print_rbd(volatile struct ie_recv_buf_desc *); int in_ierint = 0; int in_ietint = 0; diff --git a/sys/arch/mvme68k/dev/if_le.c b/sys/arch/mvme68k/dev/if_le.c index 23495ef9ac0..222888e9662 100644 --- a/sys/arch/mvme68k/dev/if_le.c +++ b/sys/arch/mvme68k/dev/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.16 2001/12/21 20:45:51 miod Exp $ */ +/* $OpenBSD: if_le.c,v 1.17 2002/03/14 01:26:37 millert Exp $ */ /*- * Copyright (c) 1982, 1992, 1993 @@ -80,10 +80,10 @@ struct cfattach le_ca = { static int lebustype; -hide void lewrcsr __P((struct am7990_softc *, u_int16_t, u_int16_t)); -hide u_int16_t lerdcsr __P((struct am7990_softc *, u_int16_t)); -hide void vlewrcsr __P((struct am7990_softc *, u_int16_t, u_int16_t)); -hide u_int16_t vlerdcsr __P((struct am7990_softc *, u_int16_t)); +hide void lewrcsr(struct am7990_softc *, u_int16_t, u_int16_t); +hide u_int16_t lerdcsr(struct am7990_softc *, u_int16_t); +hide void vlewrcsr(struct am7990_softc *, u_int16_t, u_int16_t); +hide u_int16_t vlerdcsr(struct am7990_softc *, u_int16_t); /* send command to the nvram controller */ nvram_cmd(sc, cmd, addr ) diff --git a/sys/arch/mvme68k/dev/ipic.c b/sys/arch/mvme68k/dev/ipic.c index 4681df759ae..a1ce3ab839d 100644 --- a/sys/arch/mvme68k/dev/ipic.c +++ b/sys/arch/mvme68k/dev/ipic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipic.c,v 1.7 2000/03/26 23:31:59 deraadt Exp $ */ +/* $OpenBSD: ipic.c,v 1.8 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -48,8 +48,8 @@ #include <mvme68k/dev/ipicreg.h> #include <mvme68k/dev/mcreg.h> -void ipicattach __P((struct device *, struct device *, void *)); -int ipicmatch __P((struct device *, void *, void *)); +void ipicattach(struct device *, struct device *, void *); +int ipicmatch(struct device *, void *, void *); struct cfattach ipic_ca = { sizeof(struct ipicsoftc), ipicmatch, ipicattach diff --git a/sys/arch/mvme68k/dev/lp.c b/sys/arch/mvme68k/dev/lp.c index 5b602af277f..f3970a0449d 100644 --- a/sys/arch/mvme68k/dev/lp.c +++ b/sys/arch/mvme68k/dev/lp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lp.c,v 1.4 2000/03/26 23:31:59 deraadt Exp $ */ +/* $OpenBSD: lp.c,v 1.5 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -53,8 +53,8 @@ struct lpsoftc { struct pccreg *sc_pcc; }; -void lpattach __P((struct device *, struct device *, void *)); -int lpmatch __P((struct device *, void *, void *)); +void lpattach(struct device *, struct device *, void *); +int lpmatch(struct device *, void *, void *); struct cfattach lp_ca = { sizeof(struct lpsoftc), lpmatch, lpattach @@ -64,7 +64,7 @@ struct cfdriver lp_cd = { NULL, "lp", DV_DULL, 0 }; -int lpintr __P((void *)); +int lpintr(void *); /* * a PCC chip always has an lp attached to it. diff --git a/sys/arch/mvme68k/dev/mc.c b/sys/arch/mvme68k/dev/mc.c index f0896d235df..7807912a998 100644 --- a/sys/arch/mvme68k/dev/mc.c +++ b/sys/arch/mvme68k/dev/mc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mc.c,v 1.8 2000/03/26 23:31:59 deraadt Exp $ */ +/* $OpenBSD: mc.c,v 1.9 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -60,9 +60,9 @@ struct mcsoftc { struct intrhand sc_nmiih; }; -void mcattach __P((struct device *, struct device *, void *)); -int mcmatch __P((struct device *, void *, void *)); -int mcabort __P((struct frame *)); +void mcattach(struct device *, struct device *, void *); +int mcmatch(struct device *, void *, void *); +int mcabort(struct frame *); struct cfattach mc_ca = { sizeof(struct mcsoftc), mcmatch, mcattach diff --git a/sys/arch/mvme68k/dev/mcreg.h b/sys/arch/mvme68k/dev/mcreg.h index cee26cb8764..d8dfb341833 100644 --- a/sys/arch/mvme68k/dev/mcreg.h +++ b/sys/arch/mvme68k/dev/mcreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mcreg.h,v 1.5 2000/01/29 04:11:25 smurph Exp $ */ +/* $OpenBSD: mcreg.h,v 1.6 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -169,8 +169,8 @@ extern struct mcreg *sys_mc; #define MC_VER_NOVME 0x02 #define MC_VER_33MHZ 0x01 -void mc_enableflashwrite __P((int on)); +void mc_enableflashwrite(int on); #define MC_ENAFLASHWRITE_OFFSET 0xcc000 #define MC_DISFLASHWRITE_OFFSET 0xc8000 -int mc_hasflash __P((void)); +int mc_hasflash(void); diff --git a/sys/arch/mvme68k/dev/memc.c b/sys/arch/mvme68k/dev/memc.c index 95cb3c38a6a..f4435780c3c 100644 --- a/sys/arch/mvme68k/dev/memc.c +++ b/sys/arch/mvme68k/dev/memc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: memc.c,v 1.5 2000/03/26 23:31:59 deraadt Exp $ */ +/* $OpenBSD: memc.c,v 1.6 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -61,8 +61,8 @@ struct memcsoftc { struct intrhand sc_ih; }; -void memcattach __P((struct device *, struct device *, void *)); -int memcmatch __P((struct device *, void *, void *)); +void memcattach(struct device *, struct device *, void *); +int memcmatch(struct device *, void *, void *); struct cfattach memc_ca = { sizeof(struct memcsoftc), memcmatch, memcattach @@ -72,7 +72,7 @@ struct cfdriver memc_cd = { NULL, "memc", DV_DULL, 0 }; -int memcintr __P((struct frame *frame)); +int memcintr(struct frame *frame); int memcmatch(parent, vcf, args) diff --git a/sys/arch/mvme68k/dev/nvram.c b/sys/arch/mvme68k/dev/nvram.c index fe17a557c75..82f0bbdd007 100644 --- a/sys/arch/mvme68k/dev/nvram.c +++ b/sys/arch/mvme68k/dev/nvram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nvram.c,v 1.8 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: nvram.c,v 1.9 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -58,8 +58,8 @@ struct nvramsoftc { struct clockreg *sc_regs; }; -void nvramattach __P((struct device *, struct device *, void *)); -int nvrammatch __P((struct device *, void *, void *)); +void nvramattach(struct device *, struct device *, void *); +int nvrammatch(struct device *, void *, void *); struct cfattach nvram_ca = { sizeof(struct nvramsoftc), nvrammatch, nvramattach diff --git a/sys/arch/mvme68k/dev/pcc.c b/sys/arch/mvme68k/dev/pcc.c index 63a5bc69556..ab823418723 100644 --- a/sys/arch/mvme68k/dev/pcc.c +++ b/sys/arch/mvme68k/dev/pcc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcc.c,v 1.6 2000/03/26 23:31:59 deraadt Exp $ */ +/* $OpenBSD: pcc.c,v 1.7 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -60,9 +60,9 @@ struct pccsoftc { struct intrhand sc_nmiih; }; -void pccattach __P((struct device *, struct device *, void *)); -int pccmatch __P((struct device *, void *, void *)); -int pccabort __P((struct frame *)); +void pccattach(struct device *, struct device *, void *); +int pccmatch(struct device *, void *, void *); +int pccabort(struct frame *); struct cfattach pcc_ca = { sizeof(struct pccsoftc), pccmatch, pccattach diff --git a/sys/arch/mvme68k/dev/pccreg.h b/sys/arch/mvme68k/dev/pccreg.h index a5b0a800f21..b434cea7032 100644 --- a/sys/arch/mvme68k/dev/pccreg.h +++ b/sys/arch/mvme68k/dev/pccreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pccreg.h,v 1.3 1996/04/28 11:03:27 deraadt Exp $ */ +/* $OpenBSD: pccreg.h,v 1.4 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -153,6 +153,6 @@ extern struct pccreg *sys_pcc; #define ZS1_PHYS_147 (INTIOBASE_147 + 0x3800) /* XXX */ -int pccintr_establish __P((int vec, struct intrhand *ih)); +int pccintr_establish(int vec, struct intrhand *ih); #define PCC_GENCTL_IEN 0x10 diff --git a/sys/arch/mvme68k/dev/pcctwo.c b/sys/arch/mvme68k/dev/pcctwo.c index 3a4dffb18e3..0b498bfcf7b 100644 --- a/sys/arch/mvme68k/dev/pcctwo.c +++ b/sys/arch/mvme68k/dev/pcctwo.c @@ -1,5 +1,5 @@ -/* $OpenBSD: pcctwo.c,v 1.7 2000/03/26 23:31:59 deraadt Exp $ */ +/* $OpenBSD: pcctwo.c,v 1.8 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -60,8 +60,8 @@ struct pcctwosoftc { struct pcctworeg *sc_pcc2; /* the actual registers */ }; -void pcctwoattach __P((struct device *, struct device *, void *)); -int pcctwomatch __P((struct device *, void *, void *)); +void pcctwoattach(struct device *, struct device *, void *); +int pcctwomatch(struct device *, void *, void *); struct cfattach pcctwo_ca = { sizeof(struct pcctwosoftc), pcctwomatch, pcctwoattach diff --git a/sys/arch/mvme68k/dev/sbic.c b/sys/arch/mvme68k/dev/sbic.c index 09f08311bdc..f396e4bc08b 100644 --- a/sys/arch/mvme68k/dev/sbic.c +++ b/sys/arch/mvme68k/dev/sbic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbic.c,v 1.8 2001/11/06 02:49:22 art Exp $ */ +/* $OpenBSD: sbic.c,v 1.9 2002/03/14 01:26:37 millert Exp $ */ /* $NetBSD: sbic.c,v 1.2 1996/04/23 16:32:54 chuck Exp $ */ /* @@ -91,28 +91,28 @@ extern u_int kvtop(); -int sbicicmd __P((struct sbic_softc *, void *, int, void *, int)); -int sbicgo __P((struct sbic_softc *, struct scsi_xfer *)); -int sbicdmaok __P((struct sbic_softc *, struct scsi_xfer *)); -int sbicwait __P((sbic_regmap_p, u_char, int , int)); -int sbiccheckdmap __P((void *, u_long, u_long)); -u_char sbicselectbus __P((struct sbic_softc *)); -int sbicxfout __P((sbic_regmap_p, int, void *)); -int sbicxfin __P((sbic_regmap_p, int, void *)); -int sbicfromscsiperiod __P((struct sbic_softc *, int)); -int sbictoscsiperiod __P((struct sbic_softc *, int)); -int sbicintr __P((struct sbic_softc *)); -int sbicpoll __P((struct sbic_softc *)); -int sbicnextstate __P((struct sbic_softc *, u_char, u_char)); -int sbicmsgin __P((struct sbic_softc *)); -int sbicabort __P((struct sbic_softc *, char *)); -void sbicxfdone __P((struct sbic_softc *)); -void sbicerror __P((struct sbic_softc *,u_char)); -void sbicreset __P((struct sbic_softc *)); -void sbic_scsidone __P((struct sbic_acb *, int)); -void sbic_sched __P((struct sbic_softc *)); -void sbic_save_ptrs __P((struct sbic_softc *)); -void sbic_load_ptrs __P((struct sbic_softc *)); +int sbicicmd(struct sbic_softc *, void *, int, void *, int); +int sbicgo(struct sbic_softc *, struct scsi_xfer *); +int sbicdmaok(struct sbic_softc *, struct scsi_xfer *); +int sbicwait(sbic_regmap_p, u_char, int , int); +int sbiccheckdmap(void *, u_long, u_long); +u_char sbicselectbus(struct sbic_softc *); +int sbicxfout(sbic_regmap_p, int, void *); +int sbicxfin(sbic_regmap_p, int, void *); +int sbicfromscsiperiod(struct sbic_softc *, int); +int sbictoscsiperiod(struct sbic_softc *, int); +int sbicintr(struct sbic_softc *); +int sbicpoll(struct sbic_softc *); +int sbicnextstate(struct sbic_softc *, u_char, u_char); +int sbicmsgin(struct sbic_softc *); +int sbicabort(struct sbic_softc *, char *); +void sbicxfdone(struct sbic_softc *); +void sbicerror(struct sbic_softc *,u_char); +void sbicreset(struct sbic_softc *); +void sbic_scsidone(struct sbic_acb *, int); +void sbic_sched(struct sbic_softc *); +void sbic_save_ptrs(struct sbic_softc *); +void sbic_load_ptrs(struct sbic_softc *); /* * Synch xfer parameters, and timing conversions @@ -149,7 +149,7 @@ int reselect_debug = 0; /* Debug all reselection related things */ int report_sense = 0; /* Always print Sense information */ int data_pointer_debug = 0; /* Debug Data Pointer related things */ -void sbictimeout __P((struct sbic_softc *dev)); +void sbictimeout(struct sbic_softc *dev); #else #define QPRINTF(a) /* */ diff --git a/sys/arch/mvme68k/dev/sbicdma.c b/sys/arch/mvme68k/dev/sbicdma.c index 8d7bdeff949..8ade6085da1 100644 --- a/sys/arch/mvme68k/dev/sbicdma.c +++ b/sys/arch/mvme68k/dev/sbicdma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbicdma.c,v 1.6 2001/11/06 19:53:15 miod Exp $ */ +/* $OpenBSD: sbicdma.c,v 1.7 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -54,16 +54,16 @@ #include <mvme68k/dev/sbicvar.h> #include <mvme68k/dev/dmavar.h> -void sbicdmaattach __P((struct device *, struct device *, void *)); -int sbicdmamatch __P((struct device *, void *, void *)); -int sbicdmaprint __P((void *auxp, const char *)); +void sbicdmaattach(struct device *, struct device *, void *); +int sbicdmamatch(struct device *, void *, void *); +int sbicdmaprint(void *auxp, const char *); -void sbicdma_dmafree __P((struct sbic_softc *)); -void sbicdma_dmastop __P((struct sbic_softc *)); -int sbicdma_dmanext __P((struct sbic_softc *)); -int sbicdma_dmago __P((struct sbic_softc *, char *, int, int)); -int sbicdma_dmaintr __P((struct sbic_softc *)); -int sbicdma_scintr __P((struct sbic_softc *)); +void sbicdma_dmafree(struct sbic_softc *); +void sbicdma_dmastop(struct sbic_softc *); +int sbicdma_dmanext(struct sbic_softc *); +int sbicdma_dmago(struct sbic_softc *, char *, int, int); +int sbicdma_dmaintr(struct sbic_softc *); +int sbicdma_scintr(struct sbic_softc *); struct scsi_adapter sbicdma_scsiswitch = { sbic_scsicmd, diff --git a/sys/arch/mvme68k/dev/sbicvar.h b/sys/arch/mvme68k/dev/sbicvar.h index 02f50b1e892..d0668ca6f69 100644 --- a/sys/arch/mvme68k/dev/sbicvar.h +++ b/sys/arch/mvme68k/dev/sbicvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sbicvar.h,v 1.4 2001/01/25 03:50:48 todd Exp $ */ +/* $OpenBSD: sbicvar.h,v 1.5 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -128,10 +128,10 @@ struct sbic_softc { #endif struct dma_chain *sc_cur; struct dma_chain *sc_last; - int (*sc_dmago) __P((struct sbic_softc *, char *, int, int)); - int (*sc_dmanext) __P((struct sbic_softc *)); - void (*sc_enintr) __P((struct sbic_softc *)); - void (*sc_dmastop) __P((struct sbic_softc *)); + int (*sc_dmago)(struct sbic_softc *, char *, int, int); + int (*sc_dmanext)(struct sbic_softc *); + void (*sc_enintr)(struct sbic_softc *); + void (*sc_dmastop)(struct sbic_softc *); }; /* @@ -201,7 +201,7 @@ struct sbic_softc { struct buf; struct scsi_xfer; -void sbic_minphys __P((struct buf *bp)); -int sbic_scsicmd __P((struct scsi_xfer *)); +void sbic_minphys(struct buf *bp); +int sbic_scsicmd(struct scsi_xfer *); #endif /* _SBICVAR_H_ */ diff --git a/sys/arch/mvme68k/dev/sram.c b/sys/arch/mvme68k/dev/sram.c index 97145cb2582..a06cdf4f2b7 100644 --- a/sys/arch/mvme68k/dev/sram.c +++ b/sys/arch/mvme68k/dev/sram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sram.c,v 1.7 2001/11/06 19:53:15 miod Exp $ */ +/* $OpenBSD: sram.c,v 1.8 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -59,8 +59,8 @@ struct sramsoftc { int sc_len; }; -void sramattach __P((struct device *, struct device *, void *)); -int srammatch __P((struct device *, void *, void *)); +void sramattach(struct device *, struct device *, void *); +int srammatch(struct device *, void *, void *); struct cfattach sram_ca = { sizeof(struct sramsoftc), srammatch, sramattach diff --git a/sys/arch/mvme68k/dev/ssh.c b/sys/arch/mvme68k/dev/ssh.c index 27330ad4df4..ef574286139 100644 --- a/sys/arch/mvme68k/dev/ssh.c +++ b/sys/arch/mvme68k/dev/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.1 2001/02/18 17:41:08 deraadt Exp $ */ +/* $OpenBSD: ssh.c,v 1.2 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1994 Michael L. Hitch @@ -66,16 +66,16 @@ extern u_int kvtop(); #define SCSI_DATA_WAIT 500000 /* wait per data in/out step */ #define SCSI_INIT_WAIT 500000 /* wait per step (both) during init */ -void ssh_select __P((struct ssh_softc *)); -void sshabort __P((struct ssh_softc *, ssh_regmap_p, char *)); -void ssherror __P((struct ssh_softc *, ssh_regmap_p, u_char)); -void sshstart __P((struct ssh_softc *)); -void sshreset __P((struct ssh_softc *)); -void sshsetdelay __P((int)); -void ssh_scsidone __P((struct ssh_acb *, int)); -void ssh_sched __P((struct ssh_softc *)); -int ssh_poll __P((struct ssh_softc *, struct ssh_acb *)); -int sshintr __P((struct ssh_softc *)); +void ssh_select(struct ssh_softc *); +void sshabort(struct ssh_softc *, ssh_regmap_p, char *); +void ssherror(struct ssh_softc *, ssh_regmap_p, u_char); +void sshstart(struct ssh_softc *); +void sshreset(struct ssh_softc *); +void sshsetdelay(int); +void ssh_scsidone(struct ssh_acb *, int); +void ssh_sched(struct ssh_softc *); +int ssh_poll(struct ssh_softc *, struct ssh_acb *); +int sshintr(struct ssh_softc *); /* 53C710 script */ const diff --git a/sys/arch/mvme68k/dev/sshdma.c b/sys/arch/mvme68k/dev/sshdma.c index 76155df4de8..fcb2ad66bfe 100644 --- a/sys/arch/mvme68k/dev/sshdma.c +++ b/sys/arch/mvme68k/dev/sshdma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshdma.c,v 1.1 2001/02/18 17:41:09 deraadt Exp $ */ +/* $OpenBSD: sshdma.c,v 1.2 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -57,11 +57,11 @@ #include <mvme68k/dev/pcctworeg.h> #endif -int afscmatch __P((struct device *, void *, void *)); -void afscattach __P((struct device *, struct device *, void *)); +int afscmatch(struct device *, void *, void *); +void afscattach(struct device *, struct device *, void *); -int sshintr __P((struct ssh_softc *)); -int afsc_dmaintr __P((struct ssh_softc *)); +int sshintr(struct ssh_softc *); +int afsc_dmaintr(struct ssh_softc *); struct scsi_adapter afsc_scsiswitch = { ssh_scsicmd, diff --git a/sys/arch/mvme68k/dev/sshvar.h b/sys/arch/mvme68k/dev/sshvar.h index 7f4dfac4924..b05426252f6 100644 --- a/sys/arch/mvme68k/dev/sshvar.h +++ b/sys/arch/mvme68k/dev/sshvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sshvar.h,v 1.1 2001/02/18 17:41:09 deraadt Exp $ */ +/* $OpenBSD: sshvar.h,v 1.2 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -197,7 +197,7 @@ struct ssh_softc { #define STS_INTERMED 0x10 /* Intermediate status sent */ #define STS_EXT 0x80 /* Extended status valid */ -void ssh_minphys __P((struct buf *bp)); -int ssh_scsicmd __P((struct scsi_xfer *)); +void ssh_minphys(struct buf *bp); +int ssh_scsicmd(struct scsi_xfer *); #endif /* _SSHVAR_H */ diff --git a/sys/arch/mvme68k/dev/vme.c b/sys/arch/mvme68k/dev/vme.c index 44eb3f287f7..df63dd35f15 100644 --- a/sys/arch/mvme68k/dev/vme.c +++ b/sys/arch/mvme68k/dev/vme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vme.c,v 1.11 2000/03/26 23:31:59 deraadt Exp $ */ +/* $OpenBSD: vme.c,v 1.12 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -62,13 +62,13 @@ #include <mvme68k/dev/pcctworeg.h> #endif -int vmematch __P((struct device *, void *, void *)); -void vmeattach __P((struct device *, struct device *, void *)); +int vmematch(struct device *, void *, void *); +void vmeattach(struct device *, struct device *, void *); -int vme1chip_init __P((struct vmesoftc *sc)); -int vme2chip_init __P((struct vmesoftc *sc)); -u_long vme2chip_map __P((u_long base, int len, int dwidth)); -int vme2abort __P((struct frame *frame)); +int vme1chip_init(struct vmesoftc *sc); +int vme2chip_init(struct vmesoftc *sc); +u_long vme2chip_map(u_long base, int len, int dwidth); +int vme2abort(struct frame *frame); static int vmebustype; diff --git a/sys/arch/mvme68k/dev/vme.h b/sys/arch/mvme68k/dev/vme.h index 32cdaa4aa45..8fd737e1be9 100644 --- a/sys/arch/mvme68k/dev/vme.h +++ b/sys/arch/mvme68k/dev/vme.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vme.h,v 1.6 1999/09/27 20:30:31 smurph Exp $ */ +/* $OpenBSD: vme.h,v 1.7 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -333,8 +333,8 @@ struct vme2reg { #define VME2_A16BASE 0xffff0000UL #define VME2_A24BASE 0xff000000UL -void * vmepmap __P((struct vmesoftc *sc, void * vmeaddr, int len, - int bustype)); -void * vmemap __P((struct vmesoftc *sc, void * vmeaddr, int len, - int bustype)); -int vmerw __P((struct vmesoftc *sc, struct uio *uio, int flags, int bus)); +void * vmepmap(struct vmesoftc *sc, void * vmeaddr, int len, + int bustype); +void * vmemap(struct vmesoftc *sc, void * vmeaddr, int len, + int bustype); +int vmerw(struct vmesoftc *sc, struct uio *uio, int flags, int bus); diff --git a/sys/arch/mvme68k/dev/vmel.c b/sys/arch/mvme68k/dev/vmel.c index b27ccdec6c1..aeec0bc86da 100644 --- a/sys/arch/mvme68k/dev/vmel.c +++ b/sys/arch/mvme68k/dev/vmel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmel.c,v 1.7 2001/11/05 19:45:34 art Exp $ */ +/* $OpenBSD: vmel.c,v 1.8 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -48,8 +48,8 @@ * functions will decide how many address bits are relevant. */ -void vmelattach __P((struct device *, struct device *, void *)); -int vmelmatch __P((struct device *, void *, void *)); +void vmelattach(struct device *, struct device *, void *); +int vmelmatch(struct device *, void *, void *); struct cfattach vmel_ca = { sizeof(struct vmelsoftc), vmelmatch, vmelattach diff --git a/sys/arch/mvme68k/dev/vmes.c b/sys/arch/mvme68k/dev/vmes.c index ff97ad2831f..635dfe03c05 100644 --- a/sys/arch/mvme68k/dev/vmes.c +++ b/sys/arch/mvme68k/dev/vmes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmes.c,v 1.8 2001/11/05 19:45:34 art Exp $ */ +/* $OpenBSD: vmes.c,v 1.9 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -48,8 +48,8 @@ * functions will decide how many address bits are relevant. */ -void vmesattach __P((struct device *, struct device *, void *)); -int vmesmatch __P((struct device *, void *, void *)); +void vmesattach(struct device *, struct device *, void *); +int vmesmatch(struct device *, void *, void *); struct cfattach vmes_ca = { sizeof(struct vmessoftc), vmesmatch, vmesattach diff --git a/sys/arch/mvme68k/dev/vs.c b/sys/arch/mvme68k/dev/vs.c index b28ef4ca9ba..d7330d66b7b 100644 --- a/sys/arch/mvme68k/dev/vs.c +++ b/sys/arch/mvme68k/dev/vs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vs.c,v 1.6 2001/11/06 00:30:38 art Exp $ */ +/* $OpenBSD: vs.c,v 1.7 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. @@ -66,16 +66,16 @@ #include <mvme68k/dev/vsvar.h> #endif -int vs_checkintr __P((struct vs_softc *, struct scsi_xfer *, int *)); -int vs_chksense __P((struct scsi_xfer *)); -void vs_reset __P((struct vs_softc *)); -void vs_resync __P((struct vs_softc *)); -void vs_initialize __P((struct vs_softc *)); -int vs_intr __P((struct vs_softc *)); -int vs_poll __P((struct vs_softc *, struct scsi_xfer *)); -void vs_scsidone __P((struct scsi_xfer *, int)); -M328_CQE * vs_getcqe __P((struct vs_softc *)); -M328_IOPB * vs_getiopb __P((struct vs_softc *)); +int vs_checkintr(struct vs_softc *, struct scsi_xfer *, int *); +int vs_chksense(struct scsi_xfer *); +void vs_reset(struct vs_softc *); +void vs_resync(struct vs_softc *); +void vs_initialize(struct vs_softc *); +int vs_intr(struct vs_softc *); +int vs_poll(struct vs_softc *, struct scsi_xfer *); +void vs_scsidone(struct scsi_xfer *, int); +M328_CQE * vs_getcqe(struct vs_softc *); +M328_IOPB * vs_getiopb(struct vs_softc *); extern u_int kvtop(); /* diff --git a/sys/arch/mvme68k/dev/vsdma.c b/sys/arch/mvme68k/dev/vsdma.c index 5c0979d859d..68ca1a7279b 100644 --- a/sys/arch/mvme68k/dev/vsdma.c +++ b/sys/arch/mvme68k/dev/vsdma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vsdma.c,v 1.3 2001/06/26 21:35:39 miod Exp $ */ +/* $OpenBSD: vsdma.c,v 1.4 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * All rights reserved. @@ -57,13 +57,13 @@ #include <mvme68k/dev/vme.h> #endif -int vsmatch __P((struct device *, void *, void *)); -void vsattach __P((struct device *, struct device *, void *)); -int vsprint __P((void *auxp, char *)); -void vs_initialize __P((struct vs_softc *)); -int vs_intr __P((struct vs_softc *)); -int vs_nintr __P((struct vs_softc *)); -int vs_eintr __P((struct vs_softc *)); +int vsmatch(struct device *, void *, void *); +void vsattach(struct device *, struct device *, void *); +int vsprint(void *auxp, char *); +void vs_initialize(struct vs_softc *); +int vs_intr(struct vs_softc *); +int vs_nintr(struct vs_softc *); +int vs_eintr(struct vs_softc *); struct scsi_adapter vs_scsiswitch = { vs_scsicmd, diff --git a/sys/arch/mvme68k/dev/vsreg.h b/sys/arch/mvme68k/dev/vsreg.h index 299e0203949..1852fe03e18 100644 --- a/sys/arch/mvme68k/dev/vsreg.h +++ b/sys/arch/mvme68k/dev/vsreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vsreg.h,v 1.2 2000/06/10 19:53:23 deraadt Exp $ */ +/* $OpenBSD: vsreg.h,v 1.3 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * Copyright (c) 1990 The Regents of the University of California. @@ -743,14 +743,14 @@ typedef struct ipsg * Scatter/gather functions */ -M328_SG vs_alloc_scatter_gather __P((void)); -void vs_dealloc_scatter_gather __P((M328_SG sg)); -void vs_link_scatter_gather_element __P((sg_list_element_t *element, +M328_SG vs_alloc_scatter_gather(void); +void vs_dealloc_scatter_gather(M328_SG sg); +void vs_link_scatter_gather_element(sg_list_element_t *element, register vm_offset_t phys_add, - register int len)); -void vs_link_scatter_gather_list __P((sg_list_element_t *list, + register int len); +void vs_link_scatter_gather_list(sg_list_element_t *list, register vm_offset_t phys_add, - register int elements)); -M328_SG vs_build_memory_structure __P((struct scsi_xfer *xs, M328_IOPB *iopb)); + register int elements); +M328_SG vs_build_memory_structure(struct scsi_xfer *xs, M328_IOPB *iopb); #endif /* _M328REG_H_ */ diff --git a/sys/arch/mvme68k/dev/vsvar.h b/sys/arch/mvme68k/dev/vsvar.h index b72a86cf4e9..0863e66302e 100644 --- a/sys/arch/mvme68k/dev/vsvar.h +++ b/sys/arch/mvme68k/dev/vsvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vsvar.h,v 1.1 2000/01/25 04:18:18 smurph Exp $ */ +/* $OpenBSD: vsvar.h,v 1.2 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * Copyright (c) 1990 The Regents of the University of California. @@ -126,7 +126,7 @@ struct vs_softc { #define WQO_RFWQ 0x0020 /* report frozen work queue bit */ #define WQO_INIT 0x8000 /* work queue init bit */ -void vs_minphys __P((struct buf *bp)); -int vs_scsicmd __P((struct scsi_xfer *)); +void vs_minphys(struct buf *bp); +int vs_scsicmd(struct scsi_xfer *); #endif /* _M328VAR_H */ diff --git a/sys/arch/mvme68k/dev/wdsc.c b/sys/arch/mvme68k/dev/wdsc.c index ed207c95e40..407e761620c 100644 --- a/sys/arch/mvme68k/dev/wdsc.c +++ b/sys/arch/mvme68k/dev/wdsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdsc.c,v 1.5 1997/01/28 10:54:10 deraadt Exp $ */ +/* $OpenBSD: wdsc.c,v 1.6 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1996 Steve Woodford @@ -48,15 +48,15 @@ #include <machine/autoconf.h> #include <mvme68k/dev/pccreg.h> -void wdscattach __P((struct device *, struct device *, void *)); -int wdscmatch __P((struct device *, struct cfdata *, void *)); +void wdscattach(struct device *, struct device *, void *); +int wdscmatch(struct device *, struct cfdata *, void *); -void wdsc_enintr __P((struct sbic_softc *)); -int wdsc_dmago __P((struct sbic_softc *, char *, int, int)); -int wdsc_dmanext __P((struct sbic_softc *)); -void wdsc_dmastop __P((struct sbic_softc *)); -int wdsc_dmaintr __P((struct sbic_softc *)); -int wdsc_scsiintr __P((struct sbic_softc *)); +void wdsc_enintr(struct sbic_softc *); +int wdsc_dmago(struct sbic_softc *, char *, int, int); +int wdsc_dmanext(struct sbic_softc *); +void wdsc_dmastop(struct sbic_softc *); +int wdsc_dmaintr(struct sbic_softc *); +int wdsc_scsiintr(struct sbic_softc *); struct scsi_adapter wdsc_scsiswitch = { sbic_scsicmd, diff --git a/sys/arch/mvme68k/dev/wl.c b/sys/arch/mvme68k/dev/wl.c index dbfd421bf43..8a5638cea2d 100644 --- a/sys/arch/mvme68k/dev/wl.c +++ b/sys/arch/mvme68k/dev/wl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wl.c,v 1.6 2002/02/15 20:45:30 nordin Exp $ */ +/* $OpenBSD: wl.c,v 1.7 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Dale Rahn. All rights reserved. @@ -165,38 +165,38 @@ struct { }; /* prototypes */ -u_char cl_clkdiv __P((int speed)); -u_char cl_clknum __P((int speed)); -u_char cl_clkrxtimeout __P((int speed)); -void clstart __P((struct tty *tp)); -void cl_unblock __P((struct tty *tp)); -int clccparam __P((struct wlsoftc *sc, struct termios *par, int channel)); - -int clparam __P((struct tty *tp, struct termios *t)); -int cl_intr __P((struct wlsoftc *sc, int)); -int cl_mintr __P((struct wlsoftc *sc)); -int cl_txintr __P((struct wlsoftc *sc)); -int cl_rxintr __P((struct wlsoftc *sc)); -void cl_overflow __P((struct wlsoftc *sc, int channel, long *ptime, u_char *msg)); -void cl_parity __P((struct wlsoftc *sc, int channel)); -void cl_frame __P((struct wlsoftc *sc, int channel)); -void cl_break __P(( struct wlsoftc *sc, int channel)); -int clmctl __P((dev_t dev, int bits, int how)); -void cl_dumpport __P((int channel)); - -int wlprobe __P((struct device *parent, void *self, void *aux)); -void wlattach __P((struct device *parent, struct device *self, void *aux)); - -int wlopen __P((dev_t dev, int flag, int mode, struct proc *p)); -int wlclose __P((dev_t dev, int flag, int mode, struct proc *p)); -int wlread __P((dev_t dev, struct uio *uio, int flag)); -int wlwrite __P((dev_t dev, struct uio *uio, int flag)); -int wlioctl __P((dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)); -int wlstop __P((struct tty *tp, int flag)); - -static void cl_initchannel __P((struct wlsoftc *sc, int channel)); -static void clputc __P((struct wlsoftc *sc, int unit, u_char c)); -static u_char clgetc __P((struct wlsoftc *sc, int *channel)); +u_char cl_clkdiv(int speed); +u_char cl_clknum(int speed); +u_char cl_clkrxtimeout(int speed); +void clstart(struct tty *tp); +void cl_unblock(struct tty *tp); +int clccparam(struct wlsoftc *sc, struct termios *par, int channel); + +int clparam(struct tty *tp, struct termios *t); +int cl_intr(struct wlsoftc *sc, int); +int cl_mintr(struct wlsoftc *sc); +int cl_txintr(struct wlsoftc *sc); +int cl_rxintr(struct wlsoftc *sc); +void cl_overflow(struct wlsoftc *sc, int channel, long *ptime, u_char *msg); +void cl_parity(struct wlsoftc *sc, int channel); +void cl_frame(struct wlsoftc *sc, int channel); +void cl_break( struct wlsoftc *sc, int channel); +int clmctl(dev_t dev, int bits, int how); +void cl_dumpport(int channel); + +int wlprobe(struct device *parent, void *self, void *aux); +void wlattach(struct device *parent, struct device *self, void *aux); + +int wlopen(dev_t dev, int flag, int mode, struct proc *p); +int wlclose(dev_t dev, int flag, int mode, struct proc *p); +int wlread(dev_t dev, struct uio *uio, int flag); +int wlwrite(dev_t dev, struct uio *uio, int flag); +int wlioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p); +int wlstop(struct tty *tp, int flag); + +static void cl_initchannel(struct wlsoftc *sc, int channel); +static void clputc(struct wlsoftc *sc, int unit, u_char c); +static u_char clgetc(struct wlsoftc *sc, int *channel); static void cloutput __P( (struct tty *tp)); struct cfattach wl_ca = { diff --git a/sys/arch/mvme68k/dev/zs.c b/sys/arch/mvme68k/dev/zs.c index 9dcb9a31e77..1d2dc73a241 100644 --- a/sys/arch/mvme68k/dev/zs.c +++ b/sys/arch/mvme68k/dev/zs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zs.c,v 1.9 2000/03/26 23:31:59 deraadt Exp $ */ +/* $OpenBSD: zs.c,v 1.10 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 2000 Steve Murphree, Jr. @@ -130,16 +130,16 @@ int zs_cons_unit = 0; int zs_is_console = 0; struct sccregs *zs_cons_scc; -int zsopen __P((dev_t, int, int, struct proc *)); -void zsstart __P((struct tty *)); -int zsparam __P((struct tty *, struct termios *)); -int zsirq __P((int unit)); -int zsregs __P((void *va, int unit, volatile u_char **crp, - volatile u_char **drp)); -int zspclk __P((void)); +int zsopen(dev_t, int, int, struct proc *); +void zsstart(struct tty *); +int zsparam(struct tty *, struct termios *); +int zsirq(int unit); +int zsregs(void *va, int unit, volatile u_char **crp, + volatile u_char **drp); +int zspclk(void); u_long sir_zs; -void zs_softint __P((void)); +void zs_softint(void); #define zsunit(dev) (minor(dev) >> 1) #define zsside(dev) (minor(dev) & 1) @@ -147,8 +147,8 @@ void zs_softint __P((void)); /* * Autoconfiguration stuff. */ -void zsattach __P((struct device *, struct device *, void *)); -int zsmatch __P((struct device *, void *, void *)); +void zsattach(struct device *, struct device *, void *); +int zsmatch(struct device *, void *, void *); struct cfattach zs_ca = { sizeof(struct zssoftc), zsmatch, zsattach diff --git a/sys/arch/mvme68k/include/autoconf.h b/sys/arch/mvme68k/include/autoconf.h index 1249e5122b1..55ce4ad0615 100644 --- a/sys/arch/mvme68k/include/autoconf.h +++ b/sys/arch/mvme68k/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.6 1997/03/31 00:23:58 downsj Exp $ */ +/* $OpenBSD: autoconf.h,v 1.7 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -66,7 +66,7 @@ struct device *bootdv; /* boot device */ /* PARTITIONSHIFT from disklabel.h */ #define PARTITIONMASK ((1 << PARTITIONSHIFT) - 1) -void *mapiodev __P((void *pa, int size)); -void unmapiodev __P((void *kva, int size)); +void *mapiodev(void *pa, int size); +void unmapiodev(void *kva, int size); #endif diff --git a/sys/arch/mvme68k/include/cpu.h b/sys/arch/mvme68k/include/cpu.h index ff6d0b519ce..6c0c985301a 100644 --- a/sys/arch/mvme68k/include/cpu.h +++ b/sys/arch/mvme68k/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.7 2000/01/06 03:21:43 smurph Exp $ */ +/* $OpenBSD: cpu.h,v 1.8 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -271,7 +271,7 @@ struct intrhand { struct haltvec { struct haltvec *hv_next; - void (*hv_fn) __P((void)); + void (*hv_fn)(void); int hv_pri; }; #endif diff --git a/sys/arch/mvme68k/include/hpux_machdep.h b/sys/arch/mvme68k/include/hpux_machdep.h index e9133eb543f..6ca49ae126d 100644 --- a/sys/arch/mvme68k/include/hpux_machdep.h +++ b/sys/arch/mvme68k/include/hpux_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hpux_machdep.h,v 1.1 1997/03/31 00:24:02 downsj Exp $ */ +/* $OpenBSD: hpux_machdep.h,v 1.2 2002/03/14 01:26:37 millert Exp $ */ /* $NetBSD: hpux_machdep.h,v 1.6 1997/03/16 10:02:40 thorpej Exp $ */ /*- @@ -66,15 +66,15 @@ struct hpuxsigcontext { int _hsc_ap; /* pointer to hpuxsigstate */ }; -int hpux_cpu_makecmds __P((struct proc *, struct exec_package *)); -int hpux_cpu_vmcmd __P((struct proc *, struct exec_vmcmd *)); -void hpux_cpu_bsd_to_hpux_stat __P((struct stat *, struct hpux_stat *)); -void hpux_cpu_uname __P((struct hpux_utsname *)); -int hpux_cpu_sysconf_arch __P((void)); -int hpux_to_bsd_uoff __P((int *, int *, struct proc *)); +int hpux_cpu_makecmds(struct proc *, struct exec_package *); +int hpux_cpu_vmcmd(struct proc *, struct exec_vmcmd *); +void hpux_cpu_bsd_to_hpux_stat(struct stat *, struct hpux_stat *); +void hpux_cpu_uname(struct hpux_utsname *); +int hpux_cpu_sysconf_arch(void); +int hpux_to_bsd_uoff(int *, int *, struct proc *); -void hpux_sendsig __P((sig_t, int, int, u_long, int, union sigval)); -void hpux_setregs __P((struct proc *, struct exec_package *, - u_long, register_t *)); +void hpux_sendsig(sig_t, int, int, u_long, int, union sigval); +void hpux_setregs(struct proc *, struct exec_package *, + u_long, register_t *); #endif /* ! _MVME68K_HPUX_MACHDEP_H_ */ diff --git a/sys/arch/mvme68k/include/intr.h b/sys/arch/mvme68k/include/intr.h index 2045e781344..cd0c173bb3d 100644 --- a/sys/arch/mvme68k/include/intr.h +++ b/sys/arch/mvme68k/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.4 2001/11/23 00:47:46 miod Exp $ */ +/* $OpenBSD: intr.h,v 1.5 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (C) 2000 Steve Murphree, Jr. * All rights reserved. @@ -78,6 +78,6 @@ u_long allocate_sir __P((void (*proc)(), void *arg)); #define splx(s) (s & PSL_IPL ? _spl(s) : spl0()) /* locore.s */ -int spl0 __P((void)); +int spl0(void); #endif /* _KERNEL */ #endif /* _MVME68K_INTR_H_ */ diff --git a/sys/arch/mvme68k/include/pmap.h b/sys/arch/mvme68k/include/pmap.h index 9e32d5ed681..5ce273cca92 100644 --- a/sys/arch/mvme68k/include/pmap.h +++ b/sys/arch/mvme68k/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.11 2002/02/22 22:45:34 miod Exp $ */ +/* $OpenBSD: pmap.h,v 1.12 2002/03/14 01:26:37 millert Exp $ */ #ifndef _MACHINE_PMAP_H_ #define _MACHINE_PMAP_H_ @@ -6,7 +6,7 @@ #include <m68k/pmap_motorola.h> #ifdef _KERNEL -void pmap_init_md __P((void)); +void pmap_init_md(void); #define PMAP_INIT_MD() pmap_init_md() #endif diff --git a/sys/arch/mvme68k/mvme68k/autoconf.c b/sys/arch/mvme68k/mvme68k/autoconf.c index 1c9b954cf1c..917b53ace88 100644 --- a/sys/arch/mvme68k/mvme68k/autoconf.c +++ b/sys/arch/mvme68k/mvme68k/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.16 2002/01/16 23:19:31 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.17 2002/03/14 01:26:38 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -96,8 +96,8 @@ #include <machine/cpu.h> #include <machine/pte.h> -struct device *parsedisk __P((char *, int, int, dev_t *)); -void setroot __P((void)); +struct device *parsedisk(char *, int, int, dev_t *); +void setroot(void); /* * XXX some storage space must be allocated statically because of @@ -108,8 +108,8 @@ char extiospace[EXTENT_FIXED_STORAGE_SIZE(EIOMAPSIZE / 16)]; struct extent *extio; extern void *extiobase; -void mainbus_attach __P((struct device *, struct device *, void *)); -int mainbus_match __P((struct device *, void *, void *)); +void mainbus_attach(struct device *, struct device *, void *); +int mainbus_match(struct device *, void *, void *); struct cfattach mainbus_ca = { sizeof(struct device), mainbus_match, mainbus_attach diff --git a/sys/arch/mvme68k/mvme68k/disksubr.c b/sys/arch/mvme68k/mvme68k/disksubr.c index 23100c3b853..68ba803851b 100644 --- a/sys/arch/mvme68k/mvme68k/disksubr.c +++ b/sys/arch/mvme68k/mvme68k/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.23 2001/08/06 20:45:07 miod Exp $ */ +/* $OpenBSD: disksubr.c,v 1.24 2002/03/14 01:26:38 millert Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1995 Dale Rahn. @@ -48,14 +48,14 @@ int disksubr_debug = 0; #endif -static void bsdtocpulabel __P((struct disklabel *lp, - struct cpu_disklabel *clp)); -static void cputobsdlabel __P((struct disklabel *lp, - struct cpu_disklabel *clp)); +static void bsdtocpulabel(struct disklabel *lp, + struct cpu_disklabel *clp); +static void cputobsdlabel(struct disklabel *lp, + struct cpu_disklabel *clp); #ifdef DEBUG -static void printlp __P((struct disklabel *lp, char *str)); -static void printclp __P((struct cpu_disklabel *clp, char *str)); +static void printlp(struct disklabel *lp, char *str); +static void printclp(struct cpu_disklabel *clp, char *str); #endif void @@ -113,7 +113,7 @@ dk_establish(dk, dev) char * readdisklabel(dev, strat, lp, clp, spoofonly) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *clp; int spoofonly; diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c index 75812cb0b4b..f1204e95efa 100644 --- a/sys/arch/mvme68k/mvme68k/machdep.c +++ b/sys/arch/mvme68k/mvme68k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.64 2002/01/23 17:51:52 art Exp $ */ +/* $OpenBSD: machdep.c,v 1.65 2002/03/14 01:26:38 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -162,11 +162,11 @@ extern struct emul emul_sunos; * XXX this is to fake out the console routines, while * booting. New and improved! :-) smurph */ -void bootcnprobe __P((struct consdev *)); -void bootcninit __P((struct consdev *)); -void bootcnputc __P((dev_t, int)); -int bootcngetc __P((dev_t)); -extern void nullcnpollc __P((dev_t, int)); +void bootcnprobe(struct consdev *); +void bootcninit(struct consdev *); +void bootcnputc(dev_t, int); +int bootcngetc(dev_t); +extern void nullcnpollc(dev_t, int); #define bootcnpollc nullcnpollc @@ -622,7 +622,7 @@ static struct haltvec *halts; /* XXX insert by priority */ void halt_establish(fn, pri) - void (*fn) __P((void)); + void (*fn)(void); int pri; { struct haltvec *hv, *h; @@ -787,7 +787,7 @@ dumpsys() int psize; daddr_t blkno; /* current block to write */ /* dump routine */ - int (*dump) __P((dev_t, daddr_t, caddr_t, size_t)); + int (*dump)(dev_t, daddr_t, caddr_t, size_t); int pg; /* page being dumped */ paddr_t maddr; /* PA being dumped */ int error; /* error code from (*dump)() */ @@ -904,7 +904,7 @@ int m68060_pcr_init = 0x21; /* make this patchable */ void initvectors() { - typedef void trapfun __P((void)); + typedef void trapfun(void); /* XXX should init '40 vecs here, too */ #if defined(M68060) || defined(M68040) @@ -1075,8 +1075,7 @@ cpu_exec_aout_makecmds(p, epp) #ifdef COMPAT_SUNOS { - extern sunos_exec_aout_makecmds - __P((struct proc *, struct exec_package *)); + extern sunos_exec_aout_makecmds(struct proc *, struct exec_package *); if ((error = sunos_exec_aout_makecmds(p, epp)) == 0) return (0); } diff --git a/sys/arch/mvme68k/mvme68k/swapgeneric.c b/sys/arch/mvme68k/mvme68k/swapgeneric.c index 0e73cc89e30..4eb8ef59711 100644 --- a/sys/arch/mvme68k/mvme68k/swapgeneric.c +++ b/sys/arch/mvme68k/mvme68k/swapgeneric.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapgeneric.c,v 1.6 2001/09/29 18:40:32 miod Exp $ */ +/* $OpenBSD: swapgeneric.c,v 1.7 2002/03/14 01:26:38 millert Exp $ */ /*- * Copyright (c) 1994 @@ -42,7 +42,7 @@ #include <sys/param.h> #include <sys/conf.h> -int (*mountroot) __P((void)) = NULL; /* tells autoconf.c that we are "generic" */ +int (*mountroot)(void) = NULL; /* tells autoconf.c that we are "generic" */ dev_t rootdev = NODEV; dev_t dumpdev = NODEV; diff --git a/sys/arch/mvme68k/mvme68k/trap.c b/sys/arch/mvme68k/mvme68k/trap.c index 8914bc10e54..8cc271cbe58 100644 --- a/sys/arch/mvme68k/mvme68k/trap.c +++ b/sys/arch/mvme68k/mvme68k/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.41 2001/12/08 02:24:06 art Exp $ */ +/* $OpenBSD: trap.c,v 1.42 2002/03/14 01:26:38 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -166,7 +166,7 @@ void (*sir_routines[NSIR])(); void *sir_args[NSIR]; u_char next_sir; -int writeback __P((struct frame *fp, int docachepush)); +int writeback(struct frame *fp, int docachepush); /* * trap and syscall both need the following work done before returning diff --git a/sys/arch/mvme68k/stand/bootst/dev_tape.h b/sys/arch/mvme68k/stand/bootst/dev_tape.h index 409e56ccae8..9404db80701 100644 --- a/sys/arch/mvme68k/stand/bootst/dev_tape.h +++ b/sys/arch/mvme68k/stand/bootst/dev_tape.h @@ -1,8 +1,8 @@ -/* $OpenBSD: dev_tape.h,v 1.2 2001/07/04 08:06:54 niklas Exp $ */ +/* $OpenBSD: dev_tape.h,v 1.3 2002/03/14 01:26:38 millert Exp $ */ -int tape_open __P((struct open_file *, ...)); -int tape_close __P((struct open_file *)); -int tape_strategy __P((void *, int, daddr_t, size_t, void *, size_t *)); +int tape_open(struct open_file *, ...); +int tape_close(struct open_file *); +int tape_strategy(void *, int, daddr_t, size_t, void *, size_t *); int tape_ioctl(); diff --git a/sys/arch/mvme68k/stand/bootst/rawfs.c b/sys/arch/mvme68k/stand/bootst/rawfs.c index 91d572fa04b..a7033027829 100644 --- a/sys/arch/mvme68k/stand/bootst/rawfs.c +++ b/sys/arch/mvme68k/stand/bootst/rawfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rawfs.c,v 1.2 2001/07/04 08:06:54 niklas Exp $ */ +/* $OpenBSD: rawfs.c,v 1.3 2002/03/14 01:26:38 millert Exp $ */ /* $NetBSD: rawfs.c,v 1.1 1995/10/17 22:58:27 gwr Exp $ */ /* @@ -58,7 +58,7 @@ struct file { }; static int -rawfs_get_block __P((struct open_file *)); +rawfs_get_block(struct open_file *); int rawfs_open(path, f) char *path; diff --git a/sys/arch/mvme68k/stand/bootst/rawfs.h b/sys/arch/mvme68k/stand/bootst/rawfs.h index bca3a3fb0d2..daac3710be3 100644 --- a/sys/arch/mvme68k/stand/bootst/rawfs.h +++ b/sys/arch/mvme68k/stand/bootst/rawfs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rawfs.h,v 1.2 2001/07/04 08:06:54 niklas Exp $ */ +/* $OpenBSD: rawfs.h,v 1.3 2002/03/14 01:26:38 millert Exp $ */ /* $NetBSD: rawfs.h,v 1.1 1995/10/17 22:58:29 gwr Exp $ */ /* @@ -6,11 +6,11 @@ * No random access, only sequential read allowed. */ -int rawfs_open __P((char *path, struct open_file *f)); -int rawfs_close __P((struct open_file *f)); -int rawfs_read __P((struct open_file *f, void *buf, - u_int size, u_int *resid)); -int rawfs_write __P((struct open_file *f, void *buf, - u_int size, u_int *resid)); -off_t rawfs_seek __P((struct open_file *f, off_t offset, int where)); -int rawfs_stat __P((struct open_file *f, struct stat *sb)); +int rawfs_open(char *path, struct open_file *f); +int rawfs_close(struct open_file *f); +int rawfs_read(struct open_file *f, void *buf, + u_int size, u_int *resid); +int rawfs_write(struct open_file *f, void *buf, + u_int size, u_int *resid); +off_t rawfs_seek(struct open_file *f, off_t offset, int where); +int rawfs_stat(struct open_file *f, struct stat *sb); diff --git a/sys/arch/mvme68k/stand/installboot/installboot.c b/sys/arch/mvme68k/stand/installboot/installboot.c index 27234a21ed3..c6850974557 100644 --- a/sys/arch/mvme68k/stand/installboot/installboot.c +++ b/sys/arch/mvme68k/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.5 2001/07/04 08:06:55 niklas Exp $ */ +/* $OpenBSD: installboot.c,v 1.6 2002/03/14 01:26:38 millert Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -69,12 +69,12 @@ daddr_t *block_table; /* block number array in prototype image */ int maxblocknum; /* size of this array */ -char *loadprotoblocks __P((char *, long *)); -int loadblocknums __P((char *, int)); -static void devread __P((int, void *, daddr_t, size_t, char *)); -static void usage __P((void)); -int main __P((int, char *[])); -static void vid_to_disklabel __P((char *, char*)); +char *loadprotoblocks(char *, long *); +int loadblocknums(char *, int); +static void devread(int, void *, daddr_t, size_t, char *); +static void usage(void); +int main(int, char *[]); +static void vid_to_disklabel(char *, char*); static void diff --git a/sys/arch/mvme68k/stand/libbug/libbug.h b/sys/arch/mvme68k/stand/libbug/libbug.h index e57de84104e..f0a65a6a1ec 100644 --- a/sys/arch/mvme68k/stand/libbug/libbug.h +++ b/sys/arch/mvme68k/stand/libbug/libbug.h @@ -1,18 +1,18 @@ -/* $OpenBSD: libbug.h,v 1.1 1996/05/16 02:25:39 chuck Exp $ */ +/* $OpenBSD: libbug.h,v 1.2 2002/03/14 01:26:38 millert Exp $ */ /* * prototypes and such. note that get/put char are in stand.h */ -void mvmeprom_delay __P((int)); -int mvmeprom_diskrd __P((struct mvmeprom_dskio *)); -int mvmeprom_diskwr __P((struct mvmeprom_dskio *)); -struct mvmeprom_brdid *mvmeprom_getbrdid __P((void)); -int peekchar __P((void)); -void mvmeprom_outln __P((char *, char *)); -void mvmeprom_outstr __P((char *, char *)); -void mvmeprom_rtc_rd __P((struct mvmeprom_time *)); +void mvmeprom_delay(int); +int mvmeprom_diskrd(struct mvmeprom_dskio *); +int mvmeprom_diskwr(struct mvmeprom_dskio *); +struct mvmeprom_brdid *mvmeprom_getbrdid(void); +int peekchar(void); +void mvmeprom_outln(char *, char *); +void mvmeprom_outstr(char *, char *); +void mvmeprom_rtc_rd(struct mvmeprom_time *); /* * bugcrt stuff diff --git a/sys/arch/mvme68k/stand/libsa/bugdev.c b/sys/arch/mvme68k/stand/libsa/bugdev.c index 3fe8cf36f51..0c0b9ec13db 100644 --- a/sys/arch/mvme68k/stand/libsa/bugdev.c +++ b/sys/arch/mvme68k/stand/libsa/bugdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bugdev.c,v 1.1 1996/05/16 02:30:36 chuck Exp $ */ +/* $OpenBSD: bugdev.c,v 1.2 2002/03/14 01:26:38 millert Exp $ */ /* * Copyright (c) 1993 Paul Kranenburg @@ -37,7 +37,7 @@ #include "stand.h" #include "libsa.h" -void cputobsdlabel __P((struct disklabel *lp, struct cpu_disklabel *clp)); +void cputobsdlabel(struct disklabel *lp, struct cpu_disklabel *clp); int errno; diff --git a/sys/arch/mvme68k/stand/libsa/libsa.h b/sys/arch/mvme68k/stand/libsa/libsa.h index fa95d205194..da15e3a0ac5 100644 --- a/sys/arch/mvme68k/stand/libsa/libsa.h +++ b/sys/arch/mvme68k/stand/libsa/libsa.h @@ -1,4 +1,4 @@ -/* $OpenBSD: libsa.h,v 1.4 2001/07/04 08:06:56 niklas Exp $ */ +/* $OpenBSD: libsa.h,v 1.5 2002/03/14 01:26:38 millert Exp $ */ /* * libsa prototypes @@ -7,14 +7,14 @@ #include "libbug.h" /* bugdev.c */ -int bugscopen __P((struct open_file *, ...)); -int bugscclose __P((struct open_file *)); -int bugscioctl __P((struct open_file *, u_long, void *)); -int bugscstrategy __P((void *, int, daddr_t, size_t, void *, size_t *)); +int bugscopen(struct open_file *, ...); +int bugscclose(struct open_file *); +int bugscioctl(struct open_file *, u_long, void *); +int bugscstrategy(void *, int, daddr_t, size_t, void *, size_t *); /* exec_mvme.c */ -void exec_mvme __P((char *, int)); +void exec_mvme(char *, int); /* parse_args.c */ -int parse_args __P((char **, int *)); +int parse_args(char **, int *); diff --git a/sys/arch/mvme68k/stand/netboot/dev_net.h b/sys/arch/mvme68k/stand/netboot/dev_net.h index b6d35c84269..0607427320c 100644 --- a/sys/arch/mvme68k/stand/netboot/dev_net.h +++ b/sys/arch/mvme68k/stand/netboot/dev_net.h @@ -1,7 +1,7 @@ -/* $OpenBSD: dev_net.h,v 1.2 1996/04/28 10:49:20 deraadt Exp $ */ +/* $OpenBSD: dev_net.h,v 1.3 2002/03/14 01:26:38 millert Exp $ */ -int net_open __P((struct open_file *, ...)); -int net_close __P((struct open_file *)); +int net_open(struct open_file *, ...); +int net_close(struct open_file *); int net_ioctl(); int net_strategy(); diff --git a/sys/arch/mvme68k/stand/netboot/if_ie.c b/sys/arch/mvme68k/stand/netboot/if_ie.c index b85a8f5447b..48c45acb861 100644 --- a/sys/arch/mvme68k/stand/netboot/if_ie.c +++ b/sys/arch/mvme68k/stand/netboot/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.8 2000/01/24 05:20:56 smurph Exp $ */ +/* $OpenBSD: if_ie.c,v 1.9 2002/03/14 01:26:38 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -56,16 +56,16 @@ int ie_debug = 0; -void ie_stop __P((struct netif *)); -void ie_end __P((struct netif *)); -void ie_error __P((struct netif *, char *, volatile struct iereg *)); -int ie_get __P((struct iodesc *, void *, size_t, time_t)); -void ie_init __P((struct iodesc *, void *)); -int ie_match __P((struct netif *, void *)); -int ie_poll __P((struct iodesc *, void *, int)); -int ie_probe __P((struct netif *, void *)); -int ie_put __P((struct iodesc *, void *, size_t)); -void ie_reset __P((struct netif *, u_char *)); +void ie_stop(struct netif *); +void ie_end(struct netif *); +void ie_error(struct netif *, char *, volatile struct iereg *); +int ie_get(struct iodesc *, void *, size_t, time_t); +void ie_init(struct iodesc *, void *); +int ie_match(struct netif *, void *); +int ie_poll(struct iodesc *, void *, int); +int ie_probe(struct netif *, void *); +int ie_put(struct iodesc *, void *, size_t); +void ie_reset(struct netif *, u_char *); struct netif_stats ie_stats; diff --git a/sys/arch/mvme68k/stand/netboot/if_le.c b/sys/arch/mvme68k/stand/netboot/if_le.c index 3ca8000c03f..8de7ac26810 100644 --- a/sys/arch/mvme68k/stand/netboot/if_le.c +++ b/sys/arch/mvme68k/stand/netboot/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.7 1999/01/11 05:11:41 millert Exp $ */ +/* $OpenBSD: if_le.c,v 1.8 2002/03/14 01:26:38 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -77,15 +77,15 @@ int le_debug = 0; -void le_end __P((struct netif *)); -void le_error __P((struct netif *, char *, volatile struct lereg1 *)); -int le_get __P((struct iodesc *, void *, size_t, time_t)); -void le_init __P((struct iodesc *, void *)); -int le_match __P((struct netif *, void *)); -int le_poll __P((struct iodesc *, void *, int)); -int le_probe __P((struct netif *, void *)); -int le_put __P((struct iodesc *, void *, size_t)); -void le_reset __P((struct netif *, u_char *)); +void le_end(struct netif *); +void le_error(struct netif *, char *, volatile struct lereg1 *); +int le_get(struct iodesc *, void *, size_t, time_t); +void le_init(struct iodesc *, void *); +int le_match(struct netif *, void *); +int le_poll(struct iodesc *, void *, int); +int le_probe(struct netif *, void *); +int le_put(struct iodesc *, void *, size_t); +void le_reset(struct netif *, u_char *); struct netif_stats le_stats; diff --git a/sys/arch/mvme68k/stand/sboot/sboot.h b/sys/arch/mvme68k/stand/sboot/sboot.h index 31461fcc762..aed437d3897 100644 --- a/sys/arch/mvme68k/stand/sboot/sboot.h +++ b/sys/arch/mvme68k/stand/sboot/sboot.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sboot.h,v 1.6 1997/10/07 22:50:05 deraadt Exp $ */ +/* $OpenBSD: sboot.h,v 1.7 2002/03/14 01:26:38 millert Exp $ */ /* * Copyright (c) 1995 Charles D. Cranor and Seth Widoff @@ -38,37 +38,37 @@ extern caddr_t end; /* console */ -void puts __P((char *)); -char *ngets __P((char *, int)); +void puts(char *); +char *ngets(char *, int); /* sboot */ -void callrom __P((void)); -void do_cmd __P((char *, char*)); +void callrom(void); +void do_cmd(char *, char*); /* le */ #define LANCE_ADDR 0xfffe0778 #define ERAM_ADDR 0xfffe0774 #define LANCE_REG_ADDR 0xfffe1800 -void le_end __P((void)); -void le_init __P((void)); -int le_get __P((u_char *, size_t, u_long)); -int le_put __P((u_char *, size_t)); +void le_end(void); +void le_init(void); +int le_get(u_char *, size_t, u_long); +int le_put(u_char *, size_t); /* etherfun */ #define READ 0 #define ACKN 1 -void do_rev_arp __P((void)); -int get_rev_arp __P((void)); -int rev_arp __P((void)); -void do_send_tftp __P((int)); -int do_get_file __P((void)); -void tftp_file __P((char *, u_long)); +void do_rev_arp(void); +int get_rev_arp(void); +int rev_arp(void); +void do_send_tftp(int); +int do_get_file(void); +void tftp_file(char *, u_long); /* clock */ -u_long ttime __P((void)); +u_long ttime(void); /* checksum */ -u_long oc_cksum __P((void *, u_long, u_long)); +u_long oc_cksum(void *, u_long, u_long); #define CONS_ZS_ADDR (0xfffe3002) #define CLOCK_ADDR (0xfffe07f8) diff --git a/sys/arch/mvme88k/ddb/db_disasm.c b/sys/arch/mvme88k/ddb/db_disasm.c index 0375e55c78a..0fb1c0379fd 100644 --- a/sys/arch/mvme88k/ddb/db_disasm.c +++ b/sys/arch/mvme88k/ddb/db_disasm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_disasm.c,v 1.9 2001/12/22 08:31:04 smurph Exp $ */ +/* $OpenBSD: db_disasm.c,v 1.10 2002/03/14 01:26:38 millert Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -149,22 +149,22 @@ static char *m88110_ctrlreg[64] = { } while (0) /* prototypes */ -void oimmed __P((int, char *, long)); -void ctrlregs __P((int, char *, long)); -void printsod __P((int)); -void sindou __P((int, char *, long)); -void jump __P((int, char *, long)); -void instset __P((int, char *, long)); -void symofset __P((int, int, int)); -void obranch __P((int, char *, long)); -void brcond __P((int, char *, long)); -void otrap __P((int, char *, long)); -void obit __P((int, char *, long)); -void bitman __P((int, char *, long)); -void immem __P((int, char *, long)); -void nimmem __P((int, char *, long)); -void lognim __P((int, char *, long)); -void onimmed __P((int, char *, long)); +void oimmed(int, char *, long); +void ctrlregs(int, char *, long); +void printsod(int); +void sindou(int, char *, long); +void jump(int, char *, long); +void instset(int, char *, long); +void symofset(int, int, int); +void obranch(int, char *, long); +void brcond(int, char *, long); +void otrap(int, char *, long); +void obit(int, char *, long); +void bitman(int, char *, long); +void immem(int, char *, long); +void nimmem(int, char *, long); +void lognim(int, char *, long); +void onimmed(int, char *, long); /* Handlers immediate integer arithmetic instructions */ void @@ -551,7 +551,7 @@ onimmed(int inst, char *opcode, long iadr) static struct opdesc { unsigned mask, match; - void (*opfun) __P((int, char *, long)); + void (*opfun)(int, char *, long); char *farg; } opdecode[] = { diff --git a/sys/arch/mvme88k/ddb/db_interface.c b/sys/arch/mvme88k/ddb/db_interface.c index 26cbda01048..ff7fd802a1b 100644 --- a/sys/arch/mvme88k/ddb/db_interface.c +++ b/sys/arch/mvme88k/ddb/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.24 2001/12/22 09:49:39 smurph Exp $ */ +/* $OpenBSD: db_interface.c,v 1.25 2002/03/14 01:26:38 millert Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -54,32 +54,32 @@ extern label_t *db_recover; extern unsigned int db_maxoff; extern unsigned db_trace_get_val(vm_offset_t addr, unsigned *ptr); -extern int frame_is_sane __P((db_regs_t *)); -extern void cnpollc __P((int)); -void kdbprinttrap __P((int type, int code)); - -void m88k_db_trap __P((int type, struct m88100_saved_state *regs)); -int ddb_nmi_trap __P((int level, db_regs_t *eframe)); -void ddb_error_trap __P((char *error, db_regs_t *eframe)); -void db_read_bytes __P((vm_offset_t addr, int size, char *data)); -void db_write_bytes __P((char *addr, int size, char *data)); -void db_putc __P((int c)); -int db_getc __P((void)); -void cpu_interrupt_to_db __P((int cpu_no)); -char *db_task_name __P((void)); -int m88k_dmx_print __P((unsigned, unsigned, unsigned, unsigned)); -void m88k_db_pause __P((unsigned)); -void m88k_db_print_frame __P((db_expr_t, int, db_expr_t, char *)); -void m88k_db_registers __P((db_expr_t, int, db_expr_t, char *)); -void m88k_db_where __P((db_expr_t, int, db_expr_t, char *)); -void m88k_db_frame_search __P((db_expr_t, int, db_expr_t, char *)); -void m88k_db_iflush __P((db_expr_t, int, db_expr_t, char *)); -void m88k_db_dflush __P((db_expr_t, int, db_expr_t, char *)); -void m88k_db_peek __P((db_expr_t, int, db_expr_t, char *)); -void m88k_db_noise __P((db_expr_t, int, db_expr_t, char *)); -void m88k_db_translate __P((db_expr_t, int, db_expr_t, char *)); -void m88k_db_cmmucfg __P((db_expr_t, int, db_expr_t, char *)); -void m88k_db_prom_cmd __P((db_expr_t, int, db_expr_t, char *)); +extern int frame_is_sane(db_regs_t *); +extern void cnpollc(int); +void kdbprinttrap(int type, int code); + +void m88k_db_trap(int type, struct m88100_saved_state *regs); +int ddb_nmi_trap(int level, db_regs_t *eframe); +void ddb_error_trap(char *error, db_regs_t *eframe); +void db_read_bytes(vm_offset_t addr, int size, char *data); +void db_write_bytes(char *addr, int size, char *data); +void db_putc(int c); +int db_getc(void); +void cpu_interrupt_to_db(int cpu_no); +char *db_task_name(void); +int m88k_dmx_print(unsigned, unsigned, unsigned, unsigned); +void m88k_db_pause(unsigned); +void m88k_db_print_frame(db_expr_t, int, db_expr_t, char *); +void m88k_db_registers(db_expr_t, int, db_expr_t, char *); +void m88k_db_where(db_expr_t, int, db_expr_t, char *); +void m88k_db_frame_search(db_expr_t, int, db_expr_t, char *); +void m88k_db_iflush(db_expr_t, int, db_expr_t, char *); +void m88k_db_dflush(db_expr_t, int, db_expr_t, char *); +void m88k_db_peek(db_expr_t, int, db_expr_t, char *); +void m88k_db_noise(db_expr_t, int, db_expr_t, char *); +void m88k_db_translate(db_expr_t, int, db_expr_t, char *); +void m88k_db_cmmucfg(db_expr_t, int, db_expr_t, char *); +void m88k_db_prom_cmd(db_expr_t, int, db_expr_t, char *); int db_active = 0; int db_noisy = 0; diff --git a/sys/arch/mvme88k/ddb/db_sstep.c b/sys/arch/mvme88k/ddb/db_sstep.c index 788876a16f3..4294c82bd62 100644 --- a/sys/arch/mvme88k/ddb/db_sstep.c +++ b/sys/arch/mvme88k/ddb/db_sstep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_sstep.c,v 1.10 2001/12/22 08:31:04 smurph Exp $ */ +/* $OpenBSD: db_sstep.c,v 1.11 2002/03/14 01:26:38 millert Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -39,7 +39,7 @@ * */ -boolean_t inst_delayed __P((unsigned int ins)); +boolean_t inst_delayed(unsigned int ins); #ifdef INTERNAL_SSTEP db_breakpoint_t db_not_taken_bkpt = 0; @@ -225,7 +225,7 @@ db_addr_t branch_taken(inst, pc, func, func_data) u_int inst; db_addr_t pc; - db_expr_t (*func) __P((db_regs_t *, int)); + db_expr_t (*func)(db_regs_t *, int); db_regs_t *func_data; { /* check if br/bsr */ diff --git a/sys/arch/mvme88k/ddb/db_trace.c b/sys/arch/mvme88k/ddb/db_trace.c index b8275d7962c..4cb68afddcf 100644 --- a/sys/arch/mvme88k/ddb/db_trace.c +++ b/sys/arch/mvme88k/ddb/db_trace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_trace.c,v 1.12 2001/12/22 08:31:04 smurph Exp $ */ +/* $OpenBSD: db_trace.c,v 1.13 2002/03/14 01:26:38 millert Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -95,12 +95,12 @@ static inline unsigned br_dest(unsigned addr, union instruction inst) #define TRACE_DEBUG /* undefine to disable debugging */ -extern void db_read_bytes __P((vm_offset_t addr, int size, char *data)); -int frame_is_sane __P((db_regs_t *regs)); -char *m88k_exception_name __P((unsigned vector)); -unsigned db_trace_get_val __P((vm_offset_t addr, unsigned *ptr)); -void db_stack_trace_cmd __P((db_regs_t *addr, int have_addr, - db_expr_t count, char *modif)); +extern void db_read_bytes(vm_offset_t addr, int size, char *data); +int frame_is_sane(db_regs_t *regs); +char *m88k_exception_name(unsigned vector); +unsigned db_trace_get_val(vm_offset_t addr, unsigned *ptr); +void db_stack_trace_cmd(db_regs_t *addr, int have_addr, + db_expr_t count, char *modif); /* * Some macros to tell if the given text is the instruction. diff --git a/sys/arch/mvme88k/dev/bugtty.c b/sys/arch/mvme88k/dev/bugtty.c index 38682dcbc68..a4a01d6b9a4 100644 --- a/sys/arch/mvme88k/dev/bugtty.c +++ b/sys/arch/mvme88k/dev/bugtty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bugtty.c,v 1.10 2002/02/15 20:45:30 nordin Exp $ */ +/* $OpenBSD: bugtty.c,v 1.11 2002/03/14 01:26:39 millert Exp $ */ /* Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1995 Dale Rahn. * All rights reserved. @@ -48,8 +48,8 @@ #include "bugtty.h" -int bugttymatch __P((struct device *parent, void *self, void *aux)); -void bugttyattach __P((struct device *parent, struct device *self, void *aux)); +int bugttymatch(struct device *parent, void *self, void *aux); +void bugttyattach(struct device *parent, struct device *self, void *aux); struct cfattach bugtty_ca = { sizeof(struct device), bugttymatch, bugttyattach @@ -60,21 +60,21 @@ struct cfdriver bugtty_cd = { }; /* prototypes */ -int bugttycnprobe __P((struct consdev *cp)); -int bugttycninit __P((struct consdev *cp)); -int bugttycngetc __P((dev_t dev)); -void bugttycnputc __P((dev_t dev, char c)); - -int bugttyopen __P((dev_t dev, int flag, int mode, struct proc *p)); -int bugttyclose __P((dev_t dev, int flag, int mode, struct proc *p)); -int bugttyread __P((dev_t dev, struct uio *uio, int flag)); -int bugttywrite __P((dev_t dev, struct uio *uio, int flag)); -int bugttyioctl __P((dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)); -int bugttystop __P((struct tty *tp, int flag)); - -struct tty *bugttytty __P((dev_t dev)); -int bugttymctl __P((dev_t dev, int bits, int how)); -int bugttyparam __P((struct tty *tp, struct termios *tm)); +int bugttycnprobe(struct consdev *cp); +int bugttycninit(struct consdev *cp); +int bugttycngetc(dev_t dev); +void bugttycnputc(dev_t dev, char c); + +int bugttyopen(dev_t dev, int flag, int mode, struct proc *p); +int bugttyclose(dev_t dev, int flag, int mode, struct proc *p); +int bugttyread(dev_t dev, struct uio *uio, int flag); +int bugttywrite(dev_t dev, struct uio *uio, int flag); +int bugttyioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p); +int bugttystop(struct tty *tp, int flag); + +struct tty *bugttytty(dev_t dev); +int bugttymctl(dev_t dev, int bits, int how); +int bugttyparam(struct tty *tp, struct termios *tm); #define DIALOUT(x) ((x) & 0x80) #define SWFLAGS(dev) (bugttyswflags | (DIALOUT(dev) ? TIOCFLAG_SOFTCAR : 0)) @@ -126,7 +126,7 @@ bugttyattach(parent, self, aux) } #define BUGTTYUNIT(x) ((x) & (0x7f)) -void bugttyoutput __P((struct tty *tp)); +void bugttyoutput(struct tty *tp); int bugttydefaultrate = TTYDEF_SPEED; int bugttyswflags; diff --git a/sys/arch/mvme88k/dev/bugttyfunc.h b/sys/arch/mvme88k/dev/bugttyfunc.h index 3be39203f7b..fc2d6efed2b 100644 --- a/sys/arch/mvme88k/dev/bugttyfunc.h +++ b/sys/arch/mvme88k/dev/bugttyfunc.h @@ -1,8 +1,8 @@ -/* $OpenBSD: bugttyfunc.h,v 1.1 2001/03/08 00:03:13 miod Exp $ */ +/* $OpenBSD: bugttyfunc.h,v 1.2 2002/03/14 01:26:39 millert Exp $ */ #ifndef _MVME88K_BUGTTY_H_ #define _MVME88K_BUGTTY_H_ -void bugtty_chkinput __P((void)); +void bugtty_chkinput(void); #endif /* _MVME88K_BUGTTY_H_ */ diff --git a/sys/arch/mvme88k/dev/bussw.c b/sys/arch/mvme88k/dev/bussw.c index 1e14a411627..998146ffdf6 100644 --- a/sys/arch/mvme88k/dev/bussw.c +++ b/sys/arch/mvme88k/dev/bussw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bussw.c,v 1.5 2002/03/05 22:11:37 miod Exp $ */ +/* $OpenBSD: bussw.c,v 1.6 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. @@ -56,8 +56,8 @@ struct bussw_softc { struct bussw_reg *sc_bussw; }; -void bussw_attach __P((struct device *, struct device *, void *)); -int bussw_match __P((struct device *, void *, void *)); +void bussw_attach(struct device *, struct device *, void *); +int bussw_match(struct device *, void *, void *); struct cfattach bussw_ca = { sizeof(struct bussw_softc), bussw_match, bussw_attach @@ -67,9 +67,9 @@ struct cfdriver bussw_cd = { NULL, "bussw", DV_DULL, 0 }; -int bussw_print __P((void *args, const char *bus)); -int bussw_scan __P((struct device *parent, void *child, void *args)); -int busswabort __P((void *)); +int bussw_print(void *args, const char *bus); +int bussw_scan(struct device *parent, void *child, void *args); +int busswabort(void *); int bussw_match(parent, vcf, args) diff --git a/sys/arch/mvme88k/dev/busswfunc.h b/sys/arch/mvme88k/dev/busswfunc.h index a633886837a..9be2d17309b 100644 --- a/sys/arch/mvme88k/dev/busswfunc.h +++ b/sys/arch/mvme88k/dev/busswfunc.h @@ -1,9 +1,9 @@ -/* $OpenBSD: busswfunc.h,v 1.3 2001/12/19 04:02:25 smurph Exp $ */ +/* $OpenBSD: busswfunc.h,v 1.4 2002/03/14 01:26:39 millert Exp $ */ #ifndef _MVME88K_BUSSWF_H_ #define _MVME88K_BUSSWF_H_ -int busswintr_establish __P((int vec, struct intrhand *ih)); +int busswintr_establish(int vec, struct intrhand *ih); #endif /* _MVME88K_PCCTWO_H_ */ diff --git a/sys/arch/mvme88k/dev/cl.c b/sys/arch/mvme88k/dev/cl.c index 36ccbc0028d..9ff1f201562 100644 --- a/sys/arch/mvme88k/dev/cl.c +++ b/sys/arch/mvme88k/dev/cl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cl.c,v 1.21 2002/02/15 20:45:30 nordin Exp $ */ +/* $OpenBSD: cl.c,v 1.22 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1995 Dale Rahn. All rights reserved. @@ -155,50 +155,50 @@ struct { }; /* prototypes */ -int clcnprobe __P((struct consdev *cp)); -int clcninit __P((struct consdev *cp)); -int cl_instat __P((struct clsoftc *sc)); -int clcngetc __P((dev_t dev)); -int clcnputc __P((dev_t dev, u_char c)); -void clcnpollc __P((dev_t, int)); -u_char cl_clkdiv __P((int speed)); -u_char cl_clknum __P((int speed)); -u_char cl_clkrxtimeout __P((int speed)); -void clstart __P((struct tty *tp)); -void cl_unblock __P((struct tty *tp)); -int clccparam __P((struct clsoftc *sc, struct termios *par, int channel)); - -int clparam __P((struct tty *tp, struct termios *t)); -int cl_mintr __P((void *)); -int cl_txintr __P((void *)); -int cl_rxintr __P((void *)); -void cl_overflow __P((struct clsoftc *sc, int channel, long *ptime, u_char *msg)); -void cl_parity __P((struct clsoftc *sc, int channel)); -void cl_frame __P((struct clsoftc *sc, int channel)); -void cl_break __P(( struct clsoftc *sc, int channel)); -int clmctl __P((dev_t dev, int bits, int how)); +int clcnprobe(struct consdev *cp); +int clcninit(struct consdev *cp); +int cl_instat(struct clsoftc *sc); +int clcngetc(dev_t dev); +int clcnputc(dev_t dev, u_char c); +void clcnpollc(dev_t, int); +u_char cl_clkdiv(int speed); +u_char cl_clknum(int speed); +u_char cl_clkrxtimeout(int speed); +void clstart(struct tty *tp); +void cl_unblock(struct tty *tp); +int clccparam(struct clsoftc *sc, struct termios *par, int channel); + +int clparam(struct tty *tp, struct termios *t); +int cl_mintr(void *); +int cl_txintr(void *); +int cl_rxintr(void *); +void cl_overflow(struct clsoftc *sc, int channel, long *ptime, u_char *msg); +void cl_parity(struct clsoftc *sc, int channel); +void cl_frame(struct clsoftc *sc, int channel); +void cl_break( struct clsoftc *sc, int channel); +int clmctl(dev_t dev, int bits, int how); #ifdef DEBUG -void cl_dumpport __P((int channel)); +void cl_dumpport(int channel); #endif -int clprobe __P((struct device *parent, void *self, void *aux)); -void clattach __P((struct device *parent, struct device *self, void *aux)); +int clprobe(struct device *parent, void *self, void *aux); +void clattach(struct device *parent, struct device *self, void *aux); -int clopen __P((dev_t dev, int flag, int mode, struct proc *p)); -int clclose __P((dev_t dev, int flag, int mode, struct proc *p)); -int clread __P((dev_t dev, struct uio *uio, int flag)); -int clwrite __P((dev_t dev, struct uio *uio, int flag)); -int clioctl __P((dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)); -int clstop __P((struct tty *tp, int flag)); +int clopen(dev_t dev, int flag, int mode, struct proc *p); +int clclose(dev_t dev, int flag, int mode, struct proc *p); +int clread(dev_t dev, struct uio *uio, int flag); +int clwrite(dev_t dev, struct uio *uio, int flag); +int clioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p); +int clstop(struct tty *tp, int flag); -void cl_initchannel __P((struct clsoftc *sc, int channel)); -void clputc __P((struct clsoftc *sc, int unit, u_char c)); -u_char clgetc __P((struct clsoftc *sc, int *channel)); +void cl_initchannel(struct clsoftc *sc, int channel); +void clputc(struct clsoftc *sc, int unit, u_char c); +u_char clgetc(struct clsoftc *sc, int *channel); #if 0 void cloutput __P( (struct tty *tp)); #endif #ifdef CLCD_DO_POLLED_INPUT -void cl_chkinput __P((void)); +void cl_chkinput(void); #endif struct cfattach cl_ca = { @@ -217,7 +217,7 @@ int dopoll = 1; #define CL_CHANNEL(x) (minor(x) & 3) #define CL_TTY(x) (minor(x)) -struct tty *cltty __P((dev_t dev)); +struct tty *cltty(dev_t dev); struct tty *cltty(dev) dev_t dev; diff --git a/sys/arch/mvme88k/dev/clock.c b/sys/arch/mvme88k/dev/clock.c index cad3195ecf7..f984c777991 100644 --- a/sys/arch/mvme88k/dev/clock.c +++ b/sys/arch/mvme88k/dev/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.18 2002/01/14 21:34:38 miod Exp $ */ +/* $OpenBSD: clock.c,v 1.19 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * Copyright (c) 1995 Theo de Raadt @@ -118,12 +118,12 @@ int timerok = 0; u_long delay_factor = 1; -static int clockmatch __P((struct device *, void *, void *)); -static void clockattach __P((struct device *, struct device *, void *)); +static int clockmatch(struct device *, void *, void *); +static void clockattach(struct device *, struct device *, void *); void sbc_initclock(void); void m188_initclock(void); -void m188_timer_init __P((unsigned)); +void m188_timer_init(unsigned); struct clocksoftc { struct device sc_dev; @@ -139,8 +139,8 @@ struct cfdriver clock_cd = { NULL, "clock", DV_DULL, 0 }; -int sbc_clockintr __P((void *)); -int m188_clockintr __P((void *)); +int sbc_clockintr(void *); +int m188_clockintr(void *); int clockbus; u_char prof_reset; diff --git a/sys/arch/mvme88k/dev/dart.c b/sys/arch/mvme88k/dev/dart.c index 48e9b56e733..bc97aeffad0 100644 --- a/sys/arch/mvme88k/dev/dart.c +++ b/sys/arch/mvme88k/dev/dart.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dart.c,v 1.15 2001/12/19 07:04:41 smurph Exp $ */ +/* $OpenBSD: dart.c,v 1.16 2002/03/14 01:26:39 millert Exp $ */ /* * Mach Operating System @@ -81,8 +81,8 @@ struct dartsoftc { int sc_vec; }; -int dartmatch __P((struct device *parent, void *self, void *aux)); -void dartattach __P((struct device *parent, struct device *self, void *aux)); +int dartmatch(struct device *parent, void *self, void *aux); +void dartattach(struct device *parent, struct device *self, void *aux); struct cfattach dart_ca = { sizeof(struct dartsoftc), dartmatch, dartattach @@ -94,27 +94,27 @@ struct cfdriver dart_cd = { int dart_cons = -1; /* prototypes */ -int dartcnprobe __P((struct consdev *cp)); -int dartcninit __P((struct consdev *cp)); -int dartcngetc __P((dev_t dev)); -void dartcnputc __P((dev_t dev, char c)); -int dart_speed __P((int)); -struct tty* darttty __P((dev_t)); -void dartstart __P((struct tty *)); -int dartmctl __P((dev_t, int, int)); -int dartparam __P((struct tty *, struct termios *)); -void dartmodemtrans __P((struct dartsoftc *, unsigned int, unsigned int)); -void dartrint __P((struct dartsoftc *, int)); -void dartxint __P((struct dartsoftc *, int)); - -int dartopen __P((dev_t dev, int flag, int mode, struct proc *p)); -int dartclose __P((dev_t dev, int flag, int mode, struct proc *p)); -int dartread __P((dev_t dev, struct uio *uio, int flag)); -int dartwrite __P((dev_t dev, struct uio *uio, int flag)); -int dartioctl __P((dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)); -int dartstop __P((struct tty *tp, int flag)); -int dartintr __P((void *)); -void dartbreak __P((dev_t dev, int state)); +int dartcnprobe(struct consdev *cp); +int dartcninit(struct consdev *cp); +int dartcngetc(dev_t dev); +void dartcnputc(dev_t dev, char c); +int dart_speed(int); +struct tty* darttty(dev_t); +void dartstart(struct tty *); +int dartmctl(dev_t, int, int); +int dartparam(struct tty *, struct termios *); +void dartmodemtrans(struct dartsoftc *, unsigned int, unsigned int); +void dartrint(struct dartsoftc *, int); +void dartxint(struct dartsoftc *, int); + +int dartopen(dev_t dev, int flag, int mode, struct proc *p); +int dartclose(dev_t dev, int flag, int mode, struct proc *p); +int dartread(dev_t dev, struct uio *uio, int flag); +int dartwrite(dev_t dev, struct uio *uio, int flag); +int dartioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p); +int dartstop(struct tty *tp, int flag); +int dartintr(void *); +void dartbreak(dev_t dev, int state); /* * Lock strategy in that driver: diff --git a/sys/arch/mvme88k/dev/if_ie.c b/sys/arch/mvme88k/dev/if_ie.c index 8ed0d28f925..efedfb295b2 100644 --- a/sys/arch/mvme88k/dev/if_ie.c +++ b/sys/arch/mvme88k/dev/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.21 2002/02/05 23:15:33 miod Exp $ */ +/* $OpenBSD: if_ie.c,v 1.22 2002/03/14 01:26:39 millert Exp $ */ /*- * Copyright (c) 1998 Steve Murphree, Jr. @@ -175,15 +175,15 @@ struct ie_softc { struct arpcom sc_arpcom;/* system arpcom structure */ - void (*reset_596) __P((struct ie_softc *)); + void (*reset_596)(struct ie_softc *); /* card dependent reset function */ - void (*chan_attn) __P((struct ie_softc *)); + void (*chan_attn)(struct ie_softc *); /* card dependent attn function */ - void (*run_596) __P((struct ie_softc *)); + void (*run_596)(struct ie_softc *); /* card depenent "go on-line" function */ - void (*memcopy) __P((const void *, void *, u_int)); + void (*memcopy)(const void *, void *, u_int); /* card dependent memory copy function */ - void (*memzero) __P((void *, u_int)); + void (*memzero)(void *, u_int); /* card dependent memory zero function */ int want_mcsetup; /* mcsetup flag */ int promisc; /* are we in promisc mode? */ @@ -237,53 +237,53 @@ struct ie_softc { #endif }; -void ie_obreset __P((struct ie_softc *)); -void ie_obattend __P((struct ie_softc *)); -void ie_obrun __P((struct ie_softc *)); -int ie_setupram __P((struct ie_softc *sc)); - -void iewatchdog __P((struct ifnet *)); -int ieintr __P((void *)); -int iefailintr __P((void *)); -int ieinit __P((struct ie_softc *)); -int ieioctl __P((struct ifnet *, u_long, caddr_t)); -void iestart __P((struct ifnet *)); -void iereset __P((struct ie_softc *)); -void ie_readframe __P((struct ie_softc *, int)); -void ie_drop_packet_buffer __P((struct ie_softc *)); -int command_and_wait __P((struct ie_softc *, int, - void *volatile, int)); -void ierint __P((struct ie_softc *)); -void ietint __P((struct ie_softc *)); -int ieget __P((struct ie_softc *, struct mbuf **, - struct ether_header *, int *)); -void setup_bufs __P((struct ie_softc *)); -int mc_setup __P((struct ie_softc *, void *)); -void mc_reset __P((struct ie_softc *)); -static __inline int ether_equal __P((u_char *, u_char *)); -static __inline void ie_ack __P((struct ie_softc *, u_int)); -static __inline void ie_setup_config __P((struct ie_config_cmd *volatile, - int, int)); -static __inline int check_eh __P((struct ie_softc *, struct ether_header *, - int *)); -static __inline int ie_buflen __P((struct ie_softc *, int)); -static __inline int ie_packet_len __P((struct ie_softc *)); -static __inline void iexmit __P((struct ie_softc *)); -static __inline caddr_t Align __P((caddr_t)); - -void chan_attn_timeout __P((void *)); -void run_tdr __P((struct ie_softc *, struct ie_tdr_cmd *)); -void iestop __P((struct ie_softc *)); +void ie_obreset(struct ie_softc *); +void ie_obattend(struct ie_softc *); +void ie_obrun(struct ie_softc *); +int ie_setupram(struct ie_softc *sc); + +void iewatchdog(struct ifnet *); +int ieintr(void *); +int iefailintr(void *); +int ieinit(struct ie_softc *); +int ieioctl(struct ifnet *, u_long, caddr_t); +void iestart(struct ifnet *); +void iereset(struct ie_softc *); +void ie_readframe(struct ie_softc *, int); +void ie_drop_packet_buffer(struct ie_softc *); +int command_and_wait(struct ie_softc *, int, + void *volatile, int); +void ierint(struct ie_softc *); +void ietint(struct ie_softc *); +int ieget(struct ie_softc *, struct mbuf **, + struct ether_header *, int *); +void setup_bufs(struct ie_softc *); +int mc_setup(struct ie_softc *, void *); +void mc_reset(struct ie_softc *); +static __inline int ether_equal(u_char *, u_char *); +static __inline void ie_ack(struct ie_softc *, u_int); +static __inline void ie_setup_config(struct ie_config_cmd *volatile, + int, int); +static __inline int check_eh(struct ie_softc *, struct ether_header *, + int *); +static __inline int ie_buflen(struct ie_softc *, int); +static __inline int ie_packet_len(struct ie_softc *); +static __inline void iexmit(struct ie_softc *); +static __inline caddr_t Align(caddr_t); + +void chan_attn_timeout(void *); +void run_tdr(struct ie_softc *, struct ie_tdr_cmd *); +void iestop(struct ie_softc *); #ifdef IEDEBUG -void print_rbd __P((struct ie_recv_buf_desc *volatile)); +void print_rbd(struct ie_recv_buf_desc *volatile); int in_ierint = 0; int in_ietint = 0; #endif -int iematch __P((struct device *, void *, void *)); -void ieattach __P((struct device *, struct device *, void *)); +int iematch(struct device *, void *, void *); +void ieattach(struct device *, struct device *, void *); struct cfattach ie_ca = { sizeof(struct ie_softc), iematch, ieattach diff --git a/sys/arch/mvme88k/dev/if_ve.c b/sys/arch/mvme88k/dev/if_ve.c index 1bfadff7007..9cc37772542 100644 --- a/sys/arch/mvme88k/dev/if_ve.c +++ b/sys/arch/mvme88k/dev/if_ve.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ve.c,v 1.16 2002/03/05 22:11:37 miod Exp $ */ +/* $OpenBSD: if_ve.c,v 1.17 2002/03/14 01:26:39 millert Exp $ */ /*- * Copyright (c) 1999 Steve Murphree, Jr. * Copyright (c) 1982, 1992, 1993 @@ -81,18 +81,18 @@ #ifdef LEDEBUG -void ve_recv_print __P((struct vam7990_softc *, int)); -void ve_xmit_print __P((struct vam7990_softc *, int)); +void ve_recv_print(struct vam7990_softc *, int); +void ve_xmit_print(struct vam7990_softc *, int); #endif -void ve_rint __P((struct vam7990_softc *)); -void ve_tint __P((struct vam7990_softc *)); +void ve_rint(struct vam7990_softc *); +void ve_tint(struct vam7990_softc *); -int ve_put __P((struct vam7990_softc *, int, struct mbuf *)); -struct mbuf *ve_get __P((struct vam7990_softc *, int, int)); -void ve_read __P((struct vam7990_softc *, int, int)); +int ve_put(struct vam7990_softc *, int, struct mbuf *); +struct mbuf *ve_get(struct vam7990_softc *, int, int); +void ve_read(struct vam7990_softc *, int, int); -void ve_shutdown __P((void *)); +void ve_shutdown(void *); #define ifp (&sc->sc_arpcom.ac_if) #ifndef ETHER_CMP @@ -134,12 +134,12 @@ struct cfattach ve_ca = { sizeof(struct ve_softc), vematch, veattach }; -void vewrcsr __P((struct vam7990_softc *, u_int16_t, u_int16_t)); -u_int16_t verdcsr __P((struct vam7990_softc *, u_int16_t)); -void nvram_cmd __P((struct vam7990_softc *, u_char, u_short)); -u_int16_t nvram_read __P((struct vam7990_softc *, u_char)); -void vereset __P((struct vam7990_softc *)); -void ve_ackint __P((struct vam7990_softc *)); +void vewrcsr(struct vam7990_softc *, u_int16_t, u_int16_t); +u_int16_t verdcsr(struct vam7990_softc *, u_int16_t); +void nvram_cmd(struct vam7990_softc *, u_char, u_short); +u_int16_t nvram_read(struct vam7990_softc *, u_char); +void vereset(struct vam7990_softc *); +void ve_ackint(struct vam7990_softc *); /* send command to the nvram controller */ void diff --git a/sys/arch/mvme88k/dev/if_vevar.h b/sys/arch/mvme88k/dev/if_vevar.h index 344e7fc53ac..b2425f4004a 100644 --- a/sys/arch/mvme88k/dev/if_vevar.h +++ b/sys/arch/mvme88k/dev/if_vevar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vevar.h,v 1.2 2001/08/26 02:37:07 miod Exp $ */ +/* $OpenBSD: if_vevar.h,v 1.3 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1995 Charles M. Hannum. All rights reserved. @@ -55,16 +55,11 @@ struct vam7990_softc { * copy to/from buffer * zero bytes in buffer */ - void (*sc_copytodesc) - __P((struct vam7990_softc *, void *, int, int)); - void (*sc_copyfromdesc) - __P((struct vam7990_softc *, void *, int, int)); - void (*sc_copytobuf) - __P((struct vam7990_softc *, void *, int, int)); - void (*sc_copyfrombuf) - __P((struct vam7990_softc *, void *, int, int)); - void (*sc_zerobuf) - __P((struct vam7990_softc *, int, int)); + void (*sc_copytodesc)(struct vam7990_softc *, void *, int, int); + void (*sc_copyfromdesc)(struct vam7990_softc *, void *, int, int); + void (*sc_copytobuf)(struct vam7990_softc *, void *, int, int); + void (*sc_copyfrombuf)(struct vam7990_softc *, void *, int, int); + void (*sc_zerobuf)(struct vam7990_softc *, int, int); /* * Machine-dependent functions: @@ -74,13 +69,11 @@ struct vam7990_softc { * hardware init hook - may be NULL * no carrier hook - may be NULL */ - u_int16_t (*sc_rdcsr) - __P((struct vam7990_softc *, u_int16_t)); - void (*sc_wrcsr) - __P((struct vam7990_softc *, u_int16_t, u_int16_t)); - void (*sc_hwreset) __P((struct vam7990_softc *)); - void (*sc_hwinit) __P((struct vam7990_softc *)); - void (*sc_nocarrier) __P((struct vam7990_softc *)); + u_int16_t (*sc_rdcsr)(struct vam7990_softc *, u_int16_t); + void (*sc_wrcsr)(struct vam7990_softc *, u_int16_t, u_int16_t); + void (*sc_hwreset)(struct vam7990_softc *); + void (*sc_hwinit)(struct vam7990_softc *); + void (*sc_nocarrier)(struct vam7990_softc *); int sc_hasifmedia; struct ifmedia sc_ifmedia; @@ -113,16 +106,16 @@ struct vam7990_softc { /* Export this to machine-dependent drivers. */ extern struct cfdriver ve_cd; -void ve_config __P((struct vam7990_softc *)); -void ve_init __P((struct vam7990_softc *)); -int ve_ioctl __P((struct ifnet *, u_long, caddr_t)); -void ve_meminit __P((struct vam7990_softc *)); -void ve_reset __P((struct vam7990_softc *)); -void ve_setladrf __P((struct arpcom *, u_int16_t *)); -void ve_start __P((struct ifnet *)); -void ve_stop __P((struct vam7990_softc *)); -void ve_watchdog __P((struct ifnet *)); -int ve_intr __P((void *)); +void ve_config(struct vam7990_softc *); +void ve_init(struct vam7990_softc *); +int ve_ioctl(struct ifnet *, u_long, caddr_t); +void ve_meminit(struct vam7990_softc *); +void ve_reset(struct vam7990_softc *); +void ve_setladrf(struct arpcom *, u_int16_t *); +void ve_start(struct ifnet *); +void ve_stop(struct vam7990_softc *); +void ve_watchdog(struct ifnet *); +int ve_intr(void *); /* * The following functions are only useful on certain cpu/bus @@ -130,9 +123,9 @@ int ve_intr __P((void *)); * maximum efficiency, but machine-independent versions are provided * for drivers that have not yet been optimized. */ -void ve_copytobuf_contig __P((struct vam7990_softc *, void *, int, int)); -void ve_copyfrombuf_contig __P((struct vam7990_softc *, void *, int, int)); -void ve_zerobuf_contig __P((struct vam7990_softc *, int, int)); +void ve_copytobuf_contig(struct vam7990_softc *, void *, int, int); +void ve_copyfrombuf_contig(struct vam7990_softc *, void *, int, int); +void ve_zerobuf_contig(struct vam7990_softc *, int, int); diff --git a/sys/arch/mvme88k/dev/mainbus.c b/sys/arch/mvme88k/dev/mainbus.c index 3aef5680da7..d6ecbea9516 100644 --- a/sys/arch/mvme88k/dev/mainbus.c +++ b/sys/arch/mvme88k/dev/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.7 2001/12/19 07:04:41 smurph Exp $ */ +/* $OpenBSD: mainbus.c,v 1.8 2002/03/14 01:26:39 millert Exp $ */ /* Copyright (c) 1998 Steve Murphree, Jr. */ #include <sys/param.h> #include <sys/systm.h> @@ -10,10 +10,10 @@ #include <machine/cpu.h> #include <machine/autoconf.h> -void mainbus_attach __P((struct device *, struct device *, void *)); -int mainbus_match __P((struct device *, void *, void *)); -int mainbus_print __P((void *, const char *)); -int mainbus_scan __P((struct device *, void *, void *)); +void mainbus_attach(struct device *, struct device *, void *); +int mainbus_match(struct device *, void *, void *); +int mainbus_print(void *, const char *); +int mainbus_scan(struct device *, void *, void *); struct cfattach mainbus_ca = { sizeof(struct device), mainbus_match, mainbus_attach diff --git a/sys/arch/mvme88k/dev/memc.c b/sys/arch/mvme88k/dev/memc.c index 40c51e540db..f743ae00e05 100644 --- a/sys/arch/mvme88k/dev/memc.c +++ b/sys/arch/mvme88k/dev/memc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: memc.c,v 1.5 2001/03/07 23:45:51 miod Exp $ */ +/* $OpenBSD: memc.c,v 1.6 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -63,8 +63,8 @@ struct memcsoftc { struct intrhand sc_ih; }; -void memcattach __P((struct device *, struct device *, void *)); -int memcmatch __P((struct device *, void *, void *)); +void memcattach(struct device *, struct device *, void *); +int memcmatch(struct device *, void *, void *); struct cfattach memc_ca = { sizeof(struct memcsoftc), memcmatch, memcattach @@ -74,7 +74,7 @@ struct cfdriver memc_cd = { NULL, "memc", DV_DULL, 0 }; -/*int memcintr __P((struct frame *frame));*/ +/*int memcintr(struct frame *frame);*/ int memcmatch(parent, vcf, args) diff --git a/sys/arch/mvme88k/dev/memdevs.h b/sys/arch/mvme88k/dev/memdevs.h index 5c3f02f6601..92033fd59e7 100644 --- a/sys/arch/mvme88k/dev/memdevs.h +++ b/sys/arch/mvme88k/dev/memdevs.h @@ -1,8 +1,8 @@ -/* $OpenBSD: memdevs.h,v 1.1 2001/03/08 22:21:49 miod Exp $ */ +/* $OpenBSD: memdevs.h,v 1.2 2002/03/14 01:26:39 millert Exp $ */ #ifndef _MVME88K_MEMDEVS_H_ #define _MVME88K_MEMDEVS_H_ -int memdevrw __P((caddr_t base, int len, struct uio *uio, int flags)); +int memdevrw(caddr_t base, int len, struct uio *uio, int flags); #endif /* _MVME88K_MEMDEVS_H_ */ diff --git a/sys/arch/mvme88k/dev/nvram.c b/sys/arch/mvme88k/dev/nvram.c index 49a64b524b0..d2f73e96ec2 100644 --- a/sys/arch/mvme88k/dev/nvram.c +++ b/sys/arch/mvme88k/dev/nvram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nvram.c,v 1.17 2002/03/05 22:11:37 miod Exp $ */ +/* $OpenBSD: nvram.c,v 1.18 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -65,8 +65,8 @@ struct nvramsoftc { void * sc_regs; }; -void nvramattach __P((struct device *, struct device *, void *)); -int nvrammatch __P((struct device *, void *, void *)); +void nvramattach(struct device *, struct device *, void *); +int nvrammatch(struct device *, void *, void *); struct cfattach nvram_ca = { sizeof(struct nvramsoftc), nvrammatch, nvramattach @@ -76,15 +76,15 @@ struct cfdriver nvram_cd = { NULL, "nvram", DV_DULL, 0 }; -int nvramopen __P((dev_t dev, int flag, int mode)); -int nvramclose __P((dev_t dev, int flag, int mode)); -int nvramioctl __P((dev_t dev, int cmd, caddr_t data, int flag, - struct proc *p)); -int nvramread __P((dev_t dev, struct uio *uio, int flags)); -int nvramwrite __P((dev_t dev, struct uio *uio, int flags)); -paddr_t nvrammmap __P((dev_t dev, off_t off, int prot)); +int nvramopen(dev_t dev, int flag, int mode); +int nvramclose(dev_t dev, int flag, int mode); +int nvramioctl(dev_t dev, int cmd, caddr_t data, int flag, + struct proc *p); +int nvramread(dev_t dev, struct uio *uio, int flags); +int nvramwrite(dev_t dev, struct uio *uio, int flags); +paddr_t nvrammmap(dev_t dev, off_t off, int prot); -u_long chiptotime __P((int, int, int, int, int, int)); +u_long chiptotime(int, int, int, int, int, int); int nvrammatch(parent, vcf, args) @@ -242,7 +242,7 @@ struct chiptime { int year; }; -void timetochip __P((struct chiptime *c)); +void timetochip(struct chiptime *c); void timetochip(c) diff --git a/sys/arch/mvme88k/dev/pcctwo.c b/sys/arch/mvme88k/dev/pcctwo.c index b867d8812b3..f96e82ca0b7 100644 --- a/sys/arch/mvme88k/dev/pcctwo.c +++ b/sys/arch/mvme88k/dev/pcctwo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcctwo.c,v 1.15 2001/12/22 18:45:35 smurph Exp $ */ +/* $OpenBSD: pcctwo.c,v 1.16 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt * All rights reserved. @@ -63,8 +63,8 @@ struct pcctwosoftc { struct pcctworeg *sc_pcc2; /* the actual registers */ }; -void pcctwoattach __P((struct device *, struct device *, void *)); -int pcctwomatch __P((struct device *, void *, void *)); +void pcctwoattach(struct device *, struct device *, void *); +int pcctwomatch(struct device *, void *, void *); struct cfattach pcctwo_ca = { sizeof(struct pcctwosoftc), pcctwomatch, pcctwoattach @@ -78,8 +78,8 @@ struct pcctworeg *sys_pcc2 = NULL; int pcc2bus; -int pcctwo_print __P((void *args, const char *bus)); -int pcctwo_scan __P((struct device *parent, void *child, void *args)); +int pcctwo_print(void *args, const char *bus); +int pcctwo_scan(struct device *parent, void *child, void *args); int pcctwomatch(parent, vcf, args) diff --git a/sys/arch/mvme88k/dev/pcctwofunc.h b/sys/arch/mvme88k/dev/pcctwofunc.h index b52aad2dc86..7cbfe3abbe5 100644 --- a/sys/arch/mvme88k/dev/pcctwofunc.h +++ b/sys/arch/mvme88k/dev/pcctwofunc.h @@ -1,9 +1,9 @@ -/* $OpenBSD: pcctwofunc.h,v 1.3 2001/12/16 23:49:46 miod Exp $ */ +/* $OpenBSD: pcctwofunc.h,v 1.4 2002/03/14 01:26:39 millert Exp $ */ #ifndef _MVME88K_PCCTWO_H_ #define _MVME88K_PCCTWO_H_ -int pcctwointr_establish __P((int vec, struct intrhand *ih)); +int pcctwointr_establish(int vec, struct intrhand *ih); #endif /* _MVME88K_PCCTWO_H_ */ diff --git a/sys/arch/mvme88k/dev/sclock.c b/sys/arch/mvme88k/dev/sclock.c index 62603c95164..674bc855573 100644 --- a/sys/arch/mvme88k/dev/sclock.c +++ b/sys/arch/mvme88k/dev/sclock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sclock.c,v 1.11 2002/03/05 22:11:37 miod Exp $ */ +/* $OpenBSD: sclock.c,v 1.12 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * @@ -116,14 +116,14 @@ struct simplelock cio_lock; int statvar = 8192; int statmin; /* statclock interval - 1/2*variance */ -int sclockmatch __P((struct device *, void *, void *)); -void sclockattach __P((struct device *, struct device *, void *)); +int sclockmatch(struct device *, void *, void *); +void sclockattach(struct device *, struct device *, void *); -void sbc_initstatclock __P((void)); -void m188_initstatclock __P((void)); -void m188_cio_init __P((unsigned)); -u_char read_cio __P((unsigned)); -void write_cio __P((unsigned, unsigned)); +void sbc_initstatclock(void); +void m188_initstatclock(void); +void m188_cio_init(unsigned); +u_char read_cio(unsigned); +void write_cio(unsigned, unsigned); struct sclocksoftc { struct device sc_dev; @@ -138,8 +138,8 @@ struct cfdriver sclock_cd = { NULL, "sclock", DV_DULL, 0 }; -int sbc_statintr __P((void *)); -int m188_statintr __P((void *)); +int sbc_statintr(void *); +int m188_statintr(void *); int sclockbus; u_char stat_reset; diff --git a/sys/arch/mvme88k/dev/sram.c b/sys/arch/mvme88k/dev/sram.c index b2d73c92d80..634a9b4a672 100644 --- a/sys/arch/mvme88k/dev/sram.c +++ b/sys/arch/mvme88k/dev/sram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sram.c,v 1.7 2001/12/19 07:04:41 smurph Exp $ */ +/* $OpenBSD: sram.c,v 1.8 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -52,8 +52,8 @@ struct sramsoftc { int sc_len; }; -void sramattach __P((struct device *, struct device *, void *)); -int srammatch __P((struct device *, void *, void *)); +void sramattach(struct device *, struct device *, void *); +int srammatch(struct device *, void *, void *); struct cfattach sram_ca = { sizeof(struct sramsoftc), srammatch, sramattach diff --git a/sys/arch/mvme88k/dev/ssh.c b/sys/arch/mvme88k/dev/ssh.c index 631f48c6fdd..545c8dbc6a1 100644 --- a/sys/arch/mvme88k/dev/ssh.c +++ b/sys/arch/mvme88k/dev/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.11 2001/12/22 09:49:39 smurph Exp $ */ +/* $OpenBSD: ssh.c,v 1.12 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1994 Michael L. Hitch @@ -72,21 +72,21 @@ #define SCSI_DATA_WAIT 500000 /* wait per data in/out step */ #define SCSI_INIT_WAIT 500000 /* wait per step (both) during init */ -void ssh_select __P((struct ssh_softc *)); -void sshabort __P((struct ssh_softc *, ssh_regmap_p, char *)); -void ssherror __P((struct ssh_softc *, ssh_regmap_p, u_char)); -void sshstart __P((struct ssh_softc *)); -int ssh_checkintr __P((struct ssh_softc *, u_char, u_char, u_char, int *)); -void sshreset __P((struct ssh_softc *)); -void sshsetdelay __P((int)); -void ssh_scsidone __P((struct ssh_acb *, int)); -void ssh_sched __P((struct ssh_softc *)); -int ssh_poll __P((struct ssh_softc *, struct ssh_acb *)); -int sshintr __P((struct ssh_softc *)); -void scsi_period_to_ssh __P((struct ssh_softc *, int)); -void ssh_start __P((struct ssh_softc *, int, int, u_char *, int, u_char *, int)); -void ssh_dump_acb __P((struct ssh_acb *)); -void sshinitialize __P((struct ssh_softc *sc)); +void ssh_select(struct ssh_softc *); +void sshabort(struct ssh_softc *, ssh_regmap_p, char *); +void ssherror(struct ssh_softc *, ssh_regmap_p, u_char); +void sshstart(struct ssh_softc *); +int ssh_checkintr(struct ssh_softc *, u_char, u_char, u_char, int *); +void sshreset(struct ssh_softc *); +void sshsetdelay(int); +void ssh_scsidone(struct ssh_acb *, int); +void ssh_sched(struct ssh_softc *); +int ssh_poll(struct ssh_softc *, struct ssh_acb *); +int sshintr(struct ssh_softc *); +void scsi_period_to_ssh(struct ssh_softc *, int); +void ssh_start(struct ssh_softc *, int, int, u_char *, int, u_char *, int); +void ssh_dump_acb(struct ssh_acb *); +void sshinitialize(struct ssh_softc *sc); /* 53C710 script */ const @@ -168,8 +168,8 @@ int sshphmm = 0; ssh_trix = (ssh_trix + 4) & (SSH_TRACE_SIZE - 1); u_char ssh_trbuf[SSH_TRACE_SIZE]; int ssh_trix; -void ssh_dump __P((struct ssh_softc *)); -void ssh_dump_trace __P((void)); +void ssh_dump(struct ssh_softc *); +void ssh_dump_trace(void); #else #define SSH_TRACE(a,b,c,d) #endif @@ -179,7 +179,7 @@ int kludge_city = 1; /* * dummy routine to debug while loops */ -void wdummy __P((void)); +void wdummy(void); void wdummy(void) diff --git a/sys/arch/mvme88k/dev/sshdma.c b/sys/arch/mvme88k/dev/sshdma.c index 5aa58bed51e..ddf78f00451 100644 --- a/sys/arch/mvme88k/dev/sshdma.c +++ b/sys/arch/mvme88k/dev/sshdma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshdma.c,v 1.10 2001/12/22 18:45:35 smurph Exp $ */ +/* $OpenBSD: sshdma.c,v 1.11 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1996 Nivas Madhur @@ -63,13 +63,13 @@ #include <mvme88k/dev/pcctworeg.h> #endif -int afscmatch __P((struct device *, void *, void *)); -void afscattach __P((struct device *, struct device *, void *)); +int afscmatch(struct device *, void *, void *); +void afscattach(struct device *, struct device *, void *); -int afscprint __P((void *auxp, char *)); -int sshintr __P((struct ssh_softc *)); -int afsc_dmaintr __P((void *)); -void sshinitialize __P((struct ssh_softc *)); +int afscprint(void *auxp, char *); +int sshintr(struct ssh_softc *); +int afsc_dmaintr(void *); +void sshinitialize(struct ssh_softc *); struct scsi_adapter afsc_scsiswitch = { ssh_scsicmd, diff --git a/sys/arch/mvme88k/dev/sshvar.h b/sys/arch/mvme88k/dev/sshvar.h index f5067562611..c63f6a653e2 100644 --- a/sys/arch/mvme88k/dev/sshvar.h +++ b/sys/arch/mvme88k/dev/sshvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sshvar.h,v 1.1 2001/03/07 01:57:56 miod Exp $ */ +/* $OpenBSD: sshvar.h,v 1.2 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -198,7 +198,7 @@ struct ssh_softc { #define STS_INTERMED 0x10 /* Intermediate status sent */ #define STS_EXT 0x80 /* Extended status valid */ -void ssh_minphys __P((struct buf *bp)); -int ssh_scsicmd __P((struct scsi_xfer *)); +void ssh_minphys(struct buf *bp); +int ssh_scsicmd(struct scsi_xfer *); #endif /* _SSHVAR_H */ diff --git a/sys/arch/mvme88k/dev/syscon.c b/sys/arch/mvme88k/dev/syscon.c index 076c694bb8c..f41f51fb09d 100644 --- a/sys/arch/mvme88k/dev/syscon.c +++ b/sys/arch/mvme88k/dev/syscon.c @@ -1,4 +1,4 @@ -/* $OpenBSD: syscon.c,v 1.9 2002/02/05 23:15:33 miod Exp $ */ +/* $OpenBSD: syscon.c,v 1.10 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * All rights reserved. @@ -87,13 +87,13 @@ struct sysconsoftc { struct intrhand sc_m188ih; /* `m188 interrupt' */ }; -void sysconattach __P((struct device *, struct device *, void *)); -int sysconmatch __P((struct device *, void *, void *)); -void setupiackvectors __P((void)); -int sysconabort __P((void *)); -int sysconacfail __P((void *)); -int sysconsysfail __P((void *)); -int sysconm188 __P((void *)); +void sysconattach(struct device *, struct device *, void *); +int sysconmatch(struct device *, void *, void *); +void setupiackvectors(void); +int sysconabort(void *); +int sysconacfail(void *); +int sysconsysfail(void *); +int sysconm188(void *); struct cfattach syscon_ca = { sizeof(struct sysconsoftc), sysconmatch, sysconattach @@ -105,8 +105,8 @@ struct cfdriver syscon_cd = { struct sysconreg *sys_syscon = NULL; -int syscon_print __P((void *args, const char *bus)); -int syscon_scan __P((struct device *parent, void *child, void *args)); +int syscon_print(void *args, const char *bus); +int syscon_scan(struct device *parent, void *child, void *args); int sysconmatch(parent, vcf, args) diff --git a/sys/arch/mvme88k/dev/sysconfunc.h b/sys/arch/mvme88k/dev/sysconfunc.h index 0855f495b27..eab59f3f24c 100644 --- a/sys/arch/mvme88k/dev/sysconfunc.h +++ b/sys/arch/mvme88k/dev/sysconfunc.h @@ -1,8 +1,8 @@ -/* $OpenBSD: sysconfunc.h,v 1.1 2001/03/08 00:03:14 miod Exp $ */ +/* $OpenBSD: sysconfunc.h,v 1.2 2002/03/14 01:26:39 millert Exp $ */ #ifndef _MVME88K_SYSCON_H_ #define _MVME88K_SYSCON_H_ -int sysconintr_establish __P((int vec, struct intrhand *ih)); +int sysconintr_establish(int vec, struct intrhand *ih); #endif /* _MVME88K_SYSCON_H_ */ diff --git a/sys/arch/mvme88k/dev/vme.c b/sys/arch/mvme88k/dev/vme.c index 5ebe3d2de15..b6f10a63631 100644 --- a/sys/arch/mvme88k/dev/vme.c +++ b/sys/arch/mvme88k/dev/vme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vme.c,v 1.18 2001/12/16 23:49:46 miod Exp $ */ +/* $OpenBSD: vme.c,v 1.19 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * Copyright (c) 1995 Theo de Raadt @@ -58,17 +58,17 @@ #include <mvme88k/dev/sysconreg.h> #endif -int vmematch __P((struct device *, void *, void *)); -void vmeattach __P((struct device *, struct device *, void *)); +int vmematch(struct device *, void *, void *); +void vmeattach(struct device *, struct device *, void *); -void vme2chip_init __P((struct vmesoftc *)); -u_long vme2chip_map __P((u_long, int, int)); -int vme2abort __P((void *)); -int sysconabort __P((void *)); -void vmeunmap __P((void *, int)); -int vmeprint __P((void *, const char *)); +void vme2chip_init(struct vmesoftc *); +u_long vme2chip_map(u_long, int, int); +int vme2abort(void *); +int sysconabort(void *); +void vmeunmap(void *, int); +int vmeprint(void *, const char *); -void vmesyscon_init __P((struct vmesoftc *)); +void vmesyscon_init(struct vmesoftc *); int vmebustype; int vmevecbase; diff --git a/sys/arch/mvme88k/dev/vme.h b/sys/arch/mvme88k/dev/vme.h index 44677a21093..ecdaf97ddb2 100644 --- a/sys/arch/mvme88k/dev/vme.h +++ b/sys/arch/mvme88k/dev/vme.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vme.h,v 1.7 2001/11/07 22:31:57 miod Exp $ */ +/* $OpenBSD: vme.h,v 1.8 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -373,11 +373,11 @@ struct vme2reg { #define VME2_A16BASE 0xffff0000UL #define VME2_A24BASE 0xff000000UL -void * vmepmap __P((struct vmesoftc *sc, off_t vmeaddr, int len, int bustype)); -void * vmemap __P((struct vmesoftc *sc, off_t vmeaddr, int len, int bustype)); -int vmerw __P((struct vmesoftc *sc, struct uio *uio, int flags, int bus)); -int vmeintr_establish __P((int vec, struct intrhand *ih)); -int vme_findvec __P((void)); -int vmescan __P((struct device *, void *, void *, int)); +void * vmepmap(struct vmesoftc *sc, off_t vmeaddr, int len, int bustype); +void * vmemap(struct vmesoftc *sc, off_t vmeaddr, int len, int bustype); +int vmerw(struct vmesoftc *sc, struct uio *uio, int flags, int bus); +int vmeintr_establish(int vec, struct intrhand *ih); +int vme_findvec(void); +int vmescan(struct device *, void *, void *, int); #endif /* __MVEME88K_DEV_VME_H__ */ diff --git a/sys/arch/mvme88k/dev/vmel.c b/sys/arch/mvme88k/dev/vmel.c index 64dccbdc9f1..d6b0354e693 100644 --- a/sys/arch/mvme88k/dev/vmel.c +++ b/sys/arch/mvme88k/dev/vmel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmel.c,v 1.7 2001/11/07 22:31:57 miod Exp $ */ +/* $OpenBSD: vmel.c,v 1.8 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -48,8 +48,8 @@ * functions will decide how many address bits are relevant. */ -void vmelattach __P((struct device *, struct device *, void *)); -int vmelmatch __P((struct device *, void *, void *)); +void vmelattach(struct device *, struct device *, void *); +int vmelmatch(struct device *, void *, void *); struct cfattach vmel_ca = { sizeof(struct vmelsoftc), vmelmatch, vmelattach @@ -59,13 +59,13 @@ struct cfdriver vmel_cd = { NULL, "vmel", DV_DULL, 0 }; -int vmelscan __P((struct device *, void *, void*)); -int vmelopen __P((dev_t, int, int)); -int vmelclose __P((dev_t, int, int)); -int vmelioctl __P((dev_t, int, caddr_t, int, struct proc *)); -int vmelread __P((dev_t, struct uio *, int)); -int vmelwrite __P((dev_t, struct uio *, int)); -paddr_t vmelmmap __P((dev_t, off_t, int)); +int vmelscan(struct device *, void *, void*); +int vmelopen(dev_t, int, int); +int vmelclose(dev_t, int, int); +int vmelioctl(dev_t, int, caddr_t, int, struct proc *); +int vmelread(dev_t, struct uio *, int); +int vmelwrite(dev_t, struct uio *, int); +paddr_t vmelmmap(dev_t, off_t, int); int vmelmatch(parent, cf, args) diff --git a/sys/arch/mvme88k/dev/vmes.c b/sys/arch/mvme88k/dev/vmes.c index 71c4c35600c..0a4b0f87d79 100644 --- a/sys/arch/mvme88k/dev/vmes.c +++ b/sys/arch/mvme88k/dev/vmes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmes.c,v 1.7 2001/11/07 22:31:57 miod Exp $ */ +/* $OpenBSD: vmes.c,v 1.8 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -48,8 +48,8 @@ * functions will decide how many address bits are relevant. */ -void vmesattach __P((struct device *, struct device *, void *)); -int vmesmatch __P((struct device *, void *, void *)); +void vmesattach(struct device *, struct device *, void *); +int vmesmatch(struct device *, void *, void *); struct cfattach vmes_ca = { sizeof(struct vmessoftc), vmesmatch, vmesattach @@ -59,13 +59,13 @@ struct cfdriver vmes_cd = { NULL, "vmes", DV_DULL, 0 }; -int vmesscan __P((struct device *, void *, void*)); -int vmesopen __P((dev_t, int, int)); -int vmesclose __P((dev_t, int, int)); -int vmesioctl __P((dev_t, int, caddr_t, int, struct proc *)); -int vmesread __P((dev_t, struct uio *, int)); -int vmeswrite __P((dev_t, struct uio *, int)); -paddr_t vmesmmap __P((dev_t, off_t, int)); +int vmesscan(struct device *, void *, void*); +int vmesopen(dev_t, int, int); +int vmesclose(dev_t, int, int); +int vmesioctl(dev_t, int, caddr_t, int, struct proc *); +int vmesread(dev_t, struct uio *, int); +int vmeswrite(dev_t, struct uio *, int); +paddr_t vmesmmap(dev_t, off_t, int); int vmesmatch(parent, cf, args) diff --git a/sys/arch/mvme88k/dev/vs.c b/sys/arch/mvme88k/dev/vs.c index 3f1e3639de3..fa0c17c6ac4 100644 --- a/sys/arch/mvme88k/dev/vs.c +++ b/sys/arch/mvme88k/dev/vs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vs.c,v 1.15 2002/01/14 21:34:39 miod Exp $ */ +/* $OpenBSD: vs.c,v 1.16 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. @@ -68,25 +68,25 @@ #include <mvme68k/dev/vme.h> /* vme_findvec() */ #endif /* mvme88k */ -int vs_checkintr __P((struct vs_softc *, struct scsi_xfer *, int *)); -void vs_chksense __P((struct scsi_xfer *)); -void vs_reset __P((struct vs_softc *)); -void vs_resync __P((struct vs_softc *)); -int vs_initialize __P((struct vs_softc *)); -int vs_nintr __P((struct vs_softc *)); -int vs_eintr __P((struct vs_softc *)); -int vs_poll __P((struct vs_softc *, struct scsi_xfer *)); -void vs_scsidone __P((struct vs_softc *, struct scsi_xfer *, int)); -M328_CQE * vs_getcqe __P((struct vs_softc *)); -M328_IOPB * vs_getiopb __P((struct vs_softc *)); -void vs_copy __P((void *, void *, unsigned short)); -void vs_zero __P((void *, u_long)); -int do_vspoll __P((struct vs_softc *, int)); -void thaw_queue __P((struct vs_softc *, u_int8_t)); -void vs_link_sg_element __P((sg_list_element_t *, vm_offset_t, int)); -void vs_link_sg_list __P((sg_list_element_t *, vm_offset_t, int)); - -static __inline__ void vs_clear_return_info __P((struct vs_softc *)); +int vs_checkintr(struct vs_softc *, struct scsi_xfer *, int *); +void vs_chksense(struct scsi_xfer *); +void vs_reset(struct vs_softc *); +void vs_resync(struct vs_softc *); +int vs_initialize(struct vs_softc *); +int vs_nintr(struct vs_softc *); +int vs_eintr(struct vs_softc *); +int vs_poll(struct vs_softc *, struct scsi_xfer *); +void vs_scsidone(struct vs_softc *, struct scsi_xfer *, int); +M328_CQE * vs_getcqe(struct vs_softc *); +M328_IOPB * vs_getiopb(struct vs_softc *); +void vs_copy(void *, void *, unsigned short); +void vs_zero(void *, u_long); +int do_vspoll(struct vs_softc *, int); +void thaw_queue(struct vs_softc *, u_int8_t); +void vs_link_sg_element(sg_list_element_t *, vm_offset_t, int); +void vs_link_sg_list(sg_list_element_t *, vm_offset_t, int); + +static __inline__ void vs_clear_return_info(struct vs_softc *); /* * 16 bit 's' memory functions. MVME328 is a D16 board. diff --git a/sys/arch/mvme88k/dev/vsdma.c b/sys/arch/mvme88k/dev/vsdma.c index b99e29e829d..0237c792dbc 100644 --- a/sys/arch/mvme88k/dev/vsdma.c +++ b/sys/arch/mvme88k/dev/vsdma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vsdma.c,v 1.8 2001/12/16 23:49:46 miod Exp $ */ +/* $OpenBSD: vsdma.c,v 1.9 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * All rights reserved. @@ -57,13 +57,13 @@ #include <mvme68k/dev/vme.h> #endif /* mvme88k */ -int vsmatch __P((struct device *, void *, void *)); -void vsattach __P((struct device *, struct device *, void *)); -int vsprint __P((void *auxp, char *)); -int vs_initialize __P((struct vs_softc *)); -int vs_intr __P((struct vs_softc *)); -int vs_nintr __P((void *)); -int vs_eintr __P((void *)); +int vsmatch(struct device *, void *, void *); +void vsattach(struct device *, struct device *, void *); +int vsprint(void *auxp, char *); +int vs_initialize(struct vs_softc *); +int vs_intr(struct vs_softc *); +int vs_nintr(void *); +int vs_eintr(void *); struct scsi_adapter vs_scsiswitch = { vs_scsicmd, diff --git a/sys/arch/mvme88k/dev/vsvar.h b/sys/arch/mvme88k/dev/vsvar.h index 1b1022d5b51..d235caf7526 100644 --- a/sys/arch/mvme88k/dev/vsvar.h +++ b/sys/arch/mvme88k/dev/vsvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vsvar.h,v 1.4 2001/08/26 02:37:07 miod Exp $ */ +/* $OpenBSD: vsvar.h,v 1.5 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * Copyright (c) 1990 The Regents of the University of California. @@ -175,20 +175,20 @@ struct vs_softc { #define WQO_RFWQ 0x0020 /* report frozen work queue bit */ #define WQO_INIT 0x8000 /* work queue init bit */ -void vs_minphys __P((struct buf *bp)); -int vs_scsicmd __P((struct scsi_xfer *)); +void vs_minphys(struct buf *bp); +int vs_scsicmd(struct scsi_xfer *); /* * Scatter/gather functions */ -M328_SG vs_alloc_scatter_gather __P((void)); -void vs_dealloc_scatter_gather __P((M328_SG sg)); -void vs_link_scatter_gather_element __P((sg_list_element_t *element, +M328_SG vs_alloc_scatter_gather(void); +void vs_dealloc_scatter_gather(M328_SG sg); +void vs_link_scatter_gather_element(sg_list_element_t *element, register vm_offset_t phys_add, - register int len)); -void vs_link_scatter_gather_list __P((sg_list_element_t *list, + register int len); +void vs_link_scatter_gather_list(sg_list_element_t *list, register vm_offset_t phys_add, - register int elements)); -M328_SG vs_build_memory_structure __P((struct scsi_xfer *xs, M328_IOPB *iopb)); + register int elements); +M328_SG vs_build_memory_structure(struct scsi_xfer *xs, M328_IOPB *iopb); #endif /* _M328VAR_H */ diff --git a/sys/arch/mvme88k/dev/vx.c b/sys/arch/mvme88k/dev/vx.c index 21faaa482e1..4b3ace157c8 100644 --- a/sys/arch/mvme88k/dev/vx.c +++ b/sys/arch/mvme88k/dev/vx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vx.c,v 1.17 2002/01/14 21:34:39 miod Exp $ */ +/* $OpenBSD: vx.c,v 1.18 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * All rights reserved. @@ -103,62 +103,62 @@ struct vxsoftc { /* prototypes */ -void *get_next_envelope __P((struct envelope *thisenv)); -struct envelope *get_status_head __P((struct vxsoftc *sc)); -void set_status_head __P((struct vxsoftc *sc, void *envp)); -struct packet *get_packet __P((struct vxsoftc *sc, struct envelope *thisenv)); -struct envelope *find_status_packet __P((struct vxsoftc *sc, struct packet * pktp)); - -void read_wakeup __P((struct vxsoftc *sc, int port)); -int bpp_send __P((struct vxsoftc *sc, void *pkt, int wait_flag)); - -int create_channels __P((struct vxsoftc *sc)); -int env_isvalid __P((struct envelope *thisenv)); -void memcpy2 __P((void *dest, const void *src, size_t size)); -void *get_free_envelope __P((struct vxsoftc *sc)); -void put_free_envelope __P((struct vxsoftc *sc, void *envp)); -void *get_free_packet __P((struct vxsoftc *sc)); -void put_free_packet __P((struct vxsoftc *sc, void *pktp)); - -int vx_init __P((struct vxsoftc *sc)); -int vx_event __P((struct vxsoftc *sc, struct packet *evntp)); - -void vx_unblock __P((struct tty *tp)); -int vx_ccparam __P((struct vxsoftc *sc, struct termios *par, int port)); - -int vx_param __P((struct tty *tp, struct termios *t)); -int vx_intr __P((void * arg)); -int vx_sintr __P((struct vxsoftc *sc)); -int vx_poll __P((struct vxsoftc *sc, struct packet *wpktp)); -void vx_overflow __P((struct vxsoftc *sc, int port, long *ptime, u_char *msg)); -void vx_frame __P((struct vxsoftc *sc, int port)); -void vx_break __P(( struct vxsoftc *sc, int port)); -int vx_mctl __P((dev_t dev, int bits, int how)); - -int vxmatch __P((struct device *parent, void *self, void *aux)); -void vxattach __P((struct device *parent, struct device *self, void *aux)); - -int vxopen __P((dev_t dev, int flag, int mode, struct proc *p)); -int vxclose __P((dev_t dev, int flag, int mode, struct proc *p)); -int vxread __P((dev_t dev, struct uio *uio, int flag)); -int vxwrite __P((dev_t dev, struct uio *uio, int flag)); -int vxioctl __P((dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)); -void vxstart __P((struct tty *tp)); -int vxstop __P((struct tty *tp, int flag)); - -void vxputc __P((struct vxsoftc *sc, int port, u_char c)); - -struct tty * vxtty __P((dev_t)); -short dtr_ctl __P((struct vxsoftc *, int, int)); -short rts_ctl __P((struct vxsoftc *, int, int)); -short flush_ctl __P((struct vxsoftc *, int, int)); -u_short vxtspeed __P((int)); -void read_chars __P((struct vxsoftc *, int)); -void ccode __P((struct vxsoftc *, int, char)); -void wzero __P((void *, size_t)); -int create_free_queue __P((struct vxsoftc *)); -void print_dump __P((struct vxsoftc *)); -struct envelope *get_cmd_tail __P((struct vxsoftc *)); +void *get_next_envelope(struct envelope *thisenv); +struct envelope *get_status_head(struct vxsoftc *sc); +void set_status_head(struct vxsoftc *sc, void *envp); +struct packet *get_packet(struct vxsoftc *sc, struct envelope *thisenv); +struct envelope *find_status_packet(struct vxsoftc *sc, struct packet * pktp); + +void read_wakeup(struct vxsoftc *sc, int port); +int bpp_send(struct vxsoftc *sc, void *pkt, int wait_flag); + +int create_channels(struct vxsoftc *sc); +int env_isvalid(struct envelope *thisenv); +void memcpy2(void *dest, const void *src, size_t size); +void *get_free_envelope(struct vxsoftc *sc); +void put_free_envelope(struct vxsoftc *sc, void *envp); +void *get_free_packet(struct vxsoftc *sc); +void put_free_packet(struct vxsoftc *sc, void *pktp); + +int vx_init(struct vxsoftc *sc); +int vx_event(struct vxsoftc *sc, struct packet *evntp); + +void vx_unblock(struct tty *tp); +int vx_ccparam(struct vxsoftc *sc, struct termios *par, int port); + +int vx_param(struct tty *tp, struct termios *t); +int vx_intr(void * arg); +int vx_sintr(struct vxsoftc *sc); +int vx_poll(struct vxsoftc *sc, struct packet *wpktp); +void vx_overflow(struct vxsoftc *sc, int port, long *ptime, u_char *msg); +void vx_frame(struct vxsoftc *sc, int port); +void vx_break( struct vxsoftc *sc, int port); +int vx_mctl(dev_t dev, int bits, int how); + +int vxmatch(struct device *parent, void *self, void *aux); +void vxattach(struct device *parent, struct device *self, void *aux); + +int vxopen(dev_t dev, int flag, int mode, struct proc *p); +int vxclose(dev_t dev, int flag, int mode, struct proc *p); +int vxread(dev_t dev, struct uio *uio, int flag); +int vxwrite(dev_t dev, struct uio *uio, int flag); +int vxioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p); +void vxstart(struct tty *tp); +int vxstop(struct tty *tp, int flag); + +void vxputc(struct vxsoftc *sc, int port, u_char c); + +struct tty * vxtty(dev_t); +short dtr_ctl(struct vxsoftc *, int, int); +short rts_ctl(struct vxsoftc *, int, int); +short flush_ctl(struct vxsoftc *, int, int); +u_short vxtspeed(int); +void read_chars(struct vxsoftc *, int); +void ccode(struct vxsoftc *, int, char); +void wzero(void *, size_t); +int create_free_queue(struct vxsoftc *); +void print_dump(struct vxsoftc *); +struct envelope *get_cmd_tail(struct vxsoftc *); struct cfattach vx_ca = { sizeof(struct vxsoftc), vxmatch, vxattach diff --git a/sys/arch/mvme88k/include/autoconf.h b/sys/arch/mvme88k/include/autoconf.h index 1828521d20f..7a191ee60c4 100644 --- a/sys/arch/mvme88k/include/autoconf.h +++ b/sys/arch/mvme88k/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.9 2001/11/09 00:12:19 miod Exp $ */ +/* $OpenBSD: autoconf.h,v 1.10 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1999, Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -58,7 +58,7 @@ struct confargs { #define BUS_SYSCON 6 #define BUS_BUSSWITCH 7 -int always_match __P((struct device *, struct cfdata *, void *)); +int always_match(struct device *, struct cfdata *, void *); #define DEVICE_UNIT(device) (device->dv_unit) #define CFDATA_LOC(cfdata) (cfdata->cf_loc) @@ -69,9 +69,9 @@ extern int bootpart; /* boot partition (disk) */ extern struct device *bootdv; /* boot device */ -void *mapiodev __P((void *pa, int size)); -void unmapiodev __P((void *kva, int size)); +void *mapiodev(void *pa, int size); +void unmapiodev(void *kva, int size); -struct device *getdevunit __P((char *name, int unit)); +struct device *getdevunit(char *name, int unit); #endif diff --git a/sys/arch/mvme88k/include/bug.h b/sys/arch/mvme88k/include/bug.h index ac6cee7cb89..265ad5fae22 100644 --- a/sys/arch/mvme88k/include/bug.h +++ b/sys/arch/mvme88k/include/bug.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bug.h,v 1.8 2001/11/27 05:36:40 miod Exp $ */ +/* $OpenBSD: bug.h,v 1.9 2002/03/14 01:26:39 millert Exp $ */ #ifndef _MACHINE_BUG_H_ #define _MACHINE_BUG_H_ @@ -8,7 +8,7 @@ struct bugenv { int dlun; int ipl; int ctlr; - int (*entry) __P((void)); + int (*entry)(void); int cfgblk; char *argstart; char *argend; diff --git a/sys/arch/mvme88k/include/bugio.h b/sys/arch/mvme88k/include/bugio.h index 0f7f6dc93d2..2f58b700b47 100644 --- a/sys/arch/mvme88k/include/bugio.h +++ b/sys/arch/mvme88k/include/bugio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bugio.h,v 1.12 2002/03/05 22:11:40 miod Exp $ */ +/* $OpenBSD: bugio.h,v 1.13 2002/03/14 01:26:39 millert Exp $ */ #ifndef __MACHINE_BUGIO_H__ #define __MACHINE_BUGIO_H__ @@ -7,13 +7,13 @@ #include <machine/prom.h> -void buginit __P((void)); -int buginstat __P((void)); -char buginchr __P((void)); -void bugoutchr __P((unsigned char)); -void bugoutstr __P((char *, char *)); -void bugrtcrd __P((struct mvmeprom_time *)); -void bugreturn __P((void)); -void bugbrdid __P((struct mvmeprom_brdid *)); +void buginit(void); +int buginstat(void); +char buginchr(void); +void bugoutchr(unsigned char); +void bugoutstr(char *, char *); +void bugrtcrd(struct mvmeprom_time *); +void bugreturn(void); +void bugbrdid(struct mvmeprom_brdid *); #endif /* __MACHINE_BUGIO_H__ */ diff --git a/sys/arch/mvme88k/include/cmmu.h b/sys/arch/mvme88k/include/cmmu.h index 4428ed13348..5e2c3ca0532 100644 --- a/sys/arch/mvme88k/include/cmmu.h +++ b/sys/arch/mvme88k/include/cmmu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cmmu.h,v 1.10 2001/12/22 09:49:39 smurph Exp $ */ +/* $OpenBSD: cmmu.h,v 1.11 2002/03/14 01:26:39 millert Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1992 Carnegie Mellon University @@ -77,38 +77,38 @@ extern struct simplelock cmmu_cpu_lock; /* machine dependant cmmu function pointer structure */ struct cmmu_p { - void (*cmmu_init_func) __P((void)); - void (*show_apr_func) __P((unsigned)); - void (*setup_board_config_func) __P((void)); - void (*setup_cmmu_config_func) __P((void)); - void (*cmmu_dump_config_func) __P((void)); - void (*cpu_configuration_print_func) __P((int)); - void (*cmmu_shutdown_now_func) __P((void)); - void (*cmmu_parity_enable_func) __P((void)); - unsigned (*cmmu_cpu_number_func) __P((void)); - unsigned (*cmmu_get_idr_func) __P((unsigned)); - void (*cmmu_set_sapr_func) __P((unsigned)); - void (*cmmu_remote_set_sapr_func) __P((unsigned, unsigned)); - void (*cmmu_set_uapr_func) __P((unsigned)); - void (*cmmu_set_batc_entry_func) __P((unsigned, unsigned, unsigned, unsigned)); - void (*cmmu_set_pair_batc_entry_func) __P((unsigned, unsigned, unsigned)); - void (*cmmu_flush_remote_tlb_func) __P((unsigned, unsigned, vm_offset_t, int)); - void (*cmmu_flush_tlb_func) __P((unsigned, vm_offset_t, int)); - void (*cmmu_pmap_activate_func) __P((unsigned, unsigned, + void (*cmmu_init_func)(void); + void (*show_apr_func)(unsigned); + void (*setup_board_config_func)(void); + void (*setup_cmmu_config_func)(void); + void (*cmmu_dump_config_func)(void); + void (*cpu_configuration_print_func)(int); + void (*cmmu_shutdown_now_func)(void); + void (*cmmu_parity_enable_func)(void); + unsigned (*cmmu_cpu_number_func)(void); + unsigned (*cmmu_get_idr_func)(unsigned); + void (*cmmu_set_sapr_func)(unsigned); + void (*cmmu_remote_set_sapr_func)(unsigned, unsigned); + void (*cmmu_set_uapr_func)(unsigned); + void (*cmmu_set_batc_entry_func)(unsigned, unsigned, unsigned, unsigned); + void (*cmmu_set_pair_batc_entry_func)(unsigned, unsigned, unsigned); + void (*cmmu_flush_remote_tlb_func)(unsigned, unsigned, vm_offset_t, int); + void (*cmmu_flush_tlb_func)(unsigned, vm_offset_t, int); + void (*cmmu_pmap_activate_func)(unsigned, unsigned, batc_template_t i_batc[BATC_MAX], - batc_template_t d_batc[BATC_MAX])); - void (*cmmu_flush_remote_cache_func) __P((int, vm_offset_t, int)); - void (*cmmu_flush_cache_func) __P((vm_offset_t, int)); - void (*cmmu_flush_remote_inst_cache_func) __P((int, vm_offset_t, int)); - void (*cmmu_flush_inst_cache_func) __P((vm_offset_t, int)); - void (*cmmu_flush_remote_data_cache_func) __P((int, vm_offset_t, int)); - void (*cmmu_flush_data_cache_func) __P((vm_offset_t, int)); - void (*dma_cachectl_func) __P((vm_offset_t, int, int)); + batc_template_t d_batc[BATC_MAX]); + void (*cmmu_flush_remote_cache_func)(int, vm_offset_t, int); + void (*cmmu_flush_cache_func)(vm_offset_t, int); + void (*cmmu_flush_remote_inst_cache_func)(int, vm_offset_t, int); + void (*cmmu_flush_inst_cache_func)(vm_offset_t, int); + void (*cmmu_flush_remote_data_cache_func)(int, vm_offset_t, int); + void (*cmmu_flush_data_cache_func)(vm_offset_t, int); + void (*dma_cachectl_func)(vm_offset_t, int, int); #ifdef DDB - unsigned (*cmmu_get_by_mode_func) __P((int, int)); - void (*cmmu_show_translation_func) __P((unsigned, unsigned, unsigned, int)); - void (*cmmu_cache_state_func) __P((unsigned, unsigned)); - void (*show_cmmu_info_func) __P((unsigned)); + unsigned (*cmmu_get_by_mode_func)(int, int); + void (*cmmu_show_translation_func)(unsigned, unsigned, unsigned, int); + void (*cmmu_cache_state_func)(unsigned, unsigned); + void (*show_cmmu_info_func)(unsigned); #endif /* end if DDB */ }; diff --git a/sys/arch/mvme88k/include/cpu.h b/sys/arch/mvme88k/include/cpu.h index d5b62027ba3..11481c03263 100644 --- a/sys/arch/mvme88k/include/cpu.h +++ b/sys/arch/mvme88k/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.17 2002/01/14 21:34:41 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.18 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Copyright (c) 1992, 1993 @@ -150,14 +150,14 @@ extern int want_resched; /* resched() was called */ #define signotify(p) (want_ast = 1) struct intrhand { - int (*ih_fn) __P((void *)); + int (*ih_fn)(void *); void *ih_arg; int ih_ipl; int ih_wantframe; struct intrhand *ih_next; }; -int intr_establish __P((int vec, struct intrhand *)); +int intr_establish(int vec, struct intrhand *); /* * return values for intr_establish() @@ -186,11 +186,11 @@ struct switchframe { /* This struct defines the machine dependant pointers */ struct md_p { - void (*clock_init_func) __P((void)); /* interval clock init function */ - void (*statclock_init_func) __P((void)); /* statistics clock init function */ - void (*delayclock_init_func) __P((void)); /* delay clock init function */ - void (*delay_func) __P((void)); /* delay clock function */ - void (*interrupt_func) __P((u_int, struct m88100_saved_state *)); /* interrupt func */ + void (*clock_init_func)(void); /* interval clock init function */ + void (*statclock_init_func)(void); /* statistics clock init function */ + void (*delayclock_init_func)(void); /* delay clock init function */ + void (*delay_func)(void); /* delay clock function */ + void (*interrupt_func)(u_int, struct m88100_saved_state *); /* interrupt func */ u_char *volatile intr_mask; u_char *volatile intr_ipl; u_char *volatile intr_src; @@ -199,8 +199,8 @@ struct md_p { extern struct md_p md; -int badvaddr __P((vm_offset_t va, int size)); -void nmihand __P((void *framep)); +int badvaddr(vm_offset_t va, int size); +void nmihand(void *framep); #endif /* _KERNEL */ #endif /* __MACHINE_CPU_H__ */ diff --git a/sys/arch/mvme88k/include/cpu_number.h b/sys/arch/mvme88k/include/cpu_number.h index 7744fc4d8ed..afe5c25416d 100644 --- a/sys/arch/mvme88k/include/cpu_number.h +++ b/sys/arch/mvme88k/include/cpu_number.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu_number.h,v 1.9 2001/12/19 07:04:41 smurph Exp $ */ +/* $OpenBSD: cpu_number.h,v 1.10 2002/03/14 01:26:39 millert Exp $ */ /* * Mach Operating System @@ -34,7 +34,7 @@ #include <machine/param.h> extern unsigned number_cpus; -static unsigned cpu_number __P((void)); +static unsigned cpu_number(void); static __inline__ unsigned cpu_number(void) { diff --git a/sys/arch/mvme88k/include/db_machdep.h b/sys/arch/mvme88k/include/db_machdep.h index 286f136553a..0cb1ce46d6f 100644 --- a/sys/arch/mvme88k/include/db_machdep.h +++ b/sys/arch/mvme88k/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.19 2001/12/22 08:31:05 smurph Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.20 2002/03/14 01:26:39 millert Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -116,15 +116,15 @@ extern int quiet_db_read_bytes; /*#define cngetc db_getc*/ /*#define cnputc db_putc*/ -unsigned inst_load __P((unsigned)); -unsigned inst_store __P((unsigned)); -boolean_t inst_branch __P((unsigned)); -db_addr_t next_instr_address __P((db_addr_t, unsigned)); +unsigned inst_load(unsigned); +unsigned inst_store(unsigned); +boolean_t inst_branch(unsigned); +db_addr_t next_instr_address(db_addr_t, unsigned); db_addr_t branch_taken __P((u_int, db_addr_t, - db_expr_t (*) __P((db_regs_t *, int)), + db_expr_t (*)(db_regs_t *, int), db_regs_t *)); -int ddb_break_trap __P((int type, db_regs_t *eframe)); -int ddb_entry_trap __P((int level, db_regs_t *eframe)); +int ddb_break_trap(int type, db_regs_t *eframe); +int ddb_entry_trap(int level, db_regs_t *eframe); /* breakpoint/watchpoint foo */ #define IS_BREAKPOINT_TRAP(type,code) ((type)==T_KDB_BREAK) @@ -138,9 +138,9 @@ int ddb_entry_trap __P((int level, db_regs_t *eframe)); #define DB_NO_COFF 1 #ifdef INTERNAL_SSTEP -extern register_t getreg_val __P((db_regs_t *, int)); -void db_set_single_step __P((register db_regs_t *)); -void db_clear_single_step __P((register db_regs_t *)); +extern register_t getreg_val(db_regs_t *, int); +void db_set_single_step(register db_regs_t *); +void db_clear_single_step(register db_regs_t *); #else /* need software single step */ #define SOFTWARE_SSTEP 1 /* we need this for mc88100 */ @@ -200,7 +200,7 @@ void db_clear_single_step __P((register db_regs_t *)); #define db_printf_enter db_printing -int m88k_print_instruction __P((unsigned iadr, long inst)); +int m88k_print_instruction(unsigned iadr, long inst); #endif /* _LOCORE */ diff --git a/sys/arch/mvme88k/include/float.h b/sys/arch/mvme88k/include/float.h index b082b29d064..12ca769eea8 100644 --- a/sys/arch/mvme88k/include/float.h +++ b/sys/arch/mvme88k/include/float.h @@ -1,4 +1,4 @@ -/* $OpenBSD: float.h,v 1.5 2001/08/12 12:03:02 heko Exp $ */ +/* $OpenBSD: float.h,v 1.6 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1989 Regents of the University of California. @@ -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/mvme88k/include/intr.h b/sys/arch/mvme88k/include/intr.h index c544bc10a04..1fd9dca3ea6 100644 --- a/sys/arch/mvme88k/include/intr.h +++ b/sys/arch/mvme88k/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.7 2002/02/10 23:15:05 deraadt Exp $ */ +/* $OpenBSD: intr.h,v 1.8 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (C) 2000 Steve Murphree, Jr. * All rights reserved. @@ -82,11 +82,11 @@ extern int intrcnt[M88K_NIRQ]; #ifdef _KERNEL #ifndef _LOCORE -unsigned setipl __P((unsigned level)); +unsigned setipl(unsigned level); #ifdef DDB -unsigned db_setipl __P((unsigned level)); +unsigned db_setipl(unsigned level); #endif -int spl0 __P((void)); +int spl0(void); #endif /* _LOCORE */ /* needs major cleanup - XXX nivas */ diff --git a/sys/arch/mvme88k/include/locore.h b/sys/arch/mvme88k/include/locore.h index d90cc9d32ed..cd6edf459ca 100644 --- a/sys/arch/mvme88k/include/locore.h +++ b/sys/arch/mvme88k/include/locore.h @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.h,v 1.15 2002/01/14 21:34:41 miod Exp $ */ +/* $OpenBSD: locore.h,v 1.16 2002/03/14 01:26:39 millert Exp $ */ #ifndef _MACHINE_LOCORE_H_ #define _MACHINE_LOCORE_H_ @@ -11,99 +11,99 @@ /* locore_asm_routines.S */ -unsigned int do_load_word __P((vm_offset_t address, - boolean_t supervisor_mode)); -unsigned int do_load_half __P((vm_offset_t address, - boolean_t supervisor_mode)); -unsigned int do_load_byte __P((vm_offset_t address, - boolean_t supervisor_mode)); - -void do_store_word __P((vm_offset_t address, unsigned int data, - boolean_t supervisor_mode)); -void do_store_half __P((vm_offset_t address, unsigned int data, - boolean_t supervisor_mode)); -void do_store_byte __P((vm_offset_t address, unsigned int data, - boolean_t supervisor_mode)); - -unsigned do_xmem_word __P((vm_offset_t address, unsigned int data, - boolean_t supervisor_mode)); -unsigned do_xmem_byte __P((vm_offset_t address, unsigned int data, - boolean_t supervisor_mode)); - -unsigned read_processor_identification_register __P((void)); -int badaddr __P((vm_offset_t addr, int size)); +unsigned int do_load_word(vm_offset_t address, + boolean_t supervisor_mode); +unsigned int do_load_half(vm_offset_t address, + boolean_t supervisor_mode); +unsigned int do_load_byte(vm_offset_t address, + boolean_t supervisor_mode); + +void do_store_word(vm_offset_t address, unsigned int data, + boolean_t supervisor_mode); +void do_store_half(vm_offset_t address, unsigned int data, + boolean_t supervisor_mode); +void do_store_byte(vm_offset_t address, unsigned int data, + boolean_t supervisor_mode); + +unsigned do_xmem_word(vm_offset_t address, unsigned int data, + boolean_t supervisor_mode); +unsigned do_xmem_byte(vm_offset_t address, unsigned int data, + boolean_t supervisor_mode); + +unsigned read_processor_identification_register(void); +int badaddr(vm_offset_t addr, int size); #define badwordaddr(x) badaddr(x, 4) -void set_cpu_number __P((unsigned number)); -void doboot __P((void)); -int db_are_interrupts_disabled __P((void)); +void set_cpu_number(unsigned number); +void doboot(void); +int db_are_interrupts_disabled(void); -void fubail __P((void)); -void subail __P((void)); +void fubail(void); +void subail(void); -int guarded_access __P((unsigned char *volatile address, - unsigned len, u_char *vec)); +int guarded_access(unsigned char *volatile address, + unsigned len, u_char *vec); /* locore_c_routines.c */ #ifdef M88100 -void dae_print __P((unsigned *eframe)); -void data_access_emulation __P((unsigned *eframe)); +void dae_print(unsigned *eframe); +void data_access_emulation(unsigned *eframe); #endif -unsigned spl __P((void)); -unsigned getipl __P((void)); +unsigned spl(void); +unsigned getipl(void); #ifdef DDB -unsigned db_spl __P((void)); -unsigned db_getipl __P((void)); +unsigned db_spl(void); +unsigned db_getipl(void); #endif /* machdep.c */ -void _doboot __P((void)); -vm_offset_t get_slave_stack __P((void)); -void slave_pre_main __P((void)); -int slave_main __P((void)); -int intr_findvec __P((int start, int end)); -void bugsyscall __P((void)); -void myetheraddr __P((u_char *cp)); -void dosoftint __P((void)); -void MY_info __P((struct trapframe *f, caddr_t p, int flags, char *s)); -void MY_info_done __P((struct trapframe *f, int flags)); -void mvme_bootstrap __P((void)); +void _doboot(void); +vm_offset_t get_slave_stack(void); +void slave_pre_main(void); +int slave_main(void); +int intr_findvec(int start, int end); +void bugsyscall(void); +void myetheraddr(u_char *cp); +void dosoftint(void); +void MY_info(struct trapframe *f, caddr_t p, int flags, char *s); +void MY_info_done(struct trapframe *f, int flags); +void mvme_bootstrap(void); #ifdef MVME187 -void m187_ext_int __P((u_int v, struct m88100_saved_state *eframe)); +void m187_ext_int(u_int v, struct m88100_saved_state *eframe); #endif #ifdef MVME188 -void m188_reset __P((void)); -void m188_ext_int __P((u_int v, struct m88100_saved_state *eframe)); -unsigned int safe_level __P((unsigned mask, unsigned curlevel)); +void m188_reset(void); +void m188_ext_int(u_int v, struct m88100_saved_state *eframe); +unsigned int safe_level(unsigned mask, unsigned curlevel); #endif #ifdef MVME197 -void m197_ext_int __P((u_int v, struct m88100_saved_state *eframe)); +void m197_ext_int(u_int v, struct m88100_saved_state *eframe); #endif /* eh.S */ struct proc; -void proc_do_uret __P((struct proc *)); +void proc_do_uret(struct proc *); #ifdef M88100 -void sigsys __P((void)); -void sigtrap __P((void)); -void stepbpt __P((void)); -void userbpt __P((void)); -void syscall_handler __P((void)); +void sigsys(void); +void sigtrap(void); +void stepbpt(void); +void userbpt(void); +void syscall_handler(void); #endif #ifdef M88110 -void m88110_sigsys __P((void)); -void m88110_sigtrap __P((void)); -void m88110_stepbpt __P((void)); -void m88110_userbpt __P((void)); -void m88110_syscall_handler __P((void)); +void m88110_sigsys(void); +void m88110_sigtrap(void); +void m88110_stepbpt(void); +void m88110_userbpt(void); +void m88110_syscall_handler(void); #endif /* process.S */ -void savectx __P((struct pcb *)); -void switch_exit __P((struct proc *)); +void savectx(struct pcb *); +void switch_exit(struct proc *); #endif /* _MACHINE_LOCORE_H_ */ diff --git a/sys/arch/mvme88k/include/m88110.h b/sys/arch/mvme88k/include/m88110.h index 2190b51aa25..d2ec14e6e19 100644 --- a/sys/arch/mvme88k/include/m88110.h +++ b/sys/arch/mvme88k/include/m88110.h @@ -1,4 +1,4 @@ -/* $OpenBSD: m88110.h,v 1.11 2001/12/22 09:49:39 smurph Exp $ */ +/* $OpenBSD: m88110.h,v 1.12 2002/03/14 01:26:39 millert Exp $ */ #ifndef __MACHINE_M88110_H__ #define __MACHINE_M88110_H__ @@ -143,94 +143,94 @@ /* * Prototypes from "mvme88k/mvme88k/m88110_cmmu.c" */ -void m88110_show_apr __P((unsigned)); -void m88110_show_sctr __P((unsigned)); -void m88110_setup_board_config __P((void)); -void m88110_setup_cmmu_config __P((void)); -void m88110_cmmu_dump_config __P((void)); -void m88110_cpu_configuration_print __P((int)); -void m88110_cmmu_shutdown_now __P((void)); -void m88110_cmmu_parity_enable __P((void)); -unsigned m88110_cmmu_cpu_number __P((void)); -unsigned m88110_cmmu_get_idr __P((unsigned)); -void m88110_cmmu_set_sapr __P((unsigned)); -void m88110_cmmu_remote_set_sapr __P((unsigned, unsigned)); -void m88110_cmmu_set_uapr __P((unsigned)); -void m88110_cmmu_set_batc_entry __P((unsigned, unsigned, unsigned, unsigned)); -void m88110_cmmu_set_pair_batc_entry __P((unsigned, unsigned, unsigned)); -void m88110_cmmu_flush_remote_tlb __P((unsigned, unsigned, vm_offset_t, int)); -void m88110_cmmu_flush_tlb __P((unsigned, vm_offset_t, int)); -void m88110_cmmu_pmap_activate __P((unsigned, unsigned, +void m88110_show_apr(unsigned); +void m88110_show_sctr(unsigned); +void m88110_setup_board_config(void); +void m88110_setup_cmmu_config(void); +void m88110_cmmu_dump_config(void); +void m88110_cpu_configuration_print(int); +void m88110_cmmu_shutdown_now(void); +void m88110_cmmu_parity_enable(void); +unsigned m88110_cmmu_cpu_number(void); +unsigned m88110_cmmu_get_idr(unsigned); +void m88110_cmmu_set_sapr(unsigned); +void m88110_cmmu_remote_set_sapr(unsigned, unsigned); +void m88110_cmmu_set_uapr(unsigned); +void m88110_cmmu_set_batc_entry(unsigned, unsigned, unsigned, unsigned); +void m88110_cmmu_set_pair_batc_entry(unsigned, unsigned, unsigned); +void m88110_cmmu_flush_remote_tlb(unsigned, unsigned, vm_offset_t, int); +void m88110_cmmu_flush_tlb(unsigned, vm_offset_t, int); +void m88110_cmmu_pmap_activate(unsigned, unsigned, batc_template_t i_batc[BATC_MAX], - batc_template_t d_batc[BATC_MAX])); -void m88110_cmmu_flush_remote_cache __P((int, vm_offset_t, int)); -void m88110_cmmu_flush_cache __P((vm_offset_t, int)); -void m88110_cmmu_flush_remote_inst_cache __P((int, vm_offset_t, int)); -void m88110_cmmu_flush_inst_cache __P((vm_offset_t, int)); -void m88110_cmmu_flush_remote_data_cache __P((int, vm_offset_t, int)); -void m88110_cmmu_flush_data_cache __P((vm_offset_t, int)); -void m88110_dma_cachectl __P((vm_offset_t, int, int)); + batc_template_t d_batc[BATC_MAX]); +void m88110_cmmu_flush_remote_cache(int, vm_offset_t, int); +void m88110_cmmu_flush_cache(vm_offset_t, int); +void m88110_cmmu_flush_remote_inst_cache(int, vm_offset_t, int); +void m88110_cmmu_flush_inst_cache(vm_offset_t, int); +void m88110_cmmu_flush_remote_data_cache(int, vm_offset_t, int); +void m88110_cmmu_flush_data_cache(vm_offset_t, int); +void m88110_dma_cachectl(vm_offset_t, int, int); #if DDB -unsigned m88110_cmmu_get_by_mode __P((int, int)); -void m88110_cmmu_show_translation __P((unsigned, unsigned, unsigned, int)); -void m88110_cmmu_cache_state __P((unsigned, unsigned)); -void m88110_show_cmmu_info __P((unsigned)); +unsigned m88110_cmmu_get_by_mode(int, int); +void m88110_cmmu_show_translation(unsigned, unsigned, unsigned, int); +void m88110_cmmu_cache_state(unsigned, unsigned); +void m88110_show_cmmu_info(unsigned); #endif -void m88110_cmmu_init __P((void)); -int m88110_table_search __P((pmap_t, vm_offset_t, int, int, int)); - -void set_icmd __P((unsigned value)); -void set_ictl __P((unsigned value)); -void set_isar __P((unsigned value)); -void set_isap __P((unsigned value)); -void set_iuap __P((unsigned value)); -void set_iir __P((unsigned value)); -void set_ibp __P((unsigned value)); -void set_ippu __P((unsigned value)); -void set_ippl __P((unsigned value)); -void set_isr __P((unsigned value)); -void set_ilar __P((unsigned value)); -void set_ipar __P((unsigned value)); -void set_dcmd __P((unsigned value)); -void set_dctl __P((unsigned value)); -void set_dsar __P((unsigned value)); -void set_dsap __P((unsigned value)); -void set_duap __P((unsigned value)); -void set_dir __P((unsigned value)); -void set_dbp __P((unsigned value)); -void set_dppu __P((unsigned value)); -void set_dppl __P((unsigned value)); -void set_dsr __P((unsigned value)); -void set_dlar __P((unsigned value)); -void set_dpar __P((unsigned value)); +void m88110_cmmu_init(void); +int m88110_table_search(pmap_t, vm_offset_t, int, int, int); + +void set_icmd(unsigned value); +void set_ictl(unsigned value); +void set_isar(unsigned value); +void set_isap(unsigned value); +void set_iuap(unsigned value); +void set_iir(unsigned value); +void set_ibp(unsigned value); +void set_ippu(unsigned value); +void set_ippl(unsigned value); +void set_isr(unsigned value); +void set_ilar(unsigned value); +void set_ipar(unsigned value); +void set_dcmd(unsigned value); +void set_dctl(unsigned value); +void set_dsar(unsigned value); +void set_dsap(unsigned value); +void set_duap(unsigned value); +void set_dir(unsigned value); +void set_dbp(unsigned value); +void set_dppu(unsigned value); +void set_dppl(unsigned value); +void set_dsr(unsigned value); +void set_dlar(unsigned value); +void set_dpar(unsigned value); /* get routines */ -unsigned get_icmd __P((void)); -unsigned get_ictl __P((void)); -unsigned get_isar __P((void)); -unsigned get_isap __P((void)); -unsigned get_iuap __P((void)); -unsigned get_iir __P((void)); -unsigned get_ibp __P((void)); -unsigned get_ippu __P((void)); -unsigned get_ippl __P((void)); -unsigned get_isr __P((void)); -unsigned get_ilar __P((void)); -unsigned get_ipar __P((void)); -unsigned get_dcmd __P((void)); -unsigned get_dctl __P((void)); -unsigned get_dsar __P((void)); -unsigned get_dsap __P((void)); -unsigned get_duap __P((void)); -unsigned get_dir __P((void)); -unsigned get_dbp __P((void)); -unsigned get_dppu __P((void)); -unsigned get_dppl __P((void)); -unsigned get_dsr __P((void)); -unsigned get_dlar __P((void)); -unsigned get_dpar __P((void)); +unsigned get_icmd(void); +unsigned get_ictl(void); +unsigned get_isar(void); +unsigned get_isap(void); +unsigned get_iuap(void); +unsigned get_iir(void); +unsigned get_ibp(void); +unsigned get_ippu(void); +unsigned get_ippl(void); +unsigned get_isr(void); +unsigned get_ilar(void); +unsigned get_ipar(void); +unsigned get_dcmd(void); +unsigned get_dctl(void); +unsigned get_dsar(void); +unsigned get_dsap(void); +unsigned get_duap(void); +unsigned get_dir(void); +unsigned get_dbp(void); +unsigned get_dppu(void); +unsigned get_dppl(void); +unsigned get_dsr(void); +unsigned get_dlar(void); +unsigned get_dpar(void); /* Cache inlines */ diff --git a/sys/arch/mvme88k/include/m8820x.h b/sys/arch/mvme88k/include/m8820x.h index 64535a472dc..e30ffcee6c2 100644 --- a/sys/arch/mvme88k/include/m8820x.h +++ b/sys/arch/mvme88k/include/m8820x.h @@ -1,4 +1,4 @@ -/* $OpenBSD: m8820x.h,v 1.5 2001/12/22 09:49:39 smurph Exp $ */ +/* $OpenBSD: m8820x.h,v 1.6 2002/03/14 01:26:39 millert Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1992 Carnegie Mellon University @@ -128,41 +128,41 @@ /* * Prototypes from "mvme88k/mvme88k/m8820x.c" */ -void m8820x_show_apr __P((unsigned)); -void m8820x_setup_board_config __P((void)); -void m8820x_setup_cmmu_config __P((void)); -void m8820x_cmmu_dump_config __P((void)); -void m8820x_cpu_configuration_print __P((int)); -void m8820x_cmmu_shutdown_now __P((void)); -void m8820x_cmmu_parity_enable __P((void)); -unsigned m8820x_cmmu_cpu_number __P((void)); -unsigned m8820x_cmmu_get_idr __P((unsigned)); -void m8820x_cmmu_set_sapr __P((unsigned)); -void m8820x_cmmu_remote_set_sapr __P((unsigned, unsigned)); -void m8820x_cmmu_set_uapr __P((unsigned)); -void m8820x_cmmu_set_batc_entry __P((unsigned, unsigned, unsigned, unsigned)); -void m8820x_cmmu_set_pair_batc_entry __P((unsigned, unsigned, unsigned)); -void m8820x_cmmu_flush_remote_tlb __P((unsigned, unsigned, vm_offset_t, int)); -void m8820x_cmmu_flush_tlb __P((unsigned, vm_offset_t, int)); -void m8820x_cmmu_pmap_activate __P((unsigned, unsigned, +void m8820x_show_apr(unsigned); +void m8820x_setup_board_config(void); +void m8820x_setup_cmmu_config(void); +void m8820x_cmmu_dump_config(void); +void m8820x_cpu_configuration_print(int); +void m8820x_cmmu_shutdown_now(void); +void m8820x_cmmu_parity_enable(void); +unsigned m8820x_cmmu_cpu_number(void); +unsigned m8820x_cmmu_get_idr(unsigned); +void m8820x_cmmu_set_sapr(unsigned); +void m8820x_cmmu_remote_set_sapr(unsigned, unsigned); +void m8820x_cmmu_set_uapr(unsigned); +void m8820x_cmmu_set_batc_entry(unsigned, unsigned, unsigned, unsigned); +void m8820x_cmmu_set_pair_batc_entry(unsigned, unsigned, unsigned); +void m8820x_cmmu_flush_remote_tlb(unsigned, unsigned, vm_offset_t, int); +void m8820x_cmmu_flush_tlb(unsigned, vm_offset_t, int); +void m8820x_cmmu_pmap_activate(unsigned, unsigned, batc_template_t i_batc[BATC_MAX], - batc_template_t d_batc[BATC_MAX])); -void m8820x_cmmu_flush_remote_cache __P((int, vm_offset_t, int)); -void m8820x_cmmu_flush_cache __P((vm_offset_t, int)); -void m8820x_cmmu_flush_remote_inst_cache __P((int, vm_offset_t, int)); -void m8820x_cmmu_flush_inst_cache __P((vm_offset_t, int)); -void m8820x_cmmu_flush_remote_data_cache __P((int, vm_offset_t, int)); -void m8820x_cmmu_flush_data_cache __P((vm_offset_t, int)); -void m8820x_dma_cachectl __P((vm_offset_t, int, int)); + batc_template_t d_batc[BATC_MAX]); +void m8820x_cmmu_flush_remote_cache(int, vm_offset_t, int); +void m8820x_cmmu_flush_cache(vm_offset_t, int); +void m8820x_cmmu_flush_remote_inst_cache(int, vm_offset_t, int); +void m8820x_cmmu_flush_inst_cache(vm_offset_t, int); +void m8820x_cmmu_flush_remote_data_cache(int, vm_offset_t, int); +void m8820x_cmmu_flush_data_cache(vm_offset_t, int); +void m8820x_dma_cachectl(vm_offset_t, int, int); #if DDB -unsigned m8820x_cmmu_get_by_mode __P((int, int)); -void m8820x_cmmu_show_translation __P((unsigned, unsigned, unsigned, int)); -void m8820x_cmmu_cache_state __P((unsigned, unsigned)); -void m8820x_show_cmmu_info __P((unsigned)); +unsigned m8820x_cmmu_get_by_mode(int, int); +void m8820x_cmmu_show_translation(unsigned, unsigned, unsigned, int); +void m8820x_cmmu_cache_state(unsigned, unsigned); +void m8820x_show_cmmu_info(unsigned); #endif -void m8820x_cmmu_init __P((void)); +void m8820x_cmmu_init(void); #endif /* _LOCORE */ diff --git a/sys/arch/mvme88k/include/mmu.h b/sys/arch/mvme88k/include/mmu.h index a59fb8eebcc..5754b0d8641 100644 --- a/sys/arch/mvme88k/include/mmu.h +++ b/sys/arch/mvme88k/include/mmu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mmu.h,v 1.16 2001/12/24 04:12:37 miod Exp $ */ +/* $OpenBSD: mmu.h,v 1.17 2002/03/14 01:26:39 millert Exp $ */ /* * This file bears almost no resemblance to the original m68k file, @@ -265,7 +265,7 @@ typedef u_int32_t pt_ind_entry_t; #define DMA_CACHE_SYNC_INVAL 0x2 #define DMA_CACHE_INV 0x3 -void dma_cachectl __P((vm_offset_t, int, int)); +void dma_cachectl(vm_offset_t, int, int); /* * Alignment checks for pages (must lie on page boundaries). @@ -276,7 +276,7 @@ void dma_cachectl __P((vm_offset_t, int, int)); if (!PAGE_ALIGNED(ad)) \ printf("%s: addr %x not page aligned.\n", who, ad) -unsigned invalidate_pte __P((pt_entry_t *)); +unsigned invalidate_pte(pt_entry_t *); extern vm_offset_t kmapva; @@ -284,7 +284,7 @@ extern vm_offset_t kmapva; ((pt_entry_t *)(PG_PFNUM(*((sdt_entry_t *)kmapva + \ SDTIDX(va) + SDT_ENTRIES)) << PDT_SHIFT) + PDTIDX(va)) -u_int kvtop __P((vm_offset_t)); +u_int kvtop(vm_offset_t); #endif /* __MACHINE_MMU_H__ */ diff --git a/sys/arch/mvme88k/include/param.h b/sys/arch/mvme88k/include/param.h index ca85f79244e..5a8ed66f9c3 100644 --- a/sys/arch/mvme88k/include/param.h +++ b/sys/arch/mvme88k/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.26 2001/12/19 07:04:41 smurph Exp $ */ +/* $OpenBSD: param.h,v 1.27 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * Copyright (c) 1988 University of Utah. @@ -169,7 +169,7 @@ #include <machine/intr.h> #ifdef _KERNEL -extern int delay __P((int)); +extern int delay(int); #define DELAY(x) delay(x) extern int cputyp; diff --git a/sys/arch/mvme88k/include/pmap.h b/sys/arch/mvme88k/include/pmap.h index 1e0246cdfc8..71b0a667478 100644 --- a/sys/arch/mvme88k/include/pmap.h +++ b/sys/arch/mvme88k/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.25 2002/02/05 22:52:48 miod Exp $ */ +/* $OpenBSD: pmap.h,v 1.26 2002/03/14 01:26:39 millert Exp $ */ /* * Mach Operating System * Copyright (c) 1991 Carnegie Mellon University @@ -80,8 +80,8 @@ extern caddr_t vmmap; #define PMAP_ACTIVATE(proc) pmap_activate(proc) #define PMAP_DEACTIVATE(proc) pmap_deactivate(proc) -void pmap_bootstrap __P((vaddr_t, paddr_t *, paddr_t *, vaddr_t *, vaddr_t *)); -void pmap_cache_ctrl __P((pmap_t, vaddr_t, vaddr_t, unsigned)); +void pmap_bootstrap(vaddr_t, paddr_t *, paddr_t *, vaddr_t *, vaddr_t *); +void pmap_cache_ctrl(pmap_t, vaddr_t, vaddr_t, unsigned); #endif /* _KERNEL */ diff --git a/sys/arch/mvme88k/include/pmap_table.h b/sys/arch/mvme88k/include/pmap_table.h index d3dd661d0b1..4fb8c331ab7 100644 --- a/sys/arch/mvme88k/include/pmap_table.h +++ b/sys/arch/mvme88k/include/pmap_table.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_table.h,v 1.7 2001/08/12 12:03:02 heko Exp $ */ +/* $OpenBSD: pmap_table.h,v 1.8 2002/03/14 01:26:39 millert Exp $ */ /* * Mach Operating System * Copyright (c) 1992 Carnegie Mellon University @@ -44,6 +44,6 @@ typedef struct { typedef pmap_table_entry *pmap_table_t; -pmap_table_t pmap_table_build __P((unsigned memory_size)); +pmap_table_t pmap_table_build(unsigned memory_size); #endif /* __MACHINE_PAMP_TABLE_H__ */ diff --git a/sys/arch/mvme88k/include/trap.h b/sys/arch/mvme88k/include/trap.h index a03a119eaf3..702375ca1ad 100644 --- a/sys/arch/mvme88k/include/trap.h +++ b/sys/arch/mvme88k/include/trap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.h,v 1.15 2001/12/22 17:57:11 smurph Exp $ */ +/* $OpenBSD: trap.h,v 1.16 2002/03/14 01:26:39 millert Exp $ */ /* * Mach Operating System * Copyright (c) 1992 Carnegie Mellon University @@ -73,29 +73,29 @@ #define T_USER 29 /* user mode fault */ #ifndef _LOCORE -void panictrap __P((int, struct m88100_saved_state *)); -void test_trap __P((struct m88100_saved_state *)); -void error_fault __P((struct m88100_saved_state *)); -void error_reset __P((struct m88100_saved_state *)); -unsigned ss_get_value __P((struct proc *, unsigned, int)); -int ss_put_value __P((struct proc *, unsigned, unsigned, int)); +void panictrap(int, struct m88100_saved_state *); +void test_trap(struct m88100_saved_state *); +void error_fault(struct m88100_saved_state *); +void error_reset(struct m88100_saved_state *); +unsigned ss_get_value(struct proc *, unsigned, int); +int ss_put_value(struct proc *, unsigned, unsigned, int); unsigned ss_branch_taken __P((unsigned, unsigned, - unsigned (*func) __P((unsigned int, struct trapframe *)), + unsigned (*func)(unsigned int, struct trapframe *), struct trapframe *)); /* 'opaque' */ -unsigned ss_getreg_val __P((unsigned, struct trapframe *)); -int ss_inst_branch __P((unsigned)); -int ss_inst_delayed __P((unsigned)); -unsigned ss_next_instr_address __P((struct proc *, unsigned, unsigned)); -int cpu_singlestep __P((register struct proc *)); +unsigned ss_getreg_val(unsigned, struct trapframe *); +int ss_inst_branch(unsigned); +int ss_inst_delayed(unsigned); +unsigned ss_next_instr_address(struct proc *, unsigned, unsigned); +int cpu_singlestep(register struct proc *); #ifdef M88100 -void m88100_trap __P((unsigned, struct m88100_saved_state *)); -void m88100_syscall __P((register_t, struct m88100_saved_state *)); +void m88100_trap(unsigned, struct m88100_saved_state *); +void m88100_syscall(register_t, struct m88100_saved_state *); #endif /* M88100 */ #ifdef M88110 -void m88110_trap __P((unsigned, struct m88100_saved_state *)); -void m88110_syscall __P((register_t, struct m88100_saved_state *)); +void m88110_trap(unsigned, struct m88100_saved_state *); +void m88110_syscall(register_t, struct m88100_saved_state *); #endif /* M88110 */ #endif /* _LOCORE */ diff --git a/sys/arch/mvme88k/mvme88k/autoconf.c b/sys/arch/mvme88k/mvme88k/autoconf.c index f8622658beb..735d8e84b77 100644 --- a/sys/arch/mvme88k/mvme88k/autoconf.c +++ b/sys/arch/mvme88k/mvme88k/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.19 2002/01/16 20:50:17 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.20 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -53,14 +53,14 @@ * the machine. */ -struct device *parsedisk __P((char *, int, int, dev_t *)); -void setroot __P((void)); -void swapconf __P((void)); -char buginchr __P((void)); -int getsb __P((char *, int)); -void dumpconf __P((void)); -int findblkmajor __P((struct device *)); -struct device *getdisk __P((char *, int, int, dev_t *)); +struct device *parsedisk(char *, int, int, dev_t *); +void setroot(void); +void swapconf(void); +char buginchr(void); +int getsb(char *, int); +void dumpconf(void); +int findblkmajor(struct device *); +struct device *getdisk(char *, int, int, dev_t *); int cold = 1; /* 1 if still booting */ diff --git a/sys/arch/mvme88k/mvme88k/cmmu.c b/sys/arch/mvme88k/mvme88k/cmmu.c index 3caee10274c..a888a36ec24 100644 --- a/sys/arch/mvme88k/mvme88k/cmmu.c +++ b/sys/arch/mvme88k/mvme88k/cmmu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmmu.c,v 1.19 2001/12/22 09:49:39 smurph Exp $ */ +/* $OpenBSD: cmmu.c,v 1.20 2002/03/14 01:26:39 millert Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -80,7 +80,7 @@ int cpu_cmmu_ratio; struct cmmu_p *cmmu; -void md_cmmu_flush_tlb __P((unsigned kernel, vm_offset_t vaddr, int size)); +void md_cmmu_flush_tlb(unsigned kernel, vm_offset_t vaddr, int size); /* This is here so that process.S doesn't have to decide the CPU type */ void diff --git a/sys/arch/mvme88k/mvme88k/disksubr.c b/sys/arch/mvme88k/mvme88k/disksubr.c index fdbcb092ecb..3cd0fe76fb2 100644 --- a/sys/arch/mvme88k/mvme88k/disksubr.c +++ b/sys/arch/mvme88k/mvme88k/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.16 2001/08/26 14:31:12 miod Exp $ */ +/* $OpenBSD: disksubr.c,v 1.17 2002/03/14 01:26:40 millert Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1995 Dale Rahn. @@ -49,15 +49,15 @@ int disksubr_debug = 0; #endif -static void bsdtocpulabel __P((struct disklabel *lp, - struct cpu_disklabel *clp)); -static void cputobsdlabel __P((struct disklabel *lp, - struct cpu_disklabel *clp)); -int get_target __P((void)); +static void bsdtocpulabel(struct disklabel *lp, + struct cpu_disklabel *clp); +static void cputobsdlabel(struct disklabel *lp, + struct cpu_disklabel *clp); +int get_target(void); #ifdef DEBUG -static void printlp __P((struct disklabel *lp, char *str)); -static void printclp __P((struct cpu_disklabel *clp, char *str)); +static void printlp(struct disklabel *lp, char *str); +static void printclp(struct cpu_disklabel *clp, char *str); #endif /* @@ -134,7 +134,7 @@ dk_establish(dk, dev) char * readdisklabel(dev, strat, lp, clp, spoofonly) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *clp; int spoofonly; @@ -325,7 +325,7 @@ setdisklabel(olp, nlp, openmask, clp) int writedisklabel(dev, strat, lp, clp) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); register struct disklabel *lp; struct cpu_disklabel *clp; { diff --git a/sys/arch/mvme88k/mvme88k/dkbad.c b/sys/arch/mvme88k/mvme88k/dkbad.c index 2a41900c4d0..3bf7315ab67 100644 --- a/sys/arch/mvme88k/mvme88k/dkbad.c +++ b/sys/arch/mvme88k/mvme88k/dkbad.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dkbad.c,v 1.5 2001/08/26 14:31:12 miod Exp $ */ +/* $OpenBSD: dkbad.c,v 1.6 2002/03/14 01:26:40 millert Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993 @@ -40,7 +40,7 @@ #include <sys/buf.h> #include <sys/dkbad.h> -int isbad __P((struct dkbad *, int, int, int)); +int isbad(struct dkbad *, int, int, int); /* * Search the bad sector table looking for diff --git a/sys/arch/mvme88k/mvme88k/locore_c_routines.c b/sys/arch/mvme88k/mvme88k/locore_c_routines.c index cba12613009..28c036f6713 100644 --- a/sys/arch/mvme88k/mvme88k/locore_c_routines.c +++ b/sys/arch/mvme88k/mvme88k/locore_c_routines.c @@ -1,4 +1,4 @@ -/* $OpenBSD: locore_c_routines.c,v 1.24 2002/02/05 23:16:08 miod Exp $ */ +/* $OpenBSD: locore_c_routines.c,v 1.25 2002/03/14 01:26:40 millert Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -102,9 +102,9 @@ static char *bytes[] = #define DAE_DEBUG(stuff) #endif -void setlevel __P((int)); +void setlevel(int); #ifdef DDB -void db_setlevel __P((int)); +void db_setlevel(int); #endif #ifdef M88100 diff --git a/sys/arch/mvme88k/mvme88k/m88110.c b/sys/arch/mvme88k/mvme88k/m88110.c index ff3b1a482c2..df9f17fccd6 100644 --- a/sys/arch/mvme88k/mvme88k/m88110.c +++ b/sys/arch/mvme88k/mvme88k/m88110.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m88110.c,v 1.5 2001/12/24 04:12:40 miod Exp $ */ +/* $OpenBSD: m88110.c,v 1.6 2002/03/14 01:26:40 millert Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * All rights reserved. @@ -99,15 +99,15 @@ unsigned patc_inst_l[32]; #define USER 0 /* FORWARDS */ -unsigned batc_val __P((unsigned phys, unsigned virt, unsigned prot)); -void patc_insert __P((unsigned upper, unsigned lower, int which)); -void patc_clear __P((void)); -void patc_sync __P((int which)); -void patc_load __P((int index, unsigned upper, unsigned lower, int which)); -void m88110_cmmu_sync_cache __P((vm_offset_t physaddr, int size)); -void m88110_cmmu_sync_inval_cache __P((vm_offset_t physaddr, int size)); -void m88110_cmmu_inval_cache __P((vm_offset_t physaddr, int size)); -int probe_mmu __P((vm_offset_t va, int data)); +unsigned batc_val(unsigned phys, unsigned virt, unsigned prot); +void patc_insert(unsigned upper, unsigned lower, int which); +void patc_clear(void); +void patc_sync(int which); +void patc_load(int index, unsigned upper, unsigned lower, int which); +void m88110_cmmu_sync_cache(vm_offset_t physaddr, int size); +void m88110_cmmu_sync_inval_cache(vm_offset_t physaddr, int size); +void m88110_cmmu_inval_cache(vm_offset_t physaddr, int size); +int probe_mmu(vm_offset_t va, int data); /* This is the function table for the mc88110 built-in CMMUs */ struct cmmu_p cmmu88110 = { diff --git a/sys/arch/mvme88k/mvme88k/m8820x.c b/sys/arch/mvme88k/mvme88k/m8820x.c index 08360d5dd63..96f142110dd 100644 --- a/sys/arch/mvme88k/mvme88k/m8820x.c +++ b/sys/arch/mvme88k/mvme88k/m8820x.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m8820x.c,v 1.12 2002/01/14 21:34:41 miod Exp $ */ +/* $OpenBSD: m8820x.c,v 1.13 2002/03/14 01:26:40 millert Exp $ */ /* * Copyright (c) 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -209,13 +209,13 @@ error("ack gag barf!"); int vme188_config; /* local prototypes */ -unsigned m8820x_cmmu_get __P((int mmu, int reg)); -void m8820x_cmmu_store __P((int, int, unsigned)); -void m8820x_cmmu_set __P((int, unsigned, int, int, int, int, vm_offset_t)); -void m8820x_cmmu_sync_cache __P((vm_offset_t, int)); -void m8820x_cmmu_sync_inval_cache __P((vm_offset_t, int)); -void m8820x_cmmu_inval_cache __P((vm_offset_t, int)); -int m8820x_cmmu_alive __P((int)); +unsigned m8820x_cmmu_get(int mmu, int reg); +void m8820x_cmmu_store(int, int, unsigned); +void m8820x_cmmu_set(int, unsigned, int, int, int, int, vm_offset_t); +void m8820x_cmmu_sync_cache(vm_offset_t, int); +void m8820x_cmmu_sync_inval_cache(vm_offset_t, int); +void m8820x_cmmu_inval_cache(vm_offset_t, int); +int m8820x_cmmu_alive(int); void m8820x_show_apr(value) diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c index 64cdf4be1ee..bf3438bc6ad 100644 --- a/sys/arch/mvme88k/mvme88k/machdep.c +++ b/sys/arch/mvme88k/mvme88k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.90 2002/03/05 22:11:42 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.91 2002/03/14 01:26:40 millert Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -126,22 +126,22 @@ vm_offset_t interrupt_stack[MAX_CPUS] = {0}; struct md_p md; /* prototypes */ -void m88100_Xfp_precise __P((void)); -void m88110_Xfp_precise __P((void)); -void setupiackvectors __P((void)); -void regdump __P((struct trapframe *f)); -void dumpsys __P((void)); -void consinit __P((void)); -vm_offset_t size_memory __P((void)); -int getcpuspeed __P((void)); -int getscsiid __P((void)); -void identifycpu __P((void)); -void save_u_area __P((struct proc *, vm_offset_t)); -void load_u_area __P((struct proc *)); -void dumpconf __P((void)); -void m187_ext_int __P((u_int v, struct m88100_saved_state *eframe)); -void m188_ext_int __P((u_int v, struct m88100_saved_state *eframe)); -void m197_ext_int __P((u_int v, struct m88100_saved_state *eframe)); +void m88100_Xfp_precise(void); +void m88110_Xfp_precise(void); +void setupiackvectors(void); +void regdump(struct trapframe *f); +void dumpsys(void); +void consinit(void); +vm_offset_t size_memory(void); +int getcpuspeed(void); +int getscsiid(void); +void identifycpu(void); +void save_u_area(struct proc *, vm_offset_t); +void load_u_area(struct proc *); +void dumpconf(void); +void m187_ext_int(u_int v, struct m88100_saved_state *eframe); +void m188_ext_int(u_int v, struct m88100_saved_state *eframe); +void m197_ext_int(u_int v, struct m88100_saved_state *eframe); unsigned char *volatile ivec[] = { (unsigned char *)0xFFFE0003, /* not used, no such thing as int 0 */ @@ -222,7 +222,7 @@ int bufpages = 0; #endif int bufcachepercent = BUFCACHEPERCENT; -caddr_t allocsys __P((caddr_t)); +caddr_t allocsys(caddr_t); /* * Info for CTL_HW @@ -267,11 +267,11 @@ extern struct user *proc0paddr; * XXX this is to fake out the console routines, while * booting. New and improved! :-) smurph */ -void bootcnprobe __P((struct consdev *)); -void bootcninit __P((struct consdev *)); -void bootcnputc __P((dev_t, int)); -int bootcngetc __P((dev_t)); -extern void nullcnpollc __P((dev_t, int)); +void bootcnprobe(struct consdev *); +void bootcninit(struct consdev *); +void bootcnputc(dev_t, int); +int bootcngetc(dev_t); +extern void nullcnpollc(dev_t, int); #define bootcnpollc nullcnpollc @@ -1264,7 +1264,7 @@ dumpsys() int psize; daddr_t blkno; /* current block to write */ /* dump routine */ - int (*dump) __P((dev_t, daddr_t, caddr_t, size_t)); + int (*dump)(dev_t, daddr_t, caddr_t, size_t); int pg; /* page being dumped */ paddr_t maddr; /* PA being dumped */ int error; /* error code from (*dump)() */ @@ -2318,7 +2318,7 @@ mvme_bootstrap() { extern int kernelstart; extern struct consdev *cn_tab; - extern void set_tcfp __P((void)); + extern void set_tcfp(void); struct mvmeprom_brdid brdid; diff --git a/sys/arch/mvme88k/mvme88k/mem.c b/sys/arch/mvme88k/mvme88k/mem.c index edbac9bb2e1..133b5199724 100644 --- a/sys/arch/mvme88k/mvme88k/mem.c +++ b/sys/arch/mvme88k/mvme88k/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.14 2001/12/08 02:24:06 art Exp $ */ +/* $OpenBSD: mem.c,v 1.15 2002/03/14 01:26:40 millert Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -57,11 +57,11 @@ caddr_t zeropage; -int mmopen __P((dev_t, int, int)); -int mmclose __P((dev_t, int, int)); -int mmrw __P((dev_t, struct uio *, int)); -paddr_t mmmmap __P((dev_t, off_t, int)); -int mmioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); +int mmopen(dev_t, int, int); +int mmclose(dev_t, int, int); +int mmrw(dev_t, struct uio *, int); +paddr_t mmmmap(dev_t, off_t, int); +int mmioctl(dev_t, u_long, caddr_t, int, struct proc *); /*ARGSUSED*/ int diff --git a/sys/arch/mvme88k/mvme88k/pmap.c b/sys/arch/mvme88k/mvme88k/pmap.c index f8bda4bddb8..1a29be34867 100644 --- a/sys/arch/mvme88k/mvme88k/pmap.c +++ b/sys/arch/mvme88k/mvme88k/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.63 2002/02/05 23:07:38 miod Exp $ */ +/* $OpenBSD: pmap.c,v 1.64 2002/03/14 01:26:40 millert Exp $ */ /* * Copyright (c) 2001, 2002 Miodrag Vallat * Copyright (c) 1998-2001 Steve Murphree, Jr. @@ -248,17 +248,17 @@ extern vaddr_t obiova; /* * Internal routines */ -void flush_atc_entry __P((long, vaddr_t, boolean_t)); -pt_entry_t *pmap_expand_kmap __P((vaddr_t, vm_prot_t)); -void pmap_remove_range __P((pmap_t, vaddr_t, vaddr_t)); -void pmap_expand __P((pmap_t, vaddr_t)); -void pmap_release __P((pmap_t)); -vaddr_t pmap_map __P((vaddr_t, paddr_t, paddr_t, vm_prot_t, unsigned int)); -vaddr_t pmap_map_batc __P((vaddr_t, paddr_t, paddr_t, vm_prot_t, unsigned int)); -pt_entry_t *pmap_pte __P((pmap_t, vaddr_t)); -void pmap_remove_all __P((paddr_t)); -void pmap_changebit __P((paddr_t, int, int)); -boolean_t pmap_testbit __P((paddr_t, int)); +void flush_atc_entry(long, vaddr_t, boolean_t); +pt_entry_t *pmap_expand_kmap(vaddr_t, vm_prot_t); +void pmap_remove_range(pmap_t, vaddr_t, vaddr_t); +void pmap_expand(pmap_t, vaddr_t); +void pmap_release(pmap_t); +vaddr_t pmap_map(vaddr_t, paddr_t, paddr_t, vm_prot_t, unsigned int); +vaddr_t pmap_map_batc(vaddr_t, paddr_t, paddr_t, vm_prot_t, unsigned int); +pt_entry_t *pmap_pte(pmap_t, vaddr_t); +void pmap_remove_all(paddr_t); +void pmap_changebit(paddr_t, int, int); +boolean_t pmap_testbit(paddr_t, int); /* * quick PTE field checking macros diff --git a/sys/arch/mvme88k/mvme88k/swapgeneric.c b/sys/arch/mvme88k/mvme88k/swapgeneric.c index c31ddc38861..ef86c5b9576 100644 --- a/sys/arch/mvme88k/mvme88k/swapgeneric.c +++ b/sys/arch/mvme88k/mvme88k/swapgeneric.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapgeneric.c,v 1.5 2001/09/29 18:40:32 miod Exp $ */ +/* $OpenBSD: swapgeneric.c,v 1.6 2002/03/14 01:26:40 millert Exp $ */ /*- * Copyright (c) 1994 @@ -42,7 +42,7 @@ #include <sys/param.h> #include <sys/conf.h> -int (*mountroot) __P((void)) = NULL; /* tells autoconf.c that we are "generic" */ +int (*mountroot)(void) = NULL; /* tells autoconf.c that we are "generic" */ dev_t rootdev = NODEV; dev_t dumpdev = NODEV; diff --git a/sys/arch/mvme88k/mvme88k/trap.c b/sys/arch/mvme88k/mvme88k/trap.c index f3b7ecf9242..fee5e760639 100644 --- a/sys/arch/mvme88k/mvme88k/trap.c +++ b/sys/arch/mvme88k/mvme88k/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.33 2001/12/24 04:12:40 miod Exp $ */ +/* $OpenBSD: trap.c,v 1.34 2002/03/14 01:26:40 millert Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -102,12 +102,12 @@ unsigned traptrace = 0; #define SYSTEMMODE(PSR) (((struct psr*)&(PSR))->psr_mode != 0) /* sigh */ -extern int procfs_domem __P((struct proc *, struct proc *, void *, struct uio *)); +extern int procfs_domem(struct proc *, struct proc *, void *, struct uio *); -extern void regdump __P((struct trapframe *f)); -void error_fatal __P((struct m88100_saved_state *frame)); -void error_fault __P((struct m88100_saved_state *frame)); -void error_reset __P((struct m88100_saved_state *frame)); +extern void regdump(struct trapframe *f); +void error_fatal(struct m88100_saved_state *frame); +void error_fault(struct m88100_saved_state *frame); +void error_reset(struct m88100_saved_state *frame); char *trap_type[] = { "Reset", @@ -711,7 +711,7 @@ m88110_trap(unsigned type, struct m88100_saved_state *frame) extern struct vm_map *kernel_map; extern unsigned guarded_access_start; extern unsigned guarded_access_end; - extern pt_entry_t *pmap_pte __P((pmap_t, vm_offset_t)); + extern pt_entry_t *pmap_pte(pmap_t, vm_offset_t); uvmexp.traps++; diff --git a/sys/arch/mvme88k/mvme88k/vm_machdep.c b/sys/arch/mvme88k/mvme88k/vm_machdep.c index f6d8ed4e612..54e3d28b31b 100644 --- a/sys/arch/mvme88k/mvme88k/vm_machdep.c +++ b/sys/arch/mvme88k/mvme88k/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.47 2002/01/16 20:50:17 miod Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.48 2002/03/14 01:26:40 millert Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. @@ -68,13 +68,13 @@ extern struct extent *iomap_extent; extern struct vm_map *iomap_map; -vm_offset_t iomap_mapin __P((vm_offset_t, vm_size_t, boolean_t)); -void iomap_mapout __P((vm_offset_t, vm_size_t)); -void *mapiodev __P((void *, int)); -void unmapiodev __P((void *, int)); -vm_offset_t mapiospace __P((caddr_t, int)); -void unmapiospace __P((vm_offset_t)); -int badpaddr __P((caddr_t, int)); +vm_offset_t iomap_mapin(vm_offset_t, vm_size_t, boolean_t); +void iomap_mapout(vm_offset_t, vm_size_t); +void *mapiodev(void *, int); +void unmapiodev(void *, int); +vm_offset_t mapiospace(caddr_t, int); +void unmapiospace(vm_offset_t); +int badpaddr(caddr_t, int); /* * Finish a fork operation, with process p2 nearly set up. @@ -91,18 +91,18 @@ cpu_fork(p1, p2, stack, stacksize, func, arg) struct proc *p1, *p2; void *stack; size_t stacksize; - void (*func) __P((void *)); + void (*func)(void *); void *arg; { struct switchframe *p2sf; int cpu; struct ksigframe { - void (*func) __P((void *)); + void (*func)(void *); void *proc; } *ksfp; extern struct pcb *curpcb; - extern void proc_trampoline __P((void)); - extern void save_u_area __P((struct proc *, vm_offset_t)); + extern void proc_trampoline(void); + extern void save_u_area(struct proc *, vm_offset_t); cpu = cpu_number(); /* @@ -188,7 +188,7 @@ cpu_coredump(struct proc *p, struct vnode *vp, struct ucred *cred, struct core * void cpu_swapin(struct proc *p) { - extern void save_u_area __P((struct proc *, vm_offset_t)); + extern void save_u_area(struct proc *, vm_offset_t); save_u_area(p, (vm_offset_t)p->p_addr); } diff --git a/sys/arch/mvme88k/stand/bootst/dev_tape.h b/sys/arch/mvme88k/stand/bootst/dev_tape.h index b706b16fd57..63896916220 100644 --- a/sys/arch/mvme88k/stand/bootst/dev_tape.h +++ b/sys/arch/mvme88k/stand/bootst/dev_tape.h @@ -1,7 +1,7 @@ -/* $OpenBSD: dev_tape.h,v 1.1 1998/12/15 06:09:51 smurph Exp $ */ +/* $OpenBSD: dev_tape.h,v 1.2 2002/03/14 01:26:40 millert Exp $ */ -int tape_open __P((struct open_file *, ...)); -int tape_close __P((struct open_file *)); -int tape_strategy __P((void *, int, daddr_t, size_t, void *, size_t *)); +int tape_open(struct open_file *, ...); +int tape_close(struct open_file *); +int tape_strategy(void *, int, daddr_t, size_t, void *, size_t *); int tape_ioctl(); diff --git a/sys/arch/mvme88k/stand/bootst/rawfs.c b/sys/arch/mvme88k/stand/bootst/rawfs.c index 33587f46ba8..fb53e3e7472 100644 --- a/sys/arch/mvme88k/stand/bootst/rawfs.c +++ b/sys/arch/mvme88k/stand/bootst/rawfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rawfs.c,v 1.1 1998/12/15 06:09:51 smurph Exp $ */ +/* $OpenBSD: rawfs.c,v 1.2 2002/03/14 01:26:40 millert Exp $ */ /* * Copyright (c) 1995 Gordon W. Ross @@ -55,7 +55,7 @@ struct cfile { }; static int -rawfs_get_block __P((struct open_file *)); +rawfs_get_block(struct open_file *); int rawfs_open(path, f) char *path; diff --git a/sys/arch/mvme88k/stand/bootst/rawfs.h b/sys/arch/mvme88k/stand/bootst/rawfs.h index 31c4ea0604d..d25d2fde8da 100644 --- a/sys/arch/mvme88k/stand/bootst/rawfs.h +++ b/sys/arch/mvme88k/stand/bootst/rawfs.h @@ -1,15 +1,15 @@ -/* $OpenBSD: rawfs.h,v 1.1 1998/12/15 06:09:51 smurph Exp $ */ +/* $OpenBSD: rawfs.h,v 1.2 2002/03/14 01:26:40 millert Exp $ */ /* * Raw file system - for stream devices like tapes. * No random access, only sequential read allowed. */ -int rawfs_open __P((char *path, struct open_file *f)); -int rawfs_close __P((struct open_file *f)); -int rawfs_read __P((struct open_file *f, void *buf, - u_int size, u_int *resid)); -int rawfs_write __P((struct open_file *f, void *buf, - u_int size, u_int *resid)); -off_t rawfs_seek __P((struct open_file *f, off_t offset, int where)); -int rawfs_stat __P((struct open_file *f, struct stat *sb)); +int rawfs_open(char *path, struct open_file *f); +int rawfs_close(struct open_file *f); +int rawfs_read(struct open_file *f, void *buf, + u_int size, u_int *resid); +int rawfs_write(struct open_file *f, void *buf, + u_int size, u_int *resid); +off_t rawfs_seek(struct open_file *f, off_t offset, int where); +int rawfs_stat(struct open_file *f, struct stat *sb); diff --git a/sys/arch/mvme88k/stand/installboot/installboot.c b/sys/arch/mvme88k/stand/installboot/installboot.c index 0fae0c6306d..25a199553c9 100644 --- a/sys/arch/mvme88k/stand/installboot/installboot.c +++ b/sys/arch/mvme88k/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.4 2001/07/04 08:09:26 niklas Exp $ */ +/* $OpenBSD: installboot.c,v 1.5 2002/03/14 01:26:40 millert Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -69,12 +69,12 @@ daddr_t *block_table; /* block number array in prototype image */ int maxblocknum; /* size of this array */ -char *loadprotoblocks __P((char *, long *)); -int loadblocknums __P((char *, int)); -static void devread __P((int, void *, daddr_t, size_t, char *)); -static void usage __P((void)); -int main __P((int, char *[])); -static void vid_to_disklabel __P((char *, char*)); +char *loadprotoblocks(char *, long *); +int loadblocknums(char *, int); +static void devread(int, void *, daddr_t, size_t, char *); +static void usage(void); +int main(int, char *[]); +static void vid_to_disklabel(char *, char*); static void diff --git a/sys/arch/mvme88k/stand/libbug/libbug.h b/sys/arch/mvme88k/stand/libbug/libbug.h index 7d8d63e35fa..11e000195f1 100644 --- a/sys/arch/mvme88k/stand/libbug/libbug.h +++ b/sys/arch/mvme88k/stand/libbug/libbug.h @@ -1,18 +1,18 @@ -/* $OpenBSD: libbug.h,v 1.1 1998/08/22 07:39:55 smurph Exp $ */ +/* $OpenBSD: libbug.h,v 1.2 2002/03/14 01:26:40 millert Exp $ */ /* * prototypes and such. note that get/put char are in stand.h */ -void mvmeprom_delay __P((int)); -int mvmeprom_diskrd __P((struct mvmeprom_dskio *)); -int mvmeprom_diskwr __P((struct mvmeprom_dskio *)); -struct mvmeprom_brdid *mvmeprom_getbrdid __P((void)); -int peekchar __P((void)); -void mvmeprom_outln __P((char *, char *)); -void mvmeprom_outstr __P((char *, char *)); -void mvmeprom_rtc_rd __P((struct mvmeprom_time *)); +void mvmeprom_delay(int); +int mvmeprom_diskrd(struct mvmeprom_dskio *); +int mvmeprom_diskwr(struct mvmeprom_dskio *); +struct mvmeprom_brdid *mvmeprom_getbrdid(void); +int peekchar(void); +void mvmeprom_outln(char *, char *); +void mvmeprom_outstr(char *, char *); +void mvmeprom_rtc_rd(struct mvmeprom_time *); /* * bugcrt stuff diff --git a/sys/arch/mvme88k/stand/libsa/bugdev.c b/sys/arch/mvme88k/stand/libsa/bugdev.c index 6de4b615a60..1267a7dc35e 100644 --- a/sys/arch/mvme88k/stand/libsa/bugdev.c +++ b/sys/arch/mvme88k/stand/libsa/bugdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bugdev.c,v 1.1 1998/08/22 08:07:55 smurph Exp $ */ +/* $OpenBSD: bugdev.c,v 1.2 2002/03/14 01:26:40 millert Exp $ */ /* * Copyright (c) 1993 Paul Kranenburg @@ -37,7 +37,7 @@ #include "stand.h" #include "libsa.h" -void cputobsdlabel __P((struct disklabel *lp, struct cpu_disklabel *clp)); +void cputobsdlabel(struct disklabel *lp, struct cpu_disklabel *clp); int errno; diff --git a/sys/arch/mvme88k/stand/libsa/libsa.h b/sys/arch/mvme88k/stand/libsa/libsa.h index 3cf722a7317..62a71ed3c2d 100644 --- a/sys/arch/mvme88k/stand/libsa/libsa.h +++ b/sys/arch/mvme88k/stand/libsa/libsa.h @@ -1,4 +1,4 @@ -/* $OpenBSD: libsa.h,v 1.2 2001/07/04 08:09:30 niklas Exp $ */ +/* $OpenBSD: libsa.h,v 1.3 2002/03/14 01:26:40 millert Exp $ */ /* * libsa prototypes @@ -7,14 +7,14 @@ #include "libbug.h" /* bugdev.c */ -int bugscopen __P((struct open_file *, ...)); -int bugscclose __P((struct open_file *)); -int bugscioctl __P((struct open_file *, u_long, void *)); -int bugscstrategy __P((void *, int, daddr_t, size_t, void *, size_t *)); +int bugscopen(struct open_file *, ...); +int bugscclose(struct open_file *); +int bugscioctl(struct open_file *, u_long, void *); +int bugscstrategy(void *, int, daddr_t, size_t, void *, size_t *); /* exec_mvme.c */ -void exec_mvme __P((char *, int)); +void exec_mvme(char *, int); /* parse_args.c */ -int parse_args __P((char **, int *)); +int parse_args(char **, int *); diff --git a/sys/arch/mvme88k/stand/netboot/dev_net.h b/sys/arch/mvme88k/stand/netboot/dev_net.h index 0a99721e89d..cd7b475a52a 100644 --- a/sys/arch/mvme88k/stand/netboot/dev_net.h +++ b/sys/arch/mvme88k/stand/netboot/dev_net.h @@ -1,7 +1,7 @@ -/* $OpenBSD: dev_net.h,v 1.2 1998/08/22 08:37:57 smurph Exp $ */ +/* $OpenBSD: dev_net.h,v 1.3 2002/03/14 01:26:40 millert Exp $ */ -int net_open __P((struct open_file *, ...)); -int net_close __P((struct open_file *)); +int net_open(struct open_file *, ...); +int net_close(struct open_file *); int net_ioctl(); int net_strategy(); diff --git a/sys/arch/mvme88k/stand/netboot/if_ie.c b/sys/arch/mvme88k/stand/netboot/if_ie.c index 430629ba607..5285ee491a4 100644 --- a/sys/arch/mvme88k/stand/netboot/if_ie.c +++ b/sys/arch/mvme88k/stand/netboot/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.4 1999/01/11 05:11:46 millert Exp $ */ +/* $OpenBSD: if_ie.c,v 1.5 2002/03/14 01:26:40 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -56,16 +56,16 @@ int ie_debug = 0; -void ie_stop __P((struct netif *)); -void ie_end __P((struct netif *)); -void ie_error __P((struct netif *, char *, volatile struct iereg *)); -int ie_get __P((struct iodesc *, void *, size_t, time_t)); -void ie_init __P((struct iodesc *, void *)); -int ie_match __P((struct netif *, void *)); -int ie_poll __P((struct iodesc *, void *, int)); -int ie_probe __P((struct netif *, void *)); -int ie_put __P((struct iodesc *, void *, size_t)); -void ie_reset __P((struct netif *, u_char *)); +void ie_stop(struct netif *); +void ie_end(struct netif *); +void ie_error(struct netif *, char *, volatile struct iereg *); +int ie_get(struct iodesc *, void *, size_t, time_t); +void ie_init(struct iodesc *, void *); +int ie_match(struct netif *, void *); +int ie_poll(struct iodesc *, void *, int); +int ie_probe(struct netif *, void *); +int ie_put(struct iodesc *, void *, size_t); +void ie_reset(struct netif *, u_char *); struct netif_stats ie_stats; diff --git a/sys/arch/mvme88k/stand/netboot/if_le.c b/sys/arch/mvme88k/stand/netboot/if_le.c index 4775ea59e55..76e766093dc 100644 --- a/sys/arch/mvme88k/stand/netboot/if_le.c +++ b/sys/arch/mvme88k/stand/netboot/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.3 1999/01/11 05:11:46 millert Exp $ */ +/* $OpenBSD: if_le.c,v 1.4 2002/03/14 01:26:40 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -77,15 +77,15 @@ int le_debug = 0; -void le_end __P((struct netif *)); -void le_error __P((struct netif *, char *, volatile struct lereg1 *)); -int le_get __P((struct iodesc *, void *, size_t, time_t)); -void le_init __P((struct iodesc *, void *)); -int le_match __P((struct netif *, void *)); -int le_poll __P((struct iodesc *, void *, int)); -int le_probe __P((struct netif *, void *)); -int le_put __P((struct iodesc *, void *, size_t)); -void le_reset __P((struct netif *, u_char *)); +void le_end(struct netif *); +void le_error(struct netif *, char *, volatile struct lereg1 *); +int le_get(struct iodesc *, void *, size_t, time_t); +void le_init(struct iodesc *, void *); +int le_match(struct netif *, void *); +int le_poll(struct iodesc *, void *, int); +int le_probe(struct netif *, void *); +int le_put(struct iodesc *, void *, size_t); +void le_reset(struct netif *, u_char *); struct netif_stats le_stats; diff --git a/sys/arch/mvme88k/stand/prtvid/chklabel.c b/sys/arch/mvme88k/stand/prtvid/chklabel.c index 04921d23050..d776270a26b 100644 --- a/sys/arch/mvme88k/stand/prtvid/chklabel.c +++ b/sys/arch/mvme88k/stand/prtvid/chklabel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chklabel.c,v 1.2 1998/08/22 08:49:16 smurph Exp $ */ +/* $OpenBSD: chklabel.c,v 1.3 2002/03/14 01:26:40 millert Exp $ */ /* * Copyright (c) 1993 Paul Kranenburg * All rights reserved. @@ -33,7 +33,7 @@ #include <sys/disklabel.h> #include <stdio.h> -void cputobsdlabel __P((struct disklabel *lp, struct cpu_disklabel *clp)); +void cputobsdlabel(struct disklabel *lp, struct cpu_disklabel *clp); main(int argc, char *argv[]) { diff --git a/sys/arch/mvme88k/stand/sboot/sboot.h b/sys/arch/mvme88k/stand/sboot/sboot.h index 66258e22bbd..3bc198324b4 100644 --- a/sys/arch/mvme88k/stand/sboot/sboot.h +++ b/sys/arch/mvme88k/stand/sboot/sboot.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sboot.h,v 1.2 2001/07/04 08:09:31 niklas Exp $ */ +/* $OpenBSD: sboot.h,v 1.3 2002/03/14 01:26:41 millert Exp $ */ /* * Copyright (c) 1995 Charles D. Cranor and Seth Widoff @@ -45,44 +45,44 @@ extern caddr_t end; #define NULL ((char *)0) -void bcopy __P((const void *, void *, size_t)); /* libc_sa */ -void *memset __P((void *, int, size_t)); /* libc_sa */ -int printf __P((const char *, ...)); /* libc_sa */ +void bcopy(const void *, void *, size_t); /* libc_sa */ +void *memset(void *, int, size_t); /* libc_sa */ +int printf(const char *, ...); /* libc_sa */ /* console */ -void puts __P((char *)); -void putchar __P((char)); -char cngetc __P((void)); -void ngets __P((char *, int)); +void puts(char *); +void putchar(char); +char cngetc(void); +void ngets(char *, int); /* sboot */ -void callrom __P((void)); -void do_cmd __P((char *)); +void callrom(void); +void do_cmd(char *); /* le */ #define LANCE_ADDR 0xfffe0778 #define ERAM_ADDR 0xfffe0774 #define LANCE_REG_ADDR 0xfffe1800 -void le_end __P((void)); -void le_init __P((void)); -int le_get __P((u_char *, size_t, u_long)); -int le_put __P((u_char *, size_t)); +void le_end(void); +void le_init(void); +int le_get(u_char *, size_t, u_long); +int le_put(u_char *, size_t); /* etherfun */ #define READ 0 #define ACKN 1 -void do_rev_arp __P((void)); -int get_rev_arp __P((void)); -int rev_arp __P((void)); -void do_send_tftp __P((int)); -int do_get_file __P((void)); -void tftp_file __P((char *, u_long)); +void do_rev_arp(void); +int get_rev_arp(void); +int rev_arp(void); +void do_send_tftp(int); +int do_get_file(void); +void tftp_file(char *, u_long); /* clock */ -u_long time __P((void)); +u_long time(void); /* checksum */ -u_long oc_cksum __P((void *, u_long, u_long)); +u_long oc_cksum(void *, u_long, u_long); #define CONS_ZS_ADDR (0xfffe3002) #define CLOCK_ADDR (0xfffe07f8) diff --git a/sys/arch/mvmeppc/ddb/db_interface.c b/sys/arch/mvmeppc/ddb/db_interface.c index fa9bda71272..5bc4ffe6a4d 100644 --- a/sys/arch/mvmeppc/ddb/db_interface.c +++ b/sys/arch/mvmeppc/ddb/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.1 2001/06/26 21:57:39 smurph Exp $ */ +/* $OpenBSD: db_interface.c,v 1.2 2002/03/14 01:26:41 millert Exp $ */ #include <sys/param.h> #include <sys/proc.h> @@ -15,8 +15,8 @@ extern label_t *db_recover; -void ddb_trap __P((void)); /* Call into trap_subr.S */ -int ddb_trap_glue __P((struct trapframe *)); /* Called from trap_subr.S */ +void ddb_trap(void); /* Call into trap_subr.S */ +int ddb_trap_glue(struct trapframe *); /* Called from trap_subr.S */ void Debugger() diff --git a/sys/arch/mvmeppc/dev/bugtty.c b/sys/arch/mvmeppc/dev/bugtty.c index 6a7a8350a23..2067fded26c 100644 --- a/sys/arch/mvmeppc/dev/bugtty.c +++ b/sys/arch/mvmeppc/dev/bugtty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bugtty.c,v 1.3 2002/02/15 20:45:30 nordin Exp $ */ +/* $OpenBSD: bugtty.c,v 1.4 2002/03/14 01:26:41 millert Exp $ */ /* Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1995 Dale Rahn. * All rights reserved. @@ -46,8 +46,8 @@ #include "bugtty.h" -int bugttymatch __P((struct device *parent, void *self, void *aux)); -void bugttyattach __P((struct device *parent, struct device *self, void *aux)); +int bugttymatch(struct device *parent, void *self, void *aux); +void bugttyattach(struct device *parent, struct device *self, void *aux); struct cfattach bugtty_ca = { sizeof(struct device), bugttymatch, bugttyattach @@ -58,21 +58,21 @@ struct cfdriver bugtty_cd = { }; /* prototypes */ -int bugttycnprobe __P((struct consdev *cp)); -int bugttycninit __P((struct consdev *cp)); -int bugttycngetc __P((dev_t dev)); -void bugttycnputc __P((dev_t dev, char c)); - -int bugttyopen __P((dev_t dev, int flag, int mode, struct proc *p)); -int bugttyclose __P((dev_t dev, int flag, int mode, struct proc *p)); -int bugttyread __P((dev_t dev, struct uio *uio, int flag)); -int bugttywrite __P((dev_t dev, struct uio *uio, int flag)); -int bugttyioctl __P((dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)); -int bugttystop __P((struct tty *tp, int flag)); - -struct tty *bugttytty __P((dev_t dev)); -int bugttymctl __P((dev_t dev, int bits, int how)); -int bugttyparam __P((struct tty *tp, struct termios *tm)); +int bugttycnprobe(struct consdev *cp); +int bugttycninit(struct consdev *cp); +int bugttycngetc(dev_t dev); +void bugttycnputc(dev_t dev, char c); + +int bugttyopen(dev_t dev, int flag, int mode, struct proc *p); +int bugttyclose(dev_t dev, int flag, int mode, struct proc *p); +int bugttyread(dev_t dev, struct uio *uio, int flag); +int bugttywrite(dev_t dev, struct uio *uio, int flag); +int bugttyioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p); +int bugttystop(struct tty *tp, int flag); + +struct tty *bugttytty(dev_t dev); +int bugttymctl(dev_t dev, int bits, int how); +int bugttyparam(struct tty *tp, struct termios *tm); #define DIALOUT(x) ((x) & 0x80) #define SWFLAGS(dev) (bugttyswflags | (DIALOUT(dev) ? TIOCFLAG_SOFTCAR : 0)) @@ -115,7 +115,7 @@ bugttyattach(parent, self, aux) } #define BUGTTYUNIT(x) ((x) & (0x7f)) -void bugttyoutput __P((struct tty *tp)); +void bugttyoutput(struct tty *tp); int bugttydefaultrate = TTYDEF_SPEED; int bugttyswflags; diff --git a/sys/arch/mvmeppc/dev/clock.c b/sys/arch/mvmeppc/dev/clock.c index 604912e9dd4..c5cf7eb219a 100644 --- a/sys/arch/mvmeppc/dev/clock.c +++ b/sys/arch/mvmeppc/dev/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.3 2001/11/06 22:45:54 miod Exp $ */ +/* $OpenBSD: clock.c,v 1.4 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: clock.c,v 1.1 1996/09/30 16:34:40 ws Exp $ */ /* @@ -61,7 +61,7 @@ static volatile u_long lasttb; #define YEAR0 1900 static u_long -chiptotime __P((int sec, int min, int hour, int day, int mon, int year)); +chiptotime(int sec, int min, int hour, int day, int mon, int year); struct chiptime { int sec; @@ -73,7 +73,7 @@ struct chiptime { int year; }; -static void timetochip __P((struct chiptime *c)); +static void timetochip(struct chiptime *c); /* * For now we let the machine run with boot time, not changing the clock diff --git a/sys/arch/mvmeppc/dev/mainbus.c b/sys/arch/mvmeppc/dev/mainbus.c index 53c8bb892a2..e05f756d126 100644 --- a/sys/arch/mvmeppc/dev/mainbus.c +++ b/sys/arch/mvmeppc/dev/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.2 2001/11/06 22:45:54 miod Exp $ */ +/* $OpenBSD: mainbus.c,v 1.3 2002/03/14 01:26:41 millert Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -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 device), mbmatch, mbattach @@ -52,9 +52,9 @@ struct cfdriver mainbus_cd = { }; void mb_intr_establish __P((struct confargs *, int (*)(void *), void *)); -void mb_intr_disestablish __P((struct confargs *)); -caddr_t mb_cvtaddr __P((struct confargs *)); -int mb_matchname __P((struct confargs *, char *)); +void mb_intr_disestablish(struct confargs *); +caddr_t mb_cvtaddr(struct confargs *); +int mb_matchname(struct confargs *, char *); static int attached = 0; @@ -126,7 +126,7 @@ mbprint(aux, pnp) void mb_intr_establish(ca, handler, val) struct confargs *ca; - int (*handler) __P((void *)); + int (*handler)(void *); void *val; { panic("can never mb_intr_establish"); diff --git a/sys/arch/mvmeppc/dev/openpic.c b/sys/arch/mvmeppc/dev/openpic.c index 50130548f12..a01dc38ebe7 100644 --- a/sys/arch/mvmeppc/dev/openpic.c +++ b/sys/arch/mvmeppc/dev/openpic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: openpic.c,v 1.6 2001/11/06 22:45:54 miod Exp $ */ +/* $OpenBSD: openpic.c,v 1.7 2002/03/14 01:26:41 millert Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -85,7 +85,7 @@ static int virq_max = 0; struct evcnt evirq[ICU_LEN]; -static int fakeintr __P((void *)); +static int fakeintr(void *); static char *intr_typename(int type); static void intr_calculatemasks(); static __inline int cntlzw(int x); @@ -97,29 +97,29 @@ static struct raven_reg *ravenp = (struct raven_reg *)NULL; #define HWIRQ_MAX 27 #define HWIRQ_MASK 0x0fffffff -static __inline u_int openpic_read __P((int)); -static __inline void openpic_write __P((int, u_int)); -void openpic_enable_irq __P((int, int)); -void openpic_disable_irq __P((int)); +static __inline u_int openpic_read(int); +static __inline void openpic_write(int, u_int); +void openpic_enable_irq(int, int); +void openpic_disable_irq(int); void openpic_init(); -void openpic_set_priority __P((int, int)); -void openpic_set_vec_pri __P((int, int)); -static __inline int openpic_read_irq __P((int)); -static __inline void openpic_eoi __P((int)); - -void i8259_init __P((void)); -int i8259_intr __P((void)); -void i8259_enable_irq __P((int, int)); -void i8259_disable_irq __P((int)); +void openpic_set_priority(int, int); +void openpic_set_vec_pri(int, int); +static __inline int openpic_read_irq(int); +static __inline void openpic_eoi(int); + +void i8259_init(void); +int i8259_intr(void); +void i8259_enable_irq(int, int); +void i8259_disable_irq(int); void *i8259_intr_establish( void * lcv, int irq, int type, int level, - int (*ih_fun) __P((void *)), void *ih_arg, char *name); + int (*ih_fun)(void *), void *ih_arg, char *name); struct openpic_softc { struct device sc_dev; }; -int openpic_match __P((struct device *parent, void *cf, void *aux)); -void openpic_attach __P((struct device *, struct device *, void *)); +int openpic_match(struct device *parent, void *cf, void *aux); +void openpic_attach(struct device *, struct device *, void *); void openpic_do_pending_int(); void ext_intr_openpic(); @@ -176,11 +176,11 @@ typedef int mac_intr_handle_t; typedef void *(intr_establish_t) __P((void *, mac_intr_handle_t, int, int, int (*func)(void *), void *, char *)); -typedef void (intr_disestablish_t) __P((void *, void *)); +typedef void (intr_disestablish_t)(void *, void *); static vaddr_t openpic_base; void * openpic_intr_establish( void * lcv, int irq, int type, int level, - int (*ih_fun) __P((void *)), void *ih_arg, char *name); + int (*ih_fun)(void *), void *ih_arg, char *name); void openpic_intr_disestablish( void *lcp, void *arg); void openpic_collect_preconf_intr(); @@ -279,7 +279,7 @@ void * lcv; int irq; int type; int level; -int (*ih_fun) __P((void *)); +int (*ih_fun)(void *); void *ih_arg; char *name; { @@ -365,7 +365,7 @@ void * lcv; int irq; int type; int level; -int (*ih_fun) __P((void *)); +int (*ih_fun)(void *); void *ih_arg; char *name; { diff --git a/sys/arch/mvmeppc/dev/raven.c b/sys/arch/mvmeppc/dev/raven.c index c6139eeb5bc..72ccc831778 100644 --- a/sys/arch/mvmeppc/dev/raven.c +++ b/sys/arch/mvmeppc/dev/raven.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raven.c,v 1.3 2001/11/06 22:45:54 miod Exp $ */ +/* $OpenBSD: raven.c,v 1.4 2002/03/14 01:26:41 millert Exp $ */ /* * Copyright (c) 2001 Steve Murphree, Jr. @@ -49,8 +49,8 @@ #include <mvmeppc/dev/ravenreg.h> #include <mvmeppc/dev/ravenvar.h> -int raven_match __P((struct device *, void *, void *)); -void raven_attach __P((struct device *, struct device *, void *)); +int raven_match(struct device *, void *, void *); +void raven_attach(struct device *, struct device *, void *); struct cfattach raven_ca = { sizeof(struct raven_softc), raven_match, raven_attach, diff --git a/sys/arch/mvmeppc/include/autoconf.h b/sys/arch/mvmeppc/include/autoconf.h index d23d3cc9f0e..db01a912a72 100644 --- a/sys/arch/mvmeppc/include/autoconf.h +++ b/sys/arch/mvmeppc/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.1 2001/06/26 21:57:43 smurph Exp $ */ +/* $OpenBSD: autoconf.h,v 1.2 2002/03/14 01:26:41 millert Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -54,17 +54,14 @@ extern int system_type; /**/ struct confargs; -typedef int (*intr_handler_t) __P((void *)); +typedef int (*intr_handler_t)(void *); typedef struct bushook { struct device *bh_dv; int bh_type; - void (*bh_intr_establish) - __P((struct confargs *, intr_handler_t, void *)); - void (*bh_intr_disestablish) - __P((struct confargs *)); - int (*bh_matchname) - __P((struct confargs *, char *)); + void (*bh_intr_establish)(struct confargs *, intr_handler_t, void *); + void (*bh_intr_disestablish)(struct confargs *); + int (*bh_matchname)(struct confargs *, char *); } bushook_t; #define BUS_MAIN 1 /* mainbus */ @@ -98,6 +95,6 @@ struct confargs { void set_clockintr __P((void (*)(struct clockframe *))); void set_iointr __P((void (*)(void *, int))); -int badaddr __P((void *, u_int32_t)); +int badaddr(void *, u_int32_t); #endif /* _MACHINE_AUTOCONF_H_ */ diff --git a/sys/arch/mvmeppc/include/bus_mi.h b/sys/arch/mvmeppc/include/bus_mi.h index a2cc5b80ba3..80bd5ea12bd 100644 --- a/sys/arch/mvmeppc/include/bus_mi.h +++ b/sys/arch/mvmeppc/include/bus_mi.h @@ -1,5 +1,5 @@ /* $NetBSD: bus.h,v 1.1 2001/06/06 17:37:37 matt Exp $ */ -/* $OpenBSD: bus_mi.h,v 1.3 2001/11/05 17:25:58 art Exp $ */ +/* $OpenBSD: bus_mi.h,v 1.4 2002/03/14 01:26:41 millert Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -119,14 +119,14 @@ struct ppc_bus_space { bus_addr_t pbs_offset; bus_addr_t pbs_base; bus_addr_t pbs_limit; - int (*pbs_map) __P((bus_space_tag_t, bus_addr_t, bus_size_t, int, - bus_space_handle_t *)); - void (*pbs_unmap) __P((bus_space_tag_t, bus_space_handle_t, - bus_size_t)); - int (*pbs_alloc) __P((bus_space_tag_t, bus_addr_t, bus_addr_t, + int (*pbs_map)(bus_space_tag_t, bus_addr_t, bus_size_t, int, + bus_space_handle_t *); + void (*pbs_unmap)(bus_space_tag_t, bus_space_handle_t, + bus_size_t); + int (*pbs_alloc)(bus_space_tag_t, bus_addr_t, bus_addr_t, bus_size_t, bus_size_t align, bus_size_t, int, bus_addr_t *, - bus_space_handle_t *)); - void (*pbs_free) __P((bus_space_tag_t, bus_space_handle_t, bus_size_t)); + bus_space_handle_t *); + void (*pbs_free)(bus_space_tag_t, bus_space_handle_t, bus_size_t); }; #define BUS_SPACE_MAP_CACHEABLE 0x01 @@ -148,8 +148,8 @@ struct ppc_bus_space { #define __BUS_SPACE_HAS_STREAM_METHODS /* - * int bus_space_map __P((bus_space_tag_t t, bus_addr_t addr, - * bus_size_t size, int flags, bus_space_handle_t *bshp)); + * int bus_space_map(bus_space_tag_t t, bus_addr_t addr, + * bus_size_t size, int flags, bus_space_handle_t *bshp); * * Map a region of bus space. */ @@ -158,8 +158,8 @@ struct ppc_bus_space { ((*(t)->pbs_map)((t), (a), (s), (f), (hp))) /* - * int bus_space_unmap __P((bus_space_tag_t t, - * bus_space_handle_t bsh, bus_size_t size)); + * int bus_space_unmap(bus_space_tag_t t, + * bus_space_handle_t bsh, bus_size_t size); * * Unmap a region of bus space. */ @@ -168,9 +168,9 @@ struct ppc_bus_space { ((void)(*(t)->pbs_unmap)((t), (h), (s))) /* - * int bus_space_subregion __P((bus_space_tag_t t, + * int bus_space_subregion(bus_space_tag_t t, * bus_space_handle_t bsh, bus_size_t offset, bus_size_t size, - * bus_space_handle_t *nbshp)); + * bus_space_handle_t *nbshp); * * Get a new handle for a subregion of an already-mapped area of bus space. */ @@ -179,10 +179,10 @@ struct ppc_bus_space { ((*(hp) = (h) + (o)), 0) /* - * int bus_space_alloc __P((bus_space_tag_t t, bus_addr_t rstart, + * int bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart, * bus_addr_t rend, bus_size_t size, bus_size_t align, * bus_size_t boundary, int flags, bus_addr_t *bpap, - * bus_space_handle_t *bshp)); + * bus_space_handle_t *bshp); * * Allocate a region of bus space. */ @@ -191,8 +191,8 @@ struct ppc_bus_space { ((*(t)->pbs_alloc)((t), (rs), (re), (s), (a), (b), (f), (ap), (hp))) /* - * int bus_space_free __P((bus_space_tag_t t, - * bus_space_handle_t bsh, bus_size_t size)); + * int bus_space_free(bus_space_tag_t t, + * bus_space_handle_t bsh, bus_size_t size); * * Free a region of bus space. */ @@ -201,8 +201,8 @@ struct ppc_bus_space { ((void)(*(t)->pbs_free)((t), (h), (s))) /* - * u_intN_t bus_space_read_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset)); + * u_intN_t bus_space_read_N(bus_space_tag_t tag, + * bus_space_handle_t bsh, bus_size_t offset); * * Read a 1, 2, 4, or 8 byte quantity from bus space * described by tag/handle/offset. @@ -222,8 +222,8 @@ bus_space_read(4,32) #define bus_space_read_8 !!! bus_space_read_8 unimplemented !!! /* - * u_intN_t bus_space_read_stream_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset)); + * u_intN_t bus_space_read_stream_N(bus_space_tag_t tag, + * bus_space_handle_t bsh, bus_size_t offset); * * Read a 2, 4, or 8 byte stream quantity from bus space * described by tag/handle/offset. @@ -242,9 +242,9 @@ bus_space_read_stream(4,32) #define bus_space_read_stream_8 !!! bus_space_read_stream_8 unimplemented !!! /* - * void bus_space_read_multi_N __P((bus_space_tag_t tag, + * void bus_space_read_multi_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t *addr, size_t count)); + * u_intN_t *addr, size_t count); * * Read `count' 1, 2, 4, or 8 byte quantities from bus space * described by tag/handle/offset and copy into buffer provided. @@ -265,9 +265,9 @@ bus_space_read_multi(4,32) #define bus_space_read_multi_8 !!! bus_space_read_multi_8 not implemented !!! /* - * void bus_space_read_multi_stream_N __P((bus_space_tag_t tag, + * void bus_space_read_multi_stream_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t *addr, size_t count)); + * u_intN_t *addr, size_t count); * * Read `count' 2, 4, or 8 byte stream quantities from bus space * described by tag/handle/offset and copy into buffer provided. @@ -289,9 +289,9 @@ bus_space_read_multi_stream(4,32) !!! bus_space_read_multi_stream_8 not implemented !!! /* - * void bus_space_write_N __P((bus_space_tag_t tag, + * void bus_space_write_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t value)); + * u_intN_t value); * * Write the 1, 2, 4, or 8 byte value `value' to bus space * described by tag/handle/offset. @@ -311,9 +311,9 @@ bus_space_write(4,32) #define bus_space_write_8 !!! bus_space_write_8 unimplemented !!! /* - * void bus_space_write_stream_N __P((bus_space_tag_t tag, + * void bus_space_write_stream_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t value)); + * u_intN_t value); * * Write the 2, 4, or 8 byte stream value `value' to bus space * described by tag/handle/offset. @@ -332,9 +332,9 @@ bus_space_write_stream(4,32) #define bus_space_write_stream_8 !!! bus_space_write_stream_8 unimplemented !!! /* - * void bus_space_write_multi_N __P((bus_space_tag_t tag, + * void bus_space_write_multi_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * const u_intN_t *addr, size_t count)); + * const u_intN_t *addr, size_t count); * * Write `count' 1, 2, 4, or 8 byte quantities from the buffer * provided to bus space described by tag/handle/offset. @@ -355,9 +355,9 @@ bus_space_write_multi(4,32) #define bus_space_write_multi_8 !!! bus_space_write_multi_8 not implemented !!! /* - * void bus_space_write_multi_stream_N __P((bus_space_tag_t tag, + * void bus_space_write_multi_stream_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * const u_intN_t *addr, size_t count)); + * const u_intN_t *addr, size_t count); * * Write `count' 2, 4, or 8 byte stream quantities from the buffer * provided to bus space described by tag/handle/offset. @@ -379,20 +379,20 @@ bus_space_write_multi_stream(4,32) !!! bus_space_write_multi_stream_8 not implemented !!! /* - * void bus_space_read_region_N __P((bus_space_tag_t tag, + * void bus_space_read_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t *addr, size_t count)); + * u_intN_t *addr, size_t count); * * Read `count' 1, 2, 4, or 8 byte quantities from bus space * described by tag/handle and starting at `offset' and copy into * buffer provided. */ -static __inline void bus_space_read_region_1 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int8_t *, size_t)); -static __inline void bus_space_read_region_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int16_t *, size_t)); -static __inline void bus_space_read_region_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int32_t *, size_t)); +static __inline void bus_space_read_region_1(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int8_t *, size_t); +static __inline void bus_space_read_region_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int16_t *, size_t); +static __inline void bus_space_read_region_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int32_t *, size_t); static __inline void bus_space_read_region_1(tag, bsh, offset, addr, count) @@ -447,18 +447,18 @@ bus_space_read_region_4(tag, bsh, offset, addr, count) #define bus_space_read_region_8 !!! bus_space_read_region_8 unimplemented !!! /* - * void bus_space_read_region_stream_N __P((bus_space_tag_t tag, + * void bus_space_read_region_stream_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t *addr, size_t count)); + * u_intN_t *addr, size_t count); * * Read `count' 2, 4, or 8 byte stream quantities from bus space * described by tag/handle and starting at `offset' and copy into * buffer provided. */ -static __inline void bus_space_read_region_stream_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int16_t *, size_t)); -static __inline void bus_space_read_region_stream_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int32_t *, size_t)); +static __inline void bus_space_read_region_stream_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int16_t *, size_t); +static __inline void bus_space_read_region_stream_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int32_t *, size_t); static __inline void bus_space_read_region_stream_2(tag, bsh, offset, addr, count) @@ -496,19 +496,19 @@ bus_space_read_region_stream_4(tag, bsh, offset, addr, count) !!! bus_space_read_region_stream_8 unimplemented !!! /* - * void bus_space_write_region_N __P((bus_space_tag_t tag, + * void bus_space_write_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * const u_intN_t *addr, size_t count)); + * const u_intN_t *addr, size_t count); * * Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided * to bus space described by tag/handle starting at `offset'. */ -static __inline void bus_space_write_region_1 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, const u_int8_t *, size_t)); -static __inline void bus_space_write_region_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, const u_int16_t *, size_t)); -static __inline void bus_space_write_region_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, const u_int32_t *, size_t)); +static __inline void bus_space_write_region_1(bus_space_tag_t, + bus_space_handle_t, bus_size_t, const u_int8_t *, size_t); +static __inline void bus_space_write_region_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, const u_int16_t *, size_t); +static __inline void bus_space_write_region_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, const u_int32_t *, size_t); static __inline void bus_space_write_region_1(tag, bsh, offset, addr, count) @@ -563,17 +563,17 @@ bus_space_write_region_4(tag, bsh, offset, addr, count) #define bus_space_write_region_8 !!! bus_space_write_region_8 unimplemented !!! /* - * void bus_space_write_region_stream_N __P((bus_space_tag_t tag, + * void bus_space_write_region_stream_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * const u_intN_t *addr, size_t count)); + * const u_intN_t *addr, size_t count); * * Write `count' 2, 4, or 8 byte stream quantities from the buffer provided * to bus space described by tag/handle starting at `offset'. */ -static __inline void bus_space_write_region_stream_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, const u_int16_t *, size_t)); -static __inline void bus_space_write_region_stream_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, const u_int32_t *, size_t)); +static __inline void bus_space_write_region_stream_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, const u_int16_t *, size_t); +static __inline void bus_space_write_region_stream_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, const u_int32_t *, size_t); static __inline void bus_space_write_region_stream_2(tag, bsh, offset, addr, count) @@ -611,19 +611,19 @@ bus_space_write_region_stream_4(tag, bsh, offset, addr, count) !!! bus_space_write_region_stream_8 unimplemented !!! /* - * void bus_space_set_multi_N __P((bus_space_tag_t tag, + * void bus_space_set_multi_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, u_intN_t val, - * size_t count)); + * size_t count); * * Write the 1, 2, 4, or 8 byte value `val' to bus space described * by tag/handle/offset `count' times. */ -static __inline void bus_space_set_multi_1 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int8_t, size_t)); -static __inline void bus_space_set_multi_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int16_t, size_t)); -static __inline void bus_space_set_multi_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int32_t, size_t)); +static __inline void bus_space_set_multi_1(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int8_t, size_t); +static __inline void bus_space_set_multi_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int16_t, size_t); +static __inline void bus_space_set_multi_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int32_t, size_t); static __inline void bus_space_set_multi_1(tag, bsh, offset, val, count) @@ -678,17 +678,17 @@ bus_space_set_multi_4(tag, bsh, offset, val, count) #define bus_space_set_multi_8 !!! bus_space_set_multi_8 unimplemented !!! /* - * void bus_space_set_multi_stream_N __P((bus_space_tag_t tag, + * void bus_space_set_multi_stream_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, u_intN_t val, - * size_t count)); + * size_t count); * * Write the 2, 4, or 8 byte stream value `val' to bus space described * by tag/handle/offset `count' times. */ -static __inline void bus_space_set_multi_stream_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int16_t, size_t)); -static __inline void bus_space_set_multi_stream_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int32_t, size_t)); +static __inline void bus_space_set_multi_stream_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int16_t, size_t); +static __inline void bus_space_set_multi_stream_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int32_t, size_t); static __inline void bus_space_set_multi_stream_2(tag, bsh, offset, val, count) @@ -726,19 +726,19 @@ bus_space_set_multi_stream_4(tag, bsh, offset, val, count) !!! bus_space_set_multi_stream_8 unimplemented !!! /* - * void bus_space_set_region_N __P((bus_space_tag_t tag, + * void bus_space_set_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, u_intN_t val, - * size_t count)); + * size_t count); * * Write `count' 1, 2, 4, or 8 byte value `val' to bus space described * by tag/handle starting at `offset'. */ -static __inline void bus_space_set_region_1 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int8_t, size_t)); -static __inline void bus_space_set_region_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int16_t, size_t)); -static __inline void bus_space_set_region_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int32_t, size_t)); +static __inline void bus_space_set_region_1(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int8_t, size_t); +static __inline void bus_space_set_region_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int16_t, size_t); +static __inline void bus_space_set_region_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int32_t, size_t); static __inline void bus_space_set_region_1(tag, bsh, offset, val, count) @@ -793,17 +793,17 @@ bus_space_set_region_4(tag, bsh, offset, val, count) #define bus_space_set_region_8 !!! bus_space_set_region_8 unimplemented !!! /* - * void bus_space_set_region_stream_N __P((bus_space_tag_t tag, + * void bus_space_set_region_stream_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, u_intN_t val, - * size_t count)); + * size_t count); * * Write `count' 2, 4, or 8 byte stream value `val' to bus space described * by tag/handle starting at `offset'. */ -static __inline void bus_space_set_region_stream_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int16_t, size_t)); -static __inline void bus_space_set_region_stream_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int32_t, size_t)); +static __inline void bus_space_set_region_stream_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int16_t, size_t); +static __inline void bus_space_set_region_stream_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int32_t, size_t); static __inline void @@ -842,24 +842,24 @@ bus_space_set_region_stream_4(tag, bsh, offset, val, count) !!! bus_space_set_region_stream_8 unimplemented !!! /* - * void bus_space_copy_region_N __P((bus_space_tag_t tag, + * void bus_space_copy_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh1, bus_size_t off1, * bus_space_handle_t bsh2, bus_size_t off2, - * size_t count)); + * size_t count); * * Copy `count' 1, 2, 4, or 8 byte values from bus space starting * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2. */ -static __inline void bus_space_copy_region_1 __P((bus_space_tag_t, +static __inline void bus_space_copy_region_1(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_space_handle_t, - bus_size_t, size_t)); -static __inline void bus_space_copy_region_2 __P((bus_space_tag_t, + bus_size_t, size_t); +static __inline void bus_space_copy_region_2(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_space_handle_t, - bus_size_t, size_t)); -static __inline void bus_space_copy_region_4 __P((bus_space_tag_t, + bus_size_t, size_t); +static __inline void bus_space_copy_region_4(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_space_handle_t, - bus_size_t, size_t)); + bus_size_t, size_t); static __inline void bus_space_copy_region_1(t, h1, o1, h2, o2, c) @@ -944,9 +944,9 @@ bus_space_copy_region_4(t, h1, o1, h2, o2, c) /* * Bus read/write barrier methods. * - * void bus_space_barrier __P((bus_space_tag_t tag, + * void bus_space_barrier(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * bus_size_t len, int flags)); + * bus_size_t len, int flags); * */ #define bus_space_barrier(t, h, o, l, f) \ @@ -1018,33 +1018,33 @@ struct powerpc_bus_dma_tag { /* * DMA mapping methods. */ - int (*_dmamap_create) __P((bus_dma_tag_t, bus_size_t, int, - bus_size_t, bus_size_t, int, bus_dmamap_t *)); - void (*_dmamap_destroy) __P((bus_dma_tag_t, bus_dmamap_t)); - int (*_dmamap_load) __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); - int (*_dmamap_load_mbuf) __P((bus_dma_tag_t, bus_dmamap_t, - struct mbuf *, int)); - int (*_dmamap_load_uio) __P((bus_dma_tag_t, bus_dmamap_t, - struct uio *, int)); - int (*_dmamap_load_raw) __P((bus_dma_tag_t, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int)); - void (*_dmamap_unload) __P((bus_dma_tag_t, bus_dmamap_t)); - void (*_dmamap_sync) __P((bus_dma_tag_t, bus_dmamap_t, - bus_addr_t, bus_size_t, int)); + int (*_dmamap_create)(bus_dma_tag_t, bus_size_t, int, + bus_size_t, bus_size_t, int, bus_dmamap_t *); + void (*_dmamap_destroy)(bus_dma_tag_t, bus_dmamap_t); + int (*_dmamap_load)(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int); + int (*_dmamap_load_mbuf)(bus_dma_tag_t, bus_dmamap_t, + struct mbuf *, int); + int (*_dmamap_load_uio)(bus_dma_tag_t, bus_dmamap_t, + struct uio *, int); + int (*_dmamap_load_raw)(bus_dma_tag_t, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int); + void (*_dmamap_unload)(bus_dma_tag_t, bus_dmamap_t); + void (*_dmamap_sync)(bus_dma_tag_t, bus_dmamap_t, + bus_addr_t, bus_size_t, int); /* * DMA memory utility functions. */ - int (*_dmamem_alloc) __P((bus_dma_tag_t, bus_size_t, bus_size_t, - bus_size_t, bus_dma_segment_t *, int, int *, int)); - void (*_dmamem_free) __P((bus_dma_tag_t, - bus_dma_segment_t *, int)); - int (*_dmamem_map) __P((bus_dma_tag_t, bus_dma_segment_t *, - int, size_t, caddr_t *, int)); - void (*_dmamem_unmap) __P((bus_dma_tag_t, caddr_t, size_t)); - paddr_t (*_dmamem_mmap) __P((bus_dma_tag_t, bus_dma_segment_t *, - int, off_t, int, int)); + int (*_dmamem_alloc)(bus_dma_tag_t, bus_size_t, bus_size_t, + bus_size_t, bus_dma_segment_t *, int, int *, int); + void (*_dmamem_free)(bus_dma_tag_t, + bus_dma_segment_t *, int); + int (*_dmamem_map)(bus_dma_tag_t, bus_dma_segment_t *, + int, size_t, caddr_t *, int); + void (*_dmamem_unmap)(bus_dma_tag_t, caddr_t, size_t); + paddr_t (*_dmamem_mmap)(bus_dma_tag_t, bus_dma_segment_t *, + int, off_t, int, int); }; #define bus_dmamap_create(t, s, n, m, b, f, p) \ @@ -1103,36 +1103,36 @@ struct powerpc_bus_dmamap { }; #ifdef _POWERPC_BUS_DMA_PRIVATE -int _bus_dmamap_create __P((bus_dma_tag_t, bus_size_t, int, bus_size_t, - bus_size_t, int, bus_dmamap_t *)); -void _bus_dmamap_destroy __P((bus_dma_tag_t, bus_dmamap_t)); -int _bus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); -int _bus_dmamap_load_mbuf __P((bus_dma_tag_t, bus_dmamap_t, - struct mbuf *, int)); -int _bus_dmamap_load_uio __P((bus_dma_tag_t, bus_dmamap_t, - struct uio *, int)); -int _bus_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int)); -void _bus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t)); -void _bus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t, bus_addr_t, - bus_size_t, int)); - -int _bus_dmamem_alloc __P((bus_dma_tag_t tag, bus_size_t size, +int _bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t, + bus_size_t, int, bus_dmamap_t *); +void _bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t); +int _bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int); +int _bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t, + struct mbuf *, int); +int _bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t, + struct uio *, int); +int _bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int); +void _bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t); +void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t, + bus_size_t, int); + +int _bus_dmamem_alloc(bus_dma_tag_t tag, bus_size_t size, bus_size_t alignment, bus_size_t boundary, - bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags)); -void _bus_dmamem_free __P((bus_dma_tag_t tag, bus_dma_segment_t *segs, - int nsegs)); -int _bus_dmamem_map __P((bus_dma_tag_t tag, bus_dma_segment_t *segs, - int nsegs, size_t size, caddr_t *kvap, int flags)); -void _bus_dmamem_unmap __P((bus_dma_tag_t tag, caddr_t kva, - size_t size)); -paddr_t _bus_dmamem_mmap __P((bus_dma_tag_t tag, bus_dma_segment_t *segs, - int nsegs, off_t off, int prot, int flags)); - -int _bus_dmamem_alloc_range __P((bus_dma_tag_t tag, bus_size_t size, + bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags); +void _bus_dmamem_free(bus_dma_tag_t tag, bus_dma_segment_t *segs, + int nsegs); +int _bus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs, + int nsegs, size_t size, caddr_t *kvap, int flags); +void _bus_dmamem_unmap(bus_dma_tag_t tag, caddr_t kva, + size_t size); +paddr_t _bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs, + int nsegs, off_t off, int prot, int flags); + +int _bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size, bus_size_t alignment, bus_size_t boundary, bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags, - paddr_t low, paddr_t high)); + paddr_t low, paddr_t high); #endif /* _POWERPC_BUS_DMA_PRIVATE */ #endif /* _POWERPC_BUS_H_ */ diff --git a/sys/arch/mvmeppc/include/db_machdep.h b/sys/arch/mvmeppc/include/db_machdep.h index e46b1e5ebed..5d5738c1e14 100644 --- a/sys/arch/mvmeppc/include/db_machdep.h +++ b/sys/arch/mvmeppc/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.5 2001/11/06 00:30:38 art Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.6 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: db_machdep.h,v 1.13 1996/04/29 20:50:08 leo Exp $ */ /* @@ -93,8 +93,8 @@ db_regs_t ddb_regs; /* register state */ #ifdef _KERNEL -void kdb_kintr __P((void *)); -int kdb_trap __P((int, void *)); +void kdb_kintr(void *); +int kdb_trap(int, void *); #endif /* _KERNEL */ diff --git a/sys/arch/mvmeppc/include/disklabel.h b/sys/arch/mvmeppc/include/disklabel.h index 44a54eae871..fc120486117 100644 --- a/sys/arch/mvmeppc/include/disklabel.h +++ b/sys/arch/mvmeppc/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.2 2001/11/06 22:45:57 miod Exp $ */ +/* $OpenBSD: disklabel.h,v 1.3 2002/03/14 01:26:41 millert Exp $ */ /* * Copyright (c) 1994 Christopher G. Demetriou @@ -90,7 +90,7 @@ struct cpu_disklabel { #define DPSECT(s) ((s) & 0x3f) #define DPCYL(c, s) ((c) + (((s) & 0xc0) << 2)) -static __inline u_int32_t get_le __P((void *p)); +static __inline u_int32_t get_le(void *p); static __inline u_int32_t #ifdef __cplusplus diff --git a/sys/arch/mvmeppc/include/pmap.h b/sys/arch/mvmeppc/include/pmap.h index c19ed6904b3..328a389235c 100644 --- a/sys/arch/mvmeppc/include/pmap.h +++ b/sys/arch/mvmeppc/include/pmap.h @@ -1,7 +1,7 @@ -/* $OpenBSD: pmap.h,v 1.5 2001/09/10 17:52:06 drahn Exp $ */ +/* $OpenBSD: pmap.h,v 1.6 2002/03/14 01:26:41 millert Exp $ */ #include <powerpc/pmap.h> #ifndef _LOCORE -paddr_t vtophys __P((vaddr_t)); +paddr_t vtophys(vaddr_t); #endif /* _LOCORE */ diff --git a/sys/arch/mvmeppc/include/powerpc.h b/sys/arch/mvmeppc/include/powerpc.h index b79ed38d610..5ef80509dba 100644 --- a/sys/arch/mvmeppc/include/powerpc.h +++ b/sys/arch/mvmeppc/include/powerpc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: powerpc.h,v 1.1 2001/06/26 21:57:47 smurph Exp $ */ +/* $OpenBSD: powerpc.h,v 1.2 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: powerpc.h,v 1.1 1996/09/30 16:34:30 ws Exp $ */ /* @@ -39,30 +39,30 @@ struct mem_region { vm_size_t size; }; -void mem_regions __P((struct mem_region **, struct mem_region **)); +void mem_regions(struct mem_region **, struct mem_region **); /* * These two functions get used solely in boot() in machdep.c. * * Not sure whether boot itself should be implementation dependent instead. XXX */ -typedef void (exit_f) __P((void)) /*__attribute__((__noreturn__))*/ ; -typedef void (boot_f) __P((char *bootspec)) /* __attribute__((__noreturn__))*/ ; -typedef void (vmon_f) __P((void)); -typedef unsigned char (nvram_rd_f) __P((unsigned long offset)); -typedef void (nvram_wr_f) __P((unsigned long offset, unsigned char val)); -typedef unsigned long (tps_f) __P((void)); +typedef void (exit_f)(void) /*__attribute__((__noreturn__))*/ ; +typedef void (boot_f)(char *bootspec) /* __attribute__((__noreturn__))*/ ; +typedef void (vmon_f)(void); +typedef unsigned char (nvram_rd_f)(unsigned long offset); +typedef void (nvram_wr_f)(unsigned long offset, unsigned char val); +typedef unsigned long (tps_f)(void); -typedef void (mem_regions_f) __P((struct mem_region **memp, - struct mem_region **availp)); +typedef void (mem_regions_f)(struct mem_region **memp, + struct mem_region **availp); -typedef int (clock_read_f) __P((int *sec, int *min, int *hour, int *day, - int *mon, int *yr)); -typedef int (clock_write_f) __P((int sec, int min, int hour, int day, - int mon, int yr)); -typedef int (time_read_f) __P((u_long *sec)); -typedef int (time_write_f) __P((u_long sec)); +typedef int (clock_read_f)(int *sec, int *min, int *hour, int *day, + int *mon, int *yr); +typedef int (clock_write_f)(int sec, int min, int hour, int day, + int mon, int yr); +typedef int (time_read_f)(u_long *sec); +typedef int (time_write_f)(u_long sec); /* firmware interface. * regardless of type of firmware used several items diff --git a/sys/arch/mvmeppc/isa/isa_machdep.c b/sys/arch/mvmeppc/isa/isa_machdep.c index 7f42c67857b..ddbafafe7d1 100644 --- a/sys/arch/mvmeppc/isa/isa_machdep.c +++ b/sys/arch/mvmeppc/isa/isa_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.c,v 1.3 2001/11/06 19:53:15 miod Exp $ */ +/* $OpenBSD: isa_machdep.c,v 1.4 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $ */ #define ISA_DMA_STATS @@ -136,7 +136,7 @@ #include <mvmeppc/isa/isa_machdep.h> void *i8259_intr_establish( void * lcv, int irq, int type, int level, - int (*ih_fun) __P((void *)), void *ih_arg, char *name); + int (*ih_fun)(void *), void *ih_arg, char *name); int isa_has_been_seen = 0; @@ -150,7 +150,7 @@ isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg, ih_what) int irq; int type; int level; - int (*ih_fun) __P((void *)); + int (*ih_fun)(void *); void *ih_arg; char *ih_what; { diff --git a/sys/arch/mvmeppc/isa/isa_machdep.h b/sys/arch/mvmeppc/isa/isa_machdep.h index a8174c14808..562a793fa1f 100644 --- a/sys/arch/mvmeppc/isa/isa_machdep.h +++ b/sys/arch/mvmeppc/isa/isa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.h,v 1.1 2001/06/26 21:57:51 smurph Exp $ */ +/* $OpenBSD: isa_machdep.h,v 1.2 2002/03/14 01:26:41 millert Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -52,11 +52,11 @@ struct isabus_attach_args; /* XXX */ /* * Functions provided to machine-independent ISA code. */ -void isa_attach_hook __P((struct device *, struct device *, - struct isabus_attach_args *)); +void isa_attach_hook(struct device *, struct device *, + struct isabus_attach_args *); void *isa_intr_establish __P((isa_chipset_tag_t ic, int irq, int type, int level, int (*ih_fun)(void *), void *ih_arg, char *ih_what)); -void isa_intr_disestablish __P((isa_chipset_tag_t ic, void *handler)); +void isa_intr_disestablish(isa_chipset_tag_t ic, void *handler); #define __NO_ISA_INTR_CHECK /* diff --git a/sys/arch/mvmeppc/mvmeppc/autoconf.c b/sys/arch/mvmeppc/mvmeppc/autoconf.c index 0281d7b3b67..96265c7d4d3 100644 --- a/sys/arch/mvmeppc/mvmeppc/autoconf.c +++ b/sys/arch/mvmeppc/mvmeppc/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.3 2001/12/05 23:58:41 tdeval Exp $ */ +/* $OpenBSD: autoconf.c,v 1.4 2002/03/14 01:26:41 millert Exp $ */ /* * Copyright (c) 1996, 1997 Per Fogelstrom * Copyright (c) 1995 Theo de Raadt @@ -41,7 +41,7 @@ * from: Utah Hdr: autoconf.c 1.31 91/01/21 * * from: @(#)autoconf.c 8.1 (Berkeley) 6/10/93 - * $Id: autoconf.c,v 1.3 2001/12/05 23:58:41 tdeval Exp $ + * $Id: autoconf.c,v 1.4 2002/03/14 01:26:41 millert Exp $ */ /* @@ -62,17 +62,17 @@ #include <machine/autoconf.h> -struct device *parsedisk __P((char *, int, int, dev_t *)); -void setroot __P((void)); -void swapconf __P((void)); -extern void dumpconf __P((void)); -int findblkmajor __P((struct device *)); -char *findblkname __P((int)); -static struct device * getdisk __P((char *, int, int, dev_t *)); -struct device * getdevunit __P((char *, int)); -static struct devmap * findtype __P((char **)); -void makebootdev __P((char *cp)); -int getpno __P((char **)); +struct device *parsedisk(char *, int, int, dev_t *); +void setroot(void); +void swapconf(void); +extern void dumpconf(void); +int findblkmajor(struct device *); +char *findblkname(int); +static struct device * getdisk(char *, int, int, dev_t *); +struct device * getdevunit(char *, int); +static struct devmap * findtype(char **); +void makebootdev(char *cp); +int getpno(char **); void diskconf(); /* diff --git a/sys/arch/mvmeppc/mvmeppc/disksubr.c b/sys/arch/mvmeppc/mvmeppc/disksubr.c index 15b04b2cd28..229b1232619 100644 --- a/sys/arch/mvmeppc/mvmeppc/disksubr.c +++ b/sys/arch/mvmeppc/mvmeppc/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.3 2002/02/19 02:46:40 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.4 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -79,7 +79,7 @@ dk_establish(dk, dev) char * readdisklabel(dev, strat, lp, osdep, spoofonly) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); register struct disklabel *lp; struct cpu_disklabel *osdep; int spoofonly; @@ -395,7 +395,7 @@ setdisklabel(olp, nlp, openmask, osdep) int writedisklabel(dev, strat, lp, osdep) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); register struct disklabel *lp; struct cpu_disklabel *osdep; { diff --git a/sys/arch/mvmeppc/mvmeppc/machdep.c b/sys/arch/mvmeppc/mvmeppc/machdep.c index 8a1b130ded0..8ddb0773321 100644 --- a/sys/arch/mvmeppc/mvmeppc/machdep.c +++ b/sys/arch/mvmeppc/mvmeppc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.21 2002/02/17 22:59:53 maja Exp $ */ +/* $OpenBSD: machdep.c,v 1.22 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -96,11 +96,11 @@ extern struct user *proc0paddr; */ #include <dev/cons.h> -int bootcnprobe __P((struct consdev *)); -int bootcninit __P((struct consdev *)); -void bootcnputc __P((dev_t, char)); -int bootcngetc __P((dev_t)); -extern void nullcnpollc __P((dev_t, int)); +int bootcnprobe(struct consdev *); +int bootcninit(struct consdev *); +void bootcnputc(dev_t, char); +int bootcngetc(dev_t); +extern void nullcnpollc(dev_t, int); #define bootcnpollc nullcnpollc static struct consdev bootcons = { (void (*))NULL, @@ -113,8 +113,8 @@ static struct consdev bootcons = { 1 }; -u_int32_t ppc_get_msr __P((void)); -u_int32_t ppc_set_msr __P((u_int32_t)); +u_int32_t ppc_get_msr(void); +u_int32_t ppc_set_msr(u_int32_t); /* * Declare these as initialized data so we can patch them. @@ -157,7 +157,7 @@ char bootpathbuf[512]; struct firmware *fw = NULL; extern struct firmware ppc1_firmware; -caddr_t allocsys __P((caddr_t)); +caddr_t allocsys(caddr_t); /* * Extent maps to manage I/O. Allocate storage for 8 regions in each, @@ -194,8 +194,8 @@ initppc(startkernel, endkernel, args) #if NIPKDB > 0 extern caddr_t ipkdblow, ipkdbsize; #endif - extern void consinit __P((void)); - extern void callback __P((void *)); + extern void consinit(void); + extern void callback(void *); int exc, scratch; proc0.p_addr = proc0paddr; @@ -470,7 +470,7 @@ initppc(startkernel, endkernel, args) void install_extint(handler) - void (*handler) __P((void)); + void (*handler)(void); { extern caddr_t extint, extsize; extern u_long extint_call; @@ -986,7 +986,7 @@ systype(char *name) #include <dev/pci/pcivar.h> typedef void *(intr_establish_t) __P((void *, pci_intr_handle_t, int, int, int (*func)(void *), void *, char *)); -typedef void (intr_disestablish_t) __P((void *, void *)); +typedef void (intr_disestablish_t)(void *, void *); int ppc_configed_intr_cnt = 0; struct intrhand ppc_configed_intr[MAX_PRECONF_INTR]; @@ -997,7 +997,7 @@ ppc_intr_establish(lcv, ih, type, level, func, arg, name) pci_intr_handle_t ih; int type; int level; - int (*func) __P((void *)); + int (*func)(void *); void *arg; char *name; { @@ -1109,10 +1109,10 @@ bus_space_map(t, bpa, size, cacheable, bshp) } return 0; } -bus_addr_t bus_space_unmap_p __P((bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t size)); -void bus_space_unmap __P((bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t size)); +bus_addr_t bus_space_unmap_p(bus_space_tag_t t, bus_space_handle_t bsh, + bus_size_t size); +void bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, + bus_size_t size); bus_addr_t bus_space_unmap_p(t, bsh, size) bus_space_tag_t t; diff --git a/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c b/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c index 29c786e462c..b0465c7fa98 100644 --- a/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c +++ b/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ppc1_machdep.c,v 1.4 2001/11/06 22:46:00 miod Exp $ */ +/* $OpenBSD: ppc1_machdep.c,v 1.5 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: ofw_machdep.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */ /* @@ -52,18 +52,18 @@ #include <dev/cons.h> -void PPC1_exit __P((void)) __attribute__((__noreturn__)); -void PPC1_boot __P((char *bootspec)) __attribute__((__noreturn__)); -void PPC1_mem_regions __P((struct mem_region **memp, struct mem_region **availp)); -void PPC1_vmon __P((void)); -unsigned char PPC1_nvram_rd __P((unsigned long offset)); -void PPC1_nvram_wr __P((unsigned long offset, unsigned char val)); -unsigned long PPC1_tps __P((void)); - -int PPC1_clock_read __P((int *sec, int *min, int *hour, int *day, - int *mon, int *yr)); -int PPC1_clock_write __P((int sec, int min, int hour, int day, - int mon, int yr)); +void PPC1_exit(void) __attribute__((__noreturn__)); +void PPC1_boot(char *bootspec) __attribute__((__noreturn__)); +void PPC1_mem_regions(struct mem_region **memp, struct mem_region **availp); +void PPC1_vmon(void); +unsigned char PPC1_nvram_rd(unsigned long offset); +void PPC1_nvram_wr(unsigned long offset, unsigned char val); +unsigned long PPC1_tps(void); + +int PPC1_clock_read(int *sec, int *min, int *hour, int *day, + int *mon, int *yr); +int PPC1_clock_write(int sec, int min, int hour, int day, + int mon, int yr); struct firmware ppc1_firmware = { PPC1_mem_regions, diff --git a/sys/arch/mvmeppc/mvmeppc/swapgeneric.c b/sys/arch/mvmeppc/mvmeppc/swapgeneric.c index 6d59e1a50b3..00654d0f62f 100644 --- a/sys/arch/mvmeppc/mvmeppc/swapgeneric.c +++ b/sys/arch/mvmeppc/mvmeppc/swapgeneric.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapgeneric.c,v 1.2 2001/09/29 18:40:32 miod Exp $ */ +/* $OpenBSD: swapgeneric.c,v 1.3 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: swapgeneric.c,v 1.1 1996/09/30 16:34:55 ws Exp $ */ /*- @@ -43,7 +43,7 @@ #include <sys/param.h> #include <sys/conf.h> -int (*mountroot) __P((void *)) = NULL; /* tells autoconf.c that we are "generic" */ +int (*mountroot)(void *) = NULL; /* tells autoconf.c that we are "generic" */ dev_t rootdev = NODEV; dev_t dumpdev = NODEV; diff --git a/sys/arch/mvmeppc/mvmeppc/wscons_machdep.c b/sys/arch/mvmeppc/mvmeppc/wscons_machdep.c index 0d3616ad7b7..7371902db65 100644 --- a/sys/arch/mvmeppc/mvmeppc/wscons_machdep.c +++ b/sys/arch/mvmeppc/mvmeppc/wscons_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wscons_machdep.c,v 1.1 2001/06/26 21:57:56 smurph Exp $ */ +/* $OpenBSD: wscons_machdep.c,v 1.2 2002/03/14 01:26:41 millert Exp $ */ /* * Copyright (c) 2001 Aaron Campbell @@ -47,11 +47,11 @@ #include <dev/wscons/wsdisplayvar.h> #endif -void wscnprobe __P((struct consdev *)); -void wscninit __P((struct consdev *)); -void wscnputc __P((dev_t, char)); -int wscngetc __P((dev_t)); -void wscnpollc __P((dev_t, int)); +void wscnprobe(struct consdev *); +void wscninit(struct consdev *); +void wscnputc(dev_t, char); +int wscngetc(dev_t); +void wscnpollc(dev_t, int); void wscnprobe(cp) diff --git a/sys/arch/mvmeppc/pci/mpcpcibr.c b/sys/arch/mvmeppc/pci/mpcpcibr.c index 6a075a6b785..fd3377490b8 100644 --- a/sys/arch/mvmeppc/pci/mpcpcibr.c +++ b/sys/arch/mvmeppc/pci/mpcpcibr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpcpcibr.c,v 1.7 2001/11/06 22:46:00 miod Exp $ */ +/* $OpenBSD: mpcpcibr.c,v 1.8 2002/03/14 01:26:41 millert Exp $ */ /* * Copyright (c) 2001 Steve Murphree, Jr. @@ -55,24 +55,24 @@ #include <mvmeppc/pci/pcibrvar.h> #include <mvmeppc/dev/ravenreg.h> -int mpcpcibrmatch __P((struct device *, void *, void *)); -void mpcpcibrattach __P((struct device *, struct device *, void *)); +int mpcpcibrmatch(struct device *, void *, void *); +void mpcpcibrattach(struct device *, struct device *, void *); -void mpc_attach_hook __P((struct device *, struct device *, - struct pcibus_attach_args *)); -int mpc_bus_maxdevs __P((void *, int)); -pcitag_t mpc_make_tag __P((void *, int, int, int)); -void mpc_decompose_tag __P((void *, pcitag_t, int *, int *, int *)); -pcireg_t mpc_conf_read __P((void *, pcitag_t, int)); -void mpc_conf_write __P((void *, pcitag_t, int, pcireg_t)); +void mpc_attach_hook(struct device *, struct device *, + struct pcibus_attach_args *); +int mpc_bus_maxdevs(void *, int); +pcitag_t mpc_make_tag(void *, int, int, int); +void mpc_decompose_tag(void *, pcitag_t, int *, int *, int *); +pcireg_t mpc_conf_read(void *, pcitag_t, int); +void mpc_conf_write(void *, pcitag_t, int, pcireg_t); -int mpc_intr_map __P((void *, pcitag_t, int, int, pci_intr_handle_t *)); -const char *mpc_intr_string __P((void *, pci_intr_handle_t)); -int mpc_intr_line __P((void *, pci_intr_handle_t)); +int mpc_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *); +const char *mpc_intr_string(void *, pci_intr_handle_t); +int mpc_intr_line(void *, pci_intr_handle_t); void *mpc_intr_establish __P((void *, pci_intr_handle_t, int, int (*func)(void *), void *, char *)); -void mpc_intr_disestablish __P((void *, void *)); -int mpc_ether_hw_addr __P((struct ppc_pci_chipset *, u_int8_t *)); +void mpc_intr_disestablish(void *, void *); +int mpc_ether_hw_addr(struct ppc_pci_chipset *, u_int8_t *); void mpc_cfg_write_1( struct pcibr_config *cp, u_int32_t reg, u_int8_t val); @@ -98,7 +98,7 @@ struct cfdriver mpcpcibr_cd = { NULL, "mpcpcibr", DV_DULL, }; -static int mpcpcibrprint __P((void *, const char *pnp)); +static int mpcpcibrprint(void *, const char *pnp); struct pcibr_config mpc_config; @@ -539,7 +539,7 @@ mpc_intr_line(lcv, ih) typedef void *(intr_establish_t) __P((void *, pci_intr_handle_t, int, int, int (*func)(void *), void *, char *)); -typedef void (intr_disestablish_t) __P((void *, void *)); +typedef void (intr_disestablish_t)(void *, void *); extern intr_establish_t *intr_establish_func; extern intr_disestablish_t *intr_disestablish_func; @@ -548,7 +548,7 @@ mpc_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/mvmeppc/pci/pchb.c b/sys/arch/mvmeppc/pci/pchb.c index 0fa85f3183f..a592a3a0982 100644 --- a/sys/arch/mvmeppc/pci/pchb.c +++ b/sys/arch/mvmeppc/pci/pchb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pchb.c,v 1.3 2001/11/06 22:46:00 miod Exp $ */ +/* $OpenBSD: pchb.c,v 1.4 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: pchb.c,v 1.4 2000/01/25 07:19:11 tsubai Exp $ */ /*- @@ -48,8 +48,8 @@ #include <dev/pci/pcireg.h> #include <dev/pci/pcidevs.h> -int pchbmatch __P((struct device *, void *, void *)); -void pchbattach __P((struct device *, struct device *, void *)); +int pchbmatch(struct device *, void *, void *); +void pchbattach(struct device *, struct device *, void *); struct cfattach pchb_ca = { sizeof(struct device), pchbmatch, pchbattach diff --git a/sys/arch/mvmeppc/pci/pcib.c b/sys/arch/mvmeppc/pci/pcib.c index 2f7a56b5193..b442e174d92 100644 --- a/sys/arch/mvmeppc/pci/pcib.c +++ b/sys/arch/mvmeppc/pci/pcib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcib.c,v 1.1 2001/06/26 21:57:57 smurph Exp $ */ +/* $OpenBSD: pcib.c,v 1.2 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: pcib.c,v 1.6 1997/06/06 23:29:16 thorpej Exp $ */ /*- @@ -53,10 +53,10 @@ #include "isa.h" -int pcibmatch __P((struct device *, void *, void *)); -void pcibattach __P((struct device *, struct device *, void *)); -void pcib_callback __P((struct device *)); -int pcib_print __P((void *, const char *)); +int pcibmatch(struct device *, void *, void *); +void pcibattach(struct device *, struct device *, void *); +void pcib_callback(struct device *); +int pcib_print(void *, const char *); struct ppc_bus_space ppc_isa_io, ppc_isa_mem; diff --git a/sys/arch/mvmeppc/pci/raven.c b/sys/arch/mvmeppc/pci/raven.c index 5df8ca8e3aa..c94ab28c367 100644 --- a/sys/arch/mvmeppc/pci/raven.c +++ b/sys/arch/mvmeppc/pci/raven.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raven.c,v 1.5 2001/11/06 19:53:15 miod Exp $ */ +/* $OpenBSD: raven.c,v 1.6 2002/03/14 01:26:41 millert Exp $ */ /* * Copyright (c) 2001 Steve Murphree, Jr. @@ -55,24 +55,24 @@ #include <mvmeppc/pci/pcibrvar.h> #include <mvmeppc/pci/ravenreg.h> -int mpcpcibrmatch __P((struct device *, void *, void *)); -void mpcpcibrattach __P((struct device *, struct device *, void *)); +int mpcpcibrmatch(struct device *, void *, void *); +void mpcpcibrattach(struct device *, struct device *, void *); -void mpc_attach_hook __P((struct device *, struct device *, - struct pcibus_attach_args *)); -int mpc_bus_maxdevs __P((void *, int)); -pcitag_t mpc_make_tag __P((void *, int, int, int)); -void mpc_decompose_tag __P((void *, pcitag_t, int *, int *, int *)); -pcireg_t mpc_conf_read __P((void *, pcitag_t, int)); -void mpc_conf_write __P((void *, pcitag_t, int, pcireg_t)); +void mpc_attach_hook(struct device *, struct device *, + struct pcibus_attach_args *); +int mpc_bus_maxdevs(void *, int); +pcitag_t mpc_make_tag(void *, int, int, int); +void mpc_decompose_tag(void *, pcitag_t, int *, int *, int *); +pcireg_t mpc_conf_read(void *, pcitag_t, int); +void mpc_conf_write(void *, pcitag_t, int, pcireg_t); -int mpc_intr_map __P((void *, pcitag_t, int, int, pci_intr_handle_t *)); -const char *mpc_intr_string __P((void *, pci_intr_handle_t)); -int mpc_intr_line __P((void *, pci_intr_handle_t)); +int mpc_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *); +const char *mpc_intr_string(void *, pci_intr_handle_t); +int mpc_intr_line(void *, pci_intr_handle_t); void *mpc_intr_establish __P((void *, pci_intr_handle_t, int, int (*func)(void *), void *, char *)); -void mpc_intr_disestablish __P((void *, void *)); -int mpc_ether_hw_addr __P((struct ppc_pci_chipset *, u_int8_t *)); +void mpc_intr_disestablish(void *, void *); +int mpc_ether_hw_addr(struct ppc_pci_chipset *, u_int8_t *); struct cfattach mpcpcibr_ca = { sizeof(struct pcibr_softc), mpcpcibrmatch, mpcpcibrattach, @@ -82,7 +82,7 @@ struct cfdriver mpcpcibr_cd = { NULL, "mpcpcibr", DV_DULL, }; -static int mpcpcibrprint __P((void *, const char *pnp)); +static int mpcpcibrprint(void *, const char *pnp); struct pcibr_config mpc_config; @@ -485,7 +485,7 @@ mpc_intr_string(lcv, ih) typedef void *(intr_establish_t) __P((void *, pci_intr_handle_t, int, int, int (*func)(void *), void *, char *)); -typedef void (intr_disestablish_t) __P((void *, void *)); +typedef void (intr_disestablish_t)(void *, void *); extern intr_establish_t *intr_establish_func; extern intr_disestablish_t *intr_disestablish_func; @@ -494,7 +494,7 @@ mpc_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/mvmeppc/stand/installboot/installboot.c b/sys/arch/mvmeppc/stand/installboot/installboot.c index ffc76cde913..f7edc6a8277 100644 --- a/sys/arch/mvmeppc/stand/installboot/installboot.c +++ b/sys/arch/mvmeppc/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.2 2001/07/04 08:31:34 niklas Exp $ */ +/* $OpenBSD: installboot.c,v 1.3 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -69,12 +69,12 @@ daddr_t *block_table; /* block number array in prototype image */ int maxblocknum; /* size of this array */ -char *loadprotoblocks __P((char *, long *)); -int loadblocknums __P((char *, int)); -static void devread __P((int, void *, daddr_t, size_t, char *)); -static void usage __P((void)); -int main __P((int, char *[])); -static void vid_to_disklabel __P((char *, char*)); +char *loadprotoblocks(char *, long *); +int loadblocknums(char *, int); +static void devread(int, void *, daddr_t, size_t, char *); +static void usage(void); +int main(int, char *[]); +static void vid_to_disklabel(char *, char*); static void diff --git a/sys/arch/mvmeppc/stand/libbug/libbug.h b/sys/arch/mvmeppc/stand/libbug/libbug.h index c282cfaac9e..fb2148fa7a5 100644 --- a/sys/arch/mvmeppc/stand/libbug/libbug.h +++ b/sys/arch/mvmeppc/stand/libbug/libbug.h @@ -1,24 +1,24 @@ -/* $OpenBSD: libbug.h,v 1.1 2001/06/26 21:58:04 smurph Exp $ */ +/* $OpenBSD: libbug.h,v 1.2 2002/03/14 01:26:41 millert Exp $ */ /* * prototypes and such. note that get/put char are in stand.h */ -void mvmeprom_delay __P((int)); -int mvmeprom_diskrd __P((struct mvmeprom_dskio *)); -int mvmeprom_diskwr __P((struct mvmeprom_dskio *)); -struct mvmeprom_brdid *mvmeprom_getbrdid __P((void)); -int peekchar __P((void)); -void mvmeprom_outln __P((char *, char *)); -void mvmeprom_outstr __P((char *, char *)); -void mvmeprom_rtc_rd __P((struct mvmeprom_time *)); -int mvmeprom_netctrl __P((struct mvmeprom_netctrl *)); -int mvmeprom_netctrl_init __P((u_char, u_char)); -int mvmeprom_netctrl_hwa __P((u_char, u_char, void *, u_long *)); -int mvmeprom_netctrl_tx __P((u_char, u_char, void *, u_long *)); -int mvmeprom_netctrl_rx __P((u_char, u_char, void *, u_long *)); -int mvmeprom_netctrl_flush_rx __P((u_char, u_char)); -int mvmeprom_netctrl_reset __P((u_char, u_char)); +void mvmeprom_delay(int); +int mvmeprom_diskrd(struct mvmeprom_dskio *); +int mvmeprom_diskwr(struct mvmeprom_dskio *); +struct mvmeprom_brdid *mvmeprom_getbrdid(void); +int peekchar(void); +void mvmeprom_outln(char *, char *); +void mvmeprom_outstr(char *, char *); +void mvmeprom_rtc_rd(struct mvmeprom_time *); +int mvmeprom_netctrl(struct mvmeprom_netctrl *); +int mvmeprom_netctrl_init(u_char, u_char); +int mvmeprom_netctrl_hwa(u_char, u_char, void *, u_long *); +int mvmeprom_netctrl_tx(u_char, u_char, void *, u_long *); +int mvmeprom_netctrl_rx(u_char, u_char, void *, u_long *); +int mvmeprom_netctrl_flush_rx(u_char, u_char); +int mvmeprom_netctrl_reset(u_char, u_char); /* * bugcrt stuff diff --git a/sys/arch/mvmeppc/stand/libsa/libsa.h b/sys/arch/mvmeppc/stand/libsa/libsa.h index dcb9fbe441c..153583cb967 100644 --- a/sys/arch/mvmeppc/stand/libsa/libsa.h +++ b/sys/arch/mvmeppc/stand/libsa/libsa.h @@ -1,4 +1,4 @@ -/* $OpenBSD: libsa.h,v 1.2 2001/07/04 08:31:38 niklas Exp $ */ +/* $OpenBSD: libsa.h,v 1.3 2002/03/14 01:26:41 millert Exp $ */ /* * libsa prototypes @@ -7,24 +7,24 @@ #include "libbug.h" /* bugdev.c */ -int dsk_open __P((struct open_file *, ...)); -int dsk_close __P((struct open_file *)); -int dsk_ioctl __P((struct open_file *, u_long, void *)); -int dsk_strategy __P((void *, int, daddr_t, size_t, void *, size_t *)); -int net_open __P((struct open_file *, ...)); -int net_close __P((struct open_file *)); -int net_ioctl __P((struct open_file *, u_long, void *)); -int net_strategy __P((void *, int, daddr_t, size_t, void *, size_t *)); -int tape_open __P((struct open_file *, ...)); -int tape_close __P((struct open_file *)); -int tape_ioctl __P((struct open_file *, u_long, void *)); -int tape_strategy __P((void *, int, daddr_t, size_t, void *, size_t *)); +int dsk_open(struct open_file *, ...); +int dsk_close(struct open_file *); +int dsk_ioctl(struct open_file *, u_long, void *); +int dsk_strategy(void *, int, daddr_t, size_t, void *, size_t *); +int net_open(struct open_file *, ...); +int net_close(struct open_file *); +int net_ioctl(struct open_file *, u_long, void *); +int net_strategy(void *, int, daddr_t, size_t, void *, size_t *); +int tape_open(struct open_file *, ...); +int tape_close(struct open_file *); +int tape_ioctl(struct open_file *, u_long, void *); +int tape_strategy(void *, int, daddr_t, size_t, void *, size_t *); /* exec_mvme.c */ -void exec_mvme __P((char *, int)); +void exec_mvme(char *, int); /* parse_args.c */ -int parse_args __P((char **, int *)); +int parse_args(char **, int *); #define BUGDEV_DISK 0 #define BUGDEV_NET 1 diff --git a/sys/arch/mvmeppc/stand/libsa/rawfs.c b/sys/arch/mvmeppc/stand/libsa/rawfs.c index 3784175b92d..3682697b0be 100644 --- a/sys/arch/mvmeppc/stand/libsa/rawfs.c +++ b/sys/arch/mvmeppc/stand/libsa/rawfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rawfs.c,v 1.1 2001/06/26 21:58:08 smurph Exp $ */ +/* $OpenBSD: rawfs.c,v 1.2 2002/03/14 01:26:41 millert Exp $ */ /* * Copyright (c) 1995 Gordon W. Ross @@ -55,7 +55,7 @@ struct cfile { }; static int -rawfs_get_block __P((struct open_file *)); +rawfs_get_block(struct open_file *); int rawfs_open(path, f) char *path; diff --git a/sys/arch/mvmeppc/stand/libsa/rawfs.h b/sys/arch/mvmeppc/stand/libsa/rawfs.h index cf29be5800b..e84ce28b373 100644 --- a/sys/arch/mvmeppc/stand/libsa/rawfs.h +++ b/sys/arch/mvmeppc/stand/libsa/rawfs.h @@ -1,15 +1,15 @@ -/* $OpenBSD: rawfs.h,v 1.1 2001/06/26 21:58:08 smurph Exp $ */ +/* $OpenBSD: rawfs.h,v 1.2 2002/03/14 01:26:41 millert Exp $ */ /* * Raw file system - for stream devices like tapes. * No random access, only sequential read allowed. */ -int rawfs_open __P((char *path, struct open_file *f)); -int rawfs_close __P((struct open_file *f)); -int rawfs_read __P((struct open_file *f, void *buf, - u_int size, u_int *resid)); -int rawfs_write __P((struct open_file *f, void *buf, - u_int size, u_int *resid)); -off_t rawfs_seek __P((struct open_file *f, off_t offset, int where)); -int rawfs_stat __P((struct open_file *f, struct stat *sb)); +int rawfs_open(char *path, struct open_file *f); +int rawfs_close(struct open_file *f); +int rawfs_read(struct open_file *f, void *buf, + u_int size, u_int *resid); +int rawfs_write(struct open_file *f, void *buf, + u_int size, u_int *resid); +off_t rawfs_seek(struct open_file *f, off_t offset, int where); +int rawfs_stat(struct open_file *f, struct stat *sb); diff --git a/sys/arch/mvmeppc/stand/libsa/tftpfs.c b/sys/arch/mvmeppc/stand/libsa/tftpfs.c index 0b2e90759b1..9e6a3c9e8e2 100644 --- a/sys/arch/mvmeppc/stand/libsa/tftpfs.c +++ b/sys/arch/mvmeppc/stand/libsa/tftpfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tftpfs.c,v 1.1 2001/06/26 21:58:08 smurph Exp $ */ +/* $OpenBSD: tftpfs.c,v 1.2 2002/03/14 01:26:41 millert Exp $ */ /*- * Copyright (c) 2001 Steve Murphree, Jr. @@ -59,11 +59,11 @@ struct tftp_file { #define TFTP_BLOCK_NO(x) ((x >> TFTP_BLOCK_SHIFT) + 1) #define TFTP_BLOCK_OFF(x) (x % TFTP_BLOCK_SIZE) -static int read_inode __P((ino_t, struct open_file *)); -static int block_map __P((struct open_file *, daddr_t, daddr_t *)); -static int tftp_read_file __P((struct open_file *, char **, size_t *)); +static int read_inode(ino_t, struct open_file *); +static int block_map(struct open_file *, daddr_t, daddr_t *); +static int tftp_read_file(struct open_file *, char **, size_t *); #ifdef COMPAT_UFS -static void ffs_oldfscompat __P((struct fs *)); +static void ffs_oldfscompat(struct fs *); #endif /* diff --git a/sys/arch/mvmeppc/stand/libsa/tftpfs.h b/sys/arch/mvmeppc/stand/libsa/tftpfs.h index f8ea6c53c0a..1f8da6441e2 100644 --- a/sys/arch/mvmeppc/stand/libsa/tftpfs.h +++ b/sys/arch/mvmeppc/stand/libsa/tftpfs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tftpfs.h,v 1.1 2001/06/26 21:58:08 smurph Exp $ */ +/* $OpenBSD: tftpfs.h,v 1.2 2002/03/14 01:26:41 millert Exp $ */ /*- * Copyright (c) 2001 Steve Murphree, Jr. @@ -30,14 +30,14 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -int tftpfs_open __P((char *path, struct open_file *f)); -int tftpfs_close __P((struct open_file *f)); -int tftpfs_read __P((struct open_file *f, void *buf, - size_t size, size_t *resid)); -int tftpfs_write __P((struct open_file *f, void *buf, - size_t size, size_t *resid)); -off_t tftpfs_seek __P((struct open_file *f, off_t offset, int where)); -int tftpfs_stat __P((struct open_file *f, struct stat *sb)); +int tftpfs_open(char *path, struct open_file *f); +int tftpfs_close(struct open_file *f); +int tftpfs_read(struct open_file *f, void *buf, + size_t size, size_t *resid); +int tftpfs_write(struct open_file *f, void *buf, + size_t size, size_t *resid); +off_t tftpfs_seek(struct open_file *f, off_t offset, int where); +int tftpfs_stat(struct open_file *f, struct stat *sb); #ifndef NO_READDIR -int tftpfs_readdir __P((struct open_file *f, char *name)); +int tftpfs_readdir(struct open_file *f, char *name); #endif diff --git a/sys/arch/powerpc/include/cpu.h b/sys/arch/powerpc/include/cpu.h index bc1341ed852..41ffd0693bc 100644 --- a/sys/arch/powerpc/include/cpu.h +++ b/sys/arch/powerpc/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.8 2001/09/01 15:49:05 drahn Exp $ */ +/* $OpenBSD: cpu.h,v 1.9 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: cpu.h,v 1.1 1996/09/30 16:34:21 ws Exp $ */ /* @@ -46,7 +46,7 @@ #define cpu_swapout(p) #define cpu_wait(p) -void delay __P((unsigned)); +void delay(unsigned); #define DELAY(n) delay(n) extern volatile int want_resched; diff --git a/sys/arch/powerpc/include/dlfcn.h b/sys/arch/powerpc/include/dlfcn.h index f9dd62c5ef3..a3227009e70 100644 --- a/sys/arch/powerpc/include/dlfcn.h +++ b/sys/arch/powerpc/include/dlfcn.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dlfcn.h,v 1.1 2000/01/24 04:03:23 rahnds Exp $ */ +/* $OpenBSD: dlfcn.h,v 1.2 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: dlfcn.h,v 1.2 1995/06/05 19:38:00 pk Exp $ */ /* @@ -40,11 +40,11 @@ * User interface to the run-time linker. */ __BEGIN_DECLS -extern void *dlopen __P((const char *, int)); -extern int dlclose __P((void *)); -extern void *dlsym __P((void *, const char *)); -extern int dlctl __P((void *, int, void *)); -extern const char *dlerror __P((void)); +extern void *dlopen(const char *, int); +extern int dlclose(void *); +extern void *dlsym(void *, const char *); +extern int dlctl(void *, int, void *); +extern const char *dlerror(void); __END_DECLS /* Values for dlopen `mode'. */ diff --git a/sys/arch/powerpc/include/float.h b/sys/arch/powerpc/include/float.h index ac0586aa93f..070abe4376f 100644 --- a/sys/arch/powerpc/include/float.h +++ b/sys/arch/powerpc/include/float.h @@ -1,4 +1,4 @@ -/* $OpenBSD: float.h,v 1.5 2001/09/01 15:49:05 drahn Exp $ */ +/* $OpenBSD: float.h,v 1.6 2002/03/14 01:26:41 millert Exp $ */ /* * Copyright (c) 1989 Regents of the University of California. @@ -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/powerpc/include/intr.h b/sys/arch/powerpc/include/intr.h index 4d498d48790..3ef30d354f7 100644 --- a/sys/arch/powerpc/include/intr.h +++ b/sys/arch/powerpc/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.16 2002/01/26 15:22:52 drahn Exp $ */ +/* $OpenBSD: intr.h,v 1.17 2002/03/14 01:26:42 millert Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA. @@ -54,14 +54,14 @@ #define PPC_CLK_IRQ 64 extern int intrcnt[PPC_NIRQ]; -void setsoftclock __P((void)); -void clearsoftclock __P((void)); -int splsoftclock __P((void)); -void setsoftnet __P((void)); -void clearsoftnet __P((void)); -int splsoftnet __P((void)); +void setsoftclock(void); +void clearsoftclock(void); +int splsoftclock(void); +void setsoftnet(void); +void clearsoftnet(void); +int splsoftnet(void); -void do_pending_int __P((void)); +void do_pending_int(void); volatile extern int cpl, ipending, astpending, tickspending; @@ -152,7 +152,7 @@ set_sint(int pending) struct intrhand { struct intrhand *ih_next; - int (*ih_fun) __P((void *)); + int (*ih_fun)(void *); void *ih_arg; u_long ih_count; int ih_level; diff --git a/sys/arch/powerpc/include/pcb.h b/sys/arch/powerpc/include/pcb.h index 680e8ab545d..2530c91c6fc 100644 --- a/sys/arch/powerpc/include/pcb.h +++ b/sys/arch/powerpc/include/pcb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcb.h,v 1.7 2001/11/13 14:31:52 drahn Exp $ */ +/* $OpenBSD: pcb.h,v 1.8 2002/03/14 01:26:42 millert Exp $ */ /* $NetBSD: pcb.h,v 1.1 1996/09/30 16:34:29 ws Exp $ */ /*- @@ -68,6 +68,6 @@ struct md_coredump { extern struct pcb *curpcb; extern struct pmap *curpm; extern struct proc *fpuproc; -int setfault __P((faultbuf env)); +int setfault(faultbuf env); #endif #endif /* _POWERPC_PCB_H_ */ diff --git a/sys/arch/powerpc/include/pmap.h b/sys/arch/powerpc/include/pmap.h index 077f1544cee..35e297e4fb9 100644 --- a/sys/arch/powerpc/include/pmap.h +++ b/sys/arch/powerpc/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.24 2002/03/13 18:27:36 drahn Exp $ */ +/* $OpenBSD: pmap.h,v 1.25 2002/03/14 01:26:42 millert Exp $ */ /* $NetBSD: pmap.h,v 1.1 1996/09/30 16:34:29 ws Exp $ */ /*- @@ -119,13 +119,13 @@ boolean_t pteclrbits(paddr_t pa, u_int mask, u_int clear); #define PMAP_MAP_POOLPAGE(pa) ((vaddr_t)pa) #define PMAP_UNMAP_POOLPAGE(va) ((paddr_t)va) -void pmap_bootstrap __P((u_int kernelstart, u_int kernelend)); +void pmap_bootstrap(u_int kernelstart, u_int kernelend); -void pmap_pinit __P((struct pmap *)); -void pmap_release __P((struct pmap *)); +void pmap_pinit(struct pmap *); +void pmap_release(struct pmap *); -void pmap_real_memory __P((vm_offset_t *start, vm_size_t *size)); -void switchexit __P((struct proc *)); +void pmap_real_memory(vm_offset_t *start, vm_size_t *size); +void switchexit(struct proc *); int pte_spill_v(struct pmap *pm, u_int32_t va, u_int32_t dsisr); #define pmap_copy(dst_pmap, src_pmap, dst_addr, len, src_addr) ; diff --git a/sys/arch/powerpc/include/pte.h b/sys/arch/powerpc/include/pte.h index be72e286d2b..485c29d0517 100644 --- a/sys/arch/powerpc/include/pte.h +++ b/sys/arch/powerpc/include/pte.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pte.h,v 1.4 2002/03/13 18:27:36 drahn Exp $ */ +/* $OpenBSD: pte.h,v 1.5 2002/03/14 01:26:42 millert Exp $ */ /* $NetBSD: pte.h,v 1.1 1996/09/30 16:34:32 ws Exp $ */ /*- @@ -106,8 +106,8 @@ extern int ptab_cnt; #ifdef _KERNEL #ifndef _LOCORE -extern u_int dsisr __P((void)); -extern vm_offset_t dar __P((void)); +extern u_int dsisr(void); +extern vm_offset_t dar(void); #endif /* _KERNEL */ #endif /* _LOCORE */ #endif /* _POWERPC_PTE_H_ */ diff --git a/sys/arch/powerpc/pci/pci_machdep.h b/sys/arch/powerpc/pci/pci_machdep.h index 4cb0eaa06a5..2b73c1ef8a8 100644 --- a/sys/arch/powerpc/pci/pci_machdep.h +++ b/sys/arch/powerpc/pci/pci_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.h,v 1.9 2001/08/25 10:13:29 art Exp $ */ +/* $OpenBSD: pci_machdep.h,v 1.10 2002/03/14 01:26:42 millert Exp $ */ /* * Copyright (c) 1996 Carnegie-Mellon University. @@ -44,24 +44,24 @@ typedef u_long pci_intr_handle_t; */ struct ppc_pci_chipset { void *pc_conf_v; - void (*pc_attach_hook) __P((struct device *, - struct device *, struct pcibus_attach_args *)); - int (*pc_bus_maxdevs) __P((void *, int)); - pcitag_t (*pc_make_tag) __P((void *, int, int, int)); - void (*pc_decompose_tag) __P((void *, pcitag_t, int *, - int *, int *)); - pcireg_t (*pc_conf_read) __P((void *, pcitag_t, int)); - void (*pc_conf_write) __P((void *, pcitag_t, int, pcireg_t)); + void (*pc_attach_hook)(struct device *, + struct device *, struct pcibus_attach_args *); + int (*pc_bus_maxdevs)(void *, int); + pcitag_t (*pc_make_tag)(void *, int, int, int); + void (*pc_decompose_tag)(void *, pcitag_t, int *, + int *, int *); + pcireg_t (*pc_conf_read)(void *, pcitag_t, int); + void (*pc_conf_write)(void *, pcitag_t, int, pcireg_t); void *pc_intr_v; - int (*pc_intr_map) __P((void *, pcitag_t, int, int, - pci_intr_handle_t *)); - const char *(*pc_intr_string) __P((void *, pci_intr_handle_t)); - int (*pc_intr_line) __P((void *, pci_intr_handle_t)); + int (*pc_intr_map)(void *, pcitag_t, int, int, + pci_intr_handle_t *); + const char *(*pc_intr_string)(void *, pci_intr_handle_t); + int (*pc_intr_line)(void *, pci_intr_handle_t); void *(*pc_intr_establish) __P((void *, pci_intr_handle_t, int, int (*)(void *), void *, char *)); - void (*pc_intr_disestablish) __P((void *, void *)); - int (*pc_ether_hw_addr) __P((struct ppc_pci_chipset *, u_int8_t *)); + void (*pc_intr_disestablish)(void *, void *); + int (*pc_ether_hw_addr)(struct ppc_pci_chipset *, u_int8_t *); }; /* diff --git a/sys/arch/powerpc/powerpc/trap.c b/sys/arch/powerpc/powerpc/trap.c index 02a66bc7153..d1e80cff47b 100644 --- a/sys/arch/powerpc/powerpc/trap.c +++ b/sys/arch/powerpc/powerpc/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.43 2002/03/13 18:27:37 drahn Exp $ */ +/* $OpenBSD: trap.c,v 1.44 2002/03/14 01:26:42 millert Exp $ */ /* $NetBSD: trap.c,v 1.3 1996/10/13 03:31:37 christos Exp $ */ /* @@ -55,9 +55,9 @@ #include <ddb/db_extern.h> #include <ddb/db_sym.h> -static int fix_unaligned __P((struct proc *p, struct trapframe *frame)); -int badaddr __P((char *addr, u_int32_t len)); -void trap __P((struct trapframe *frame)); +static int fix_unaligned(struct proc *p, struct trapframe *frame); +int badaddr(char *addr, u_int32_t len); +void trap(struct trapframe *frame); /* These definitions should probably be somewhere else XXX */ #define FIRSTARG 3 /* first argument is in reg 3 */ @@ -68,7 +68,7 @@ volatile int want_resched; struct proc *ppc_vecproc; #ifdef DDB -void ppc_dumpbt __P((struct trapframe *frame)); +void ppc_dumpbt(struct trapframe *frame); void ppc_dumpbt(struct trapframe *frame) diff --git a/sys/arch/powerpc/powerpc/vm_machdep.c b/sys/arch/powerpc/powerpc/vm_machdep.c index eba185edefc..932328c5f3f 100644 --- a/sys/arch/powerpc/powerpc/vm_machdep.c +++ b/sys/arch/powerpc/powerpc/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.30 2002/01/20 03:41:29 drahn Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.31 2002/03/14 01:26:42 millert Exp $ */ /* $NetBSD: vm_machdep.c,v 1.1 1996/09/30 16:34:57 ws Exp $ */ /* @@ -61,7 +61,7 @@ cpu_fork(p1, p2, stack, stacksize, func, arg) struct callframe *cf; struct switchframe *sf; caddr_t stktop1, stktop2; - extern void fork_trampoline __P((void)); + extern void fork_trampoline(void); struct pcb *pcb = &p2->p_addr->u_pcb; if (p1 == fpuproc) diff --git a/sys/arch/sparc/dev/amd7930.c b/sys/arch/sparc/dev/amd7930.c index 3e162c8f7ee..7acd6f32a43 100644 --- a/sys/arch/sparc/dev/amd7930.c +++ b/sys/arch/sparc/dev/amd7930.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amd7930.c,v 1.18 1999/08/06 01:26:49 jason Exp $ */ +/* $OpenBSD: amd7930.c,v 1.19 2002/03/14 01:26:42 millert Exp $ */ /* $NetBSD: amd7930.c,v 1.37 1998/03/30 14:23:40 pk Exp $ */ /* @@ -89,7 +89,7 @@ struct amd7930_softc { /* interrupt interfaces */ #ifdef AUDIO_C_HANDLER -int amd7930hwintr __P((void *)); +int amd7930hwintr(void *); #if defined(SUN4M) #define AUDIO_SET_SWINTR do { \ if (CPU_ISSUN4M) \ @@ -103,15 +103,15 @@ int amd7930hwintr __P((void *)); #else struct auio *auiop; #endif /* AUDIO_C_HANDLER */ -int amd7930swintr __P((void *)); +int amd7930swintr(void *); /* forward declarations */ -void audio_setmap __P((volatile struct amd7930 *, struct mapreg *)); -static void init_amd __P((volatile struct amd7930 *)); +void audio_setmap(volatile struct amd7930 *, struct mapreg *); +static void init_amd(volatile struct amd7930 *); /* autoconfiguration driver */ -void amd7930attach __P((struct device *, struct device *, void *)); -int amd7930match __P((struct device *, void *, void *)); +void amd7930attach(struct device *, struct device *, void *); +int amd7930match(struct device *, void *, void *); struct cfattach audioamd_ca = { sizeof(struct amd7930_softc), amd7930match, amd7930attach @@ -204,23 +204,23 @@ static const u_short ger_coeff[] = { /* * Define our interface to the higher level audio driver. */ -int amd7930_open __P((void *, int)); -void amd7930_close __P((void *)); -int amd7930_query_encoding __P((void *, struct audio_encoding *)); -int amd7930_set_params __P((void *, int, int, struct audio_params *, struct audio_params *)); -int amd7930_round_blocksize __P((void *, int)); -int amd7930_commit_settings __P((void *)); +int amd7930_open(void *, int); +void amd7930_close(void *); +int amd7930_query_encoding(void *, struct audio_encoding *); +int amd7930_set_params(void *, int, int, struct audio_params *, struct audio_params *); +int amd7930_round_blocksize(void *, int); +int amd7930_commit_settings(void *); int amd7930_start_output __P((void *, void *, int, void (*)(void *), void *)); int amd7930_start_input __P((void *, void *, int, void (*)(void *), void *)); -int amd7930_halt_output __P((void *)); -int amd7930_halt_input __P((void *)); -int amd7930_getdev __P((void *, struct audio_device *)); -int amd7930_set_port __P((void *, mixer_ctrl_t *)); -int amd7930_get_port __P((void *, mixer_ctrl_t *)); -int amd7930_query_devinfo __P((void *, mixer_devinfo_t *)); -int amd7930_get_props __P((void *)); +int amd7930_halt_output(void *); +int amd7930_halt_input(void *); +int amd7930_getdev(void *, struct audio_device *); +int amd7930_set_port(void *, mixer_ctrl_t *); +int amd7930_get_port(void *, mixer_ctrl_t *); +int amd7930_query_devinfo(void *, mixer_devinfo_t *); +int amd7930_get_props(void *); struct audio_hw_if sa_hw_if = { amd7930_open, @@ -480,7 +480,7 @@ amd7930_start_output(addr, p, cc, intr, arg) void *addr; void *p; int cc; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; { register struct amd7930_softc *sc = addr; @@ -512,7 +512,7 @@ amd7930_start_input(addr, p, cc, intr, arg) void *addr; void *p; int cc; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; { register struct amd7930_softc *sc = addr; diff --git a/sys/arch/sparc/dev/be.c b/sys/arch/sparc/dev/be.c index 8487b6f0f91..b32ed103c4a 100644 --- a/sys/arch/sparc/dev/be.c +++ b/sys/arch/sparc/dev/be.c @@ -1,4 +1,4 @@ -/* $OpenBSD: be.c,v 1.30 2002/02/08 19:05:25 jason Exp $ */ +/* $OpenBSD: be.c,v 1.31 2002/03/14 01:26:42 millert Exp $ */ /* * Copyright (c) 1998 Theo de Raadt and Jason L. Wright. @@ -70,33 +70,33 @@ #include <sparc/dev/bereg.h> #include <sparc/dev/bevar.h> -int bematch __P((struct device *, void *, void *)); -void beattach __P((struct device *, struct device *, void *)); - -void beinit __P((struct besoftc *)); -void bestart __P((struct ifnet *)); -void bestop __P((struct besoftc *)); -void bewatchdog __P((struct ifnet *)); -int beioctl __P((struct ifnet *, u_long, caddr_t)); -void bereset __P((struct besoftc *)); - -int beintr __P((void *)); -int berint __P((struct besoftc *)); -int betint __P((struct besoftc *)); -int beqint __P((struct besoftc *, u_int32_t)); -int beeint __P((struct besoftc *, u_int32_t)); -void be_read __P((struct besoftc *, int, int)); - -void be_tcvr_idle __P((struct besoftc *)); -void be_tcvr_init __P((struct besoftc *)); -void be_tcvr_write __P((struct besoftc *, u_int8_t, u_int16_t)); -void be_tcvr_write_bit __P((struct besoftc *, int)); -int be_tcvr_read_bit1 __P((struct besoftc *)); -int be_tcvr_read_bit2 __P((struct besoftc *)); -int be_tcvr_read __P((struct besoftc *, u_int8_t)); -void be_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); -int be_ifmedia_upd __P((struct ifnet *)); -void be_mcreset __P((struct besoftc *)); +int bematch(struct device *, void *, void *); +void beattach(struct device *, struct device *, void *); + +void beinit(struct besoftc *); +void bestart(struct ifnet *); +void bestop(struct besoftc *); +void bewatchdog(struct ifnet *); +int beioctl(struct ifnet *, u_long, caddr_t); +void bereset(struct besoftc *); + +int beintr(void *); +int berint(struct besoftc *); +int betint(struct besoftc *); +int beqint(struct besoftc *, u_int32_t); +int beeint(struct besoftc *, u_int32_t); +void be_read(struct besoftc *, int, int); + +void be_tcvr_idle(struct besoftc *); +void be_tcvr_init(struct besoftc *); +void be_tcvr_write(struct besoftc *, u_int8_t, u_int16_t); +void be_tcvr_write_bit(struct besoftc *, int); +int be_tcvr_read_bit1(struct besoftc *); +int be_tcvr_read_bit2(struct besoftc *); +int be_tcvr_read(struct besoftc *, u_int8_t); +void be_ifmedia_sts(struct ifnet *, struct ifmediareq *); +int be_ifmedia_upd(struct ifnet *); +void be_mcreset(struct besoftc *); struct cfdriver be_cd = { NULL, "be", DV_IFNET @@ -130,7 +130,7 @@ beattach(parent, self, aux) struct ifnet *ifp = &sc->sc_arpcom.ac_if; struct confargs *ca = aux; struct bootpath *bp; - extern void myetheraddr __P((u_char *)); + extern void myetheraddr(u_char *); int pri, bmsr; if (ca->ca_ra.ra_nintr != 1) { diff --git a/sys/arch/sparc/dev/bpp.c b/sys/arch/sparc/dev/bpp.c index a1fdf28a56f..08ccb6bd98a 100644 --- a/sys/arch/sparc/dev/bpp.c +++ b/sys/arch/sparc/dev/bpp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bpp.c,v 1.2 2001/07/04 08:43:28 niklas Exp $ */ +/* $OpenBSD: bpp.c,v 1.3 2002/03/14 01:26:42 millert Exp $ */ /* * Copyright (c) 1997, Jason Downs. All rights reserved. @@ -62,8 +62,8 @@ struct bpp_softc { volatile struct bppregs *sc_regs; }; -static int bppmatch __P((struct device *, void *, void *)); -static void bppattach __P((struct device *, struct device *, void *)); +static int bppmatch(struct device *, void *, void *); +static void bppattach(struct device *, struct device *, void *); #define BPPUNIT(s) minor(s) @@ -75,11 +75,11 @@ struct cfdriver bpp_cd = { NULL, "bpp", DV_DULL }; -static __inline__ void bpp_outb __P((struct bpp_softc *, u_int8_t)); -static __inline__ u_int8_t bpp_inb __P((struct bpp_softc *)); -static void bppreset __P((struct bpp_softc *, int)); -static void bppresetmode __P((struct bpp_softc *)); -static int bpppushbytes __P((struct bpp_softc *)); +static __inline__ void bpp_outb(struct bpp_softc *, u_int8_t); +static __inline__ u_int8_t bpp_inb(struct bpp_softc *); +static void bppreset(struct bpp_softc *, int); +static void bppresetmode(struct bpp_softc *); +static int bpppushbytes(struct bpp_softc *); static int bppmatch(parent, vcf, aux) diff --git a/sys/arch/sparc/dev/btvar.h b/sys/arch/sparc/dev/btvar.h index e08df3b8b1c..f33e9907eba 100644 --- a/sys/arch/sparc/dev/btvar.h +++ b/sys/arch/sparc/dev/btvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: btvar.h,v 1.2 1997/08/08 08:24:41 downsj Exp $ */ +/* $OpenBSD: btvar.h,v 1.3 2002/03/14 01:26:42 millert Exp $ */ /* $NetBSD: btvar.h,v 1.2 1994/11/20 20:51:56 deraadt Exp $ */ /* @@ -62,8 +62,8 @@ union bt_cmap { /* * Routines in bt_subr.c. */ -int bt_getcmap __P((struct fbcmap *, union bt_cmap *, int)); -int bt_putcmap __P((struct fbcmap *, union bt_cmap *, int)); +int bt_getcmap(struct fbcmap *, union bt_cmap *, int); +int bt_putcmap(struct fbcmap *, union bt_cmap *, int); /* * Compute (x / 4) * 3 and (x / 4) * 4. These are used in turning diff --git a/sys/arch/sparc/dev/bwtwo.c b/sys/arch/sparc/dev/bwtwo.c index 714b223c67e..6934d87c980 100644 --- a/sys/arch/sparc/dev/bwtwo.c +++ b/sys/arch/sparc/dev/bwtwo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bwtwo.c,v 1.19 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: bwtwo.c,v 1.20 2002/03/14 01:26:42 millert Exp $ */ /* $NetBSD: bwtwo.c,v 1.33 1997/05/24 20:16:02 pk Exp $ */ /* @@ -103,11 +103,11 @@ struct bwtwo_softc { }; /* autoconfiguration driver */ -static void bwtwoattach __P((struct device *, struct device *, void *)); -static int bwtwomatch __P((struct device *, void *, void *)); -static void bwtwounblank __P((struct device *)); -static void bwtwo_set_video __P((struct bwtwo_softc *, int)); -static int bwtwo_get_video __P((struct bwtwo_softc *)); +static void bwtwoattach(struct device *, struct device *, void *); +static int bwtwomatch(struct device *, void *, void *); +static void bwtwounblank(struct device *); +static void bwtwo_set_video(struct bwtwo_softc *, int); +static int bwtwo_get_video(struct bwtwo_softc *); struct cfattach bwtwo_ca = { sizeof(struct bwtwo_softc), bwtwomatch, bwtwoattach diff --git a/sys/arch/sparc/dev/cgeight.c b/sys/arch/sparc/dev/cgeight.c index 8844b096c52..1ced12ab486 100644 --- a/sys/arch/sparc/dev/cgeight.c +++ b/sys/arch/sparc/dev/cgeight.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgeight.c,v 1.12 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: cgeight.c,v 1.13 2002/03/14 01:26:42 millert Exp $ */ /* $NetBSD: cgeight.c,v 1.13 1997/05/24 20:16:04 pk Exp $ */ /* @@ -92,7 +92,7 @@ struct cgeight_softc { static void cgeightattach(struct device *, struct device *, void *); static int cgeightmatch(struct device *, void *, void *); #if defined(SUN4) -static void cgeightunblank __P((struct device *)); +static void cgeightunblank(struct device *); #endif struct cfattach cgeight_ca = { @@ -112,9 +112,9 @@ static struct fbdriver cgeightfbdriver = { extern int fbnode; extern struct tty *fbconstty; -static void cgeightloadcmap __P((struct cgeight_softc *, int, int)); -static int cgeight_get_video __P((struct cgeight_softc *)); -static void cgeight_set_video __P((struct cgeight_softc *, int)); +static void cgeightloadcmap(struct cgeight_softc *, int, int); +static int cgeight_get_video(struct cgeight_softc *); +static void cgeight_set_video(struct cgeight_softc *, int); #endif /* diff --git a/sys/arch/sparc/dev/cgfour.c b/sys/arch/sparc/dev/cgfour.c index 1ccc6e452a6..af24d4e5b9a 100644 --- a/sys/arch/sparc/dev/cgfour.c +++ b/sys/arch/sparc/dev/cgfour.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgfour.c,v 1.12 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: cgfour.c,v 1.13 2002/03/14 01:26:42 millert Exp $ */ /* $NetBSD: cgfour.c,v 1.13 1997/05/24 20:16:06 pk Exp $ */ /* @@ -93,10 +93,10 @@ struct cgfour_softc { }; /* autoconfiguration driver */ -static void cgfourattach __P((struct device *, struct device *, void *)); -static int cgfourmatch __P((struct device *, void *, void *)); +static void cgfourattach(struct device *, struct device *, void *); +static int cgfourmatch(struct device *, void *, void *); #if defined(SUN4) -static void cgfourunblank __P((struct device *)); +static void cgfourunblank(struct device *); #endif struct cfattach cgfour_ca = { @@ -116,9 +116,9 @@ static struct fbdriver cgfourfbdriver = { extern int fbnode; extern struct tty *fbconstty; -static void cgfourloadcmap __P((struct cgfour_softc *, int, int)); -static int cgfour_get_video __P((struct cgfour_softc *)); -static void cgfour_set_video __P((struct cgfour_softc *, int)); +static void cgfourloadcmap(struct cgfour_softc *, int, int); +static int cgfour_get_video(struct cgfour_softc *); +static void cgfour_set_video(struct cgfour_softc *, int); #endif /* diff --git a/sys/arch/sparc/dev/cgfourteen.c b/sys/arch/sparc/dev/cgfourteen.c index 43d35fb7189..9c4c0719a4f 100644 --- a/sys/arch/sparc/dev/cgfourteen.c +++ b/sys/arch/sparc/dev/cgfourteen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgfourteen.c,v 1.8 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: cgfourteen.c,v 1.9 2002/03/14 01:26:42 millert Exp $ */ /* $NetBSD: cgfourteen.c,v 1.7 1997/05/24 20:16:08 pk Exp $ */ /* @@ -122,16 +122,16 @@ static struct fbdriver cgfourteenfbdriver = { extern int fbnode; extern struct tty *fbconstty; -static void cg14_set_video __P((struct cgfourteen_softc *, int)); -static int cg14_get_video __P((struct cgfourteen_softc *)); -static int cg14_get_cmap __P((struct fbcmap *, union cg14cmap *, int)); -static int cg14_put_cmap __P((struct fbcmap *, union cg14cmap *, int)); -static void cg14_load_hwcmap __P((struct cgfourteen_softc *, int, int)); -static void cg14_init __P((struct cgfourteen_softc *)); -static void cg14_reset __P((struct cgfourteen_softc *)); -static void cg14_loadomap __P((struct cgfourteen_softc *));/* cursor overlay */ -static void cg14_setcursor __P((struct cgfourteen_softc *));/* set position */ -static void cg14_loadcursor __P((struct cgfourteen_softc *));/* set shape */ +static void cg14_set_video(struct cgfourteen_softc *, int); +static int cg14_get_video(struct cgfourteen_softc *); +static int cg14_get_cmap(struct fbcmap *, union cg14cmap *, int); +static int cg14_put_cmap(struct fbcmap *, union cg14cmap *, int); +static void cg14_load_hwcmap(struct cgfourteen_softc *, int, int); +static void cg14_init(struct cgfourteen_softc *); +static void cg14_reset(struct cgfourteen_softc *); +static void cg14_loadomap(struct cgfourteen_softc *);/* cursor overlay */ +static void cg14_setcursor(struct cgfourteen_softc *);/* set position */ +static void cg14_loadcursor(struct cgfourteen_softc *);/* set shape */ /* * Match a cgfourteen. diff --git a/sys/arch/sparc/dev/cgsix.c b/sys/arch/sparc/dev/cgsix.c index 3f0fc8160b5..c63655b841d 100644 --- a/sys/arch/sparc/dev/cgsix.c +++ b/sys/arch/sparc/dev/cgsix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgsix.c,v 1.17 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: cgsix.c,v 1.18 2002/03/14 01:26:42 millert Exp $ */ /* $NetBSD: cgsix.c,v 1.33 1997/08/07 19:12:30 pk Exp $ */ /* @@ -122,9 +122,9 @@ struct cgsix_softc { }; /* autoconfiguration driver */ -static void cgsixattach __P((struct device *, struct device *, void *)); -static int cgsixmatch __P((struct device *, void *, void *)); -static void cg6_unblank __P((struct device *)); +static void cgsixattach(struct device *, struct device *, void *); +static int cgsixmatch(struct device *, void *, void *); +static void cg6_unblank(struct device *); struct cfattach cgsix_ca = { sizeof(struct cgsix_softc), cgsixmatch, cgsixattach @@ -153,11 +153,11 @@ int cgsix_use_rasterconsole = 1; extern int fbnode; -static void cg6_reset __P((struct cgsix_softc *)); -static void cg6_loadcmap __P((struct cgsix_softc *, int, int)); -static void cg6_loadomap __P((struct cgsix_softc *)); -static void cg6_setcursor __P((struct cgsix_softc *));/* set position */ -static void cg6_loadcursor __P((struct cgsix_softc *));/* set shape */ +static void cg6_reset(struct cgsix_softc *); +static void cg6_loadcmap(struct cgsix_softc *, int, int); +static void cg6_loadomap(struct cgsix_softc *); +static void cg6_setcursor(struct cgsix_softc *);/* set position */ +static void cg6_loadcursor(struct cgsix_softc *);/* set shape */ /* * Match a cgsix. diff --git a/sys/arch/sparc/dev/cgthree.c b/sys/arch/sparc/dev/cgthree.c index 8bdb669de4f..4b79c751e16 100644 --- a/sys/arch/sparc/dev/cgthree.c +++ b/sys/arch/sparc/dev/cgthree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgthree.c,v 1.12 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: cgthree.c,v 1.13 2002/03/14 01:26:42 millert Exp $ */ /* $NetBSD: cgthree.c,v 1.33 1997/05/24 20:16:11 pk Exp $ */ /* @@ -110,9 +110,9 @@ static struct fbdriver cgthreefbdriver = { extern int fbnode; extern struct tty *fbconstty; -static void cgthreeloadcmap __P((struct cgthree_softc *, int, int)); -static void cgthree_set_video __P((struct cgthree_softc *, int)); -static int cgthree_get_video __P((struct cgthree_softc *)); +static void cgthreeloadcmap(struct cgthree_softc *, int, int); +static void cgthree_set_video(struct cgthree_softc *, int); +static int cgthree_get_video(struct cgthree_softc *); /* Video control parameters */ struct cg3_videoctrl { diff --git a/sys/arch/sparc/dev/cgtwo.c b/sys/arch/sparc/dev/cgtwo.c index bbdbdc8ba49..4653190d18d 100644 --- a/sys/arch/sparc/dev/cgtwo.c +++ b/sys/arch/sparc/dev/cgtwo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgtwo.c,v 1.18 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: cgtwo.c,v 1.19 2002/03/14 01:26:42 millert Exp $ */ /* $NetBSD: cgtwo.c,v 1.22 1997/05/24 20:16:12 pk Exp $ */ /* @@ -90,11 +90,11 @@ struct cgtwo_softc { }; /* autoconfiguration driver */ -static void cgtwoattach __P((struct device *, struct device *, void *)); -static int cgtwomatch __P((struct device *, void *, void *)); -static void cgtwounblank __P((struct device *)); -int cgtwogetcmap __P((struct cgtwo_softc *, struct fbcmap *)); -int cgtwoputcmap __P((struct cgtwo_softc *, struct fbcmap *)); +static void cgtwoattach(struct device *, struct device *, void *); +static int cgtwomatch(struct device *, void *, void *); +static void cgtwounblank(struct device *); +int cgtwogetcmap(struct cgtwo_softc *, struct fbcmap *); +int cgtwoputcmap(struct cgtwo_softc *, struct fbcmap *); struct cfattach cgtwo_ca = { sizeof(struct cgtwo_softc), cgtwomatch, cgtwoattach diff --git a/sys/arch/sparc/dev/cons.c b/sys/arch/sparc/dev/cons.c index b9d0fcaaaf9..c74a4512ff8 100644 --- a/sys/arch/sparc/dev/cons.c +++ b/sys/arch/sparc/dev/cons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cons.c,v 1.12 2001/05/01 11:43:26 ho Exp $ */ +/* $OpenBSD: cons.c,v 1.13 2002/03/14 01:26:42 millert Exp $ */ /* $NetBSD: cons.c,v 1.30 1997/07/07 23:30:23 pk Exp $ */ /* @@ -90,15 +90,15 @@ int cons_ocount; /* output byte count */ */ struct tty cons; /* rom console tty device */ struct timeout cons_cnfbdma_tmo;/* for cnfdbma() timeouts */ -static int (*fcnstop) __P((struct tty *, int)); +static int (*fcnstop)(struct tty *, int); -static void cnstart __P((struct tty *)); -int cnstop __P((struct tty *, int)); +static void cnstart(struct tty *); +int cnstop(struct tty *, int); -static void cnfbstart __P((struct tty *)); -static int cnfbstop __P((struct tty *, int)); -static void cnfbdma __P((void *)); -static struct tty *xxcntty __P((dev_t)); +static void cnfbstart(struct tty *); +static int cnfbstop(struct tty *, int); +static void cnfbdma(void *); +static struct tty *xxcntty(dev_t); extern char char_type[]; @@ -464,8 +464,8 @@ cnstart(tp) { register int c, s; register union { - void (*v1)__P((int)); - int (*v3)__P((int, void *, int)); + void (*v1)(int); + int (*v3)(int, void *, int); } putc; register int fd = 0, v; diff --git a/sys/arch/sparc/dev/cs4231.c b/sys/arch/sparc/dev/cs4231.c index abb3de3c882..a632f2af0b3 100644 --- a/sys/arch/sparc/dev/cs4231.c +++ b/sys/arch/sparc/dev/cs4231.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4231.c,v 1.11 2002/01/20 23:21:54 ericj Exp $ */ +/* $OpenBSD: cs4231.c,v 1.12 2002/03/14 01:26:42 millert Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -112,37 +112,37 @@ #define CS_TIMEOUT 90000 /* recalibration timeout */ -int cs4231_match __P((struct device *, void *, void *)); -void cs4231_attach __P((struct device *, struct device *, void *)); -int cs4231_intr __P((void *)); +int cs4231_match(struct device *, void *, void *); +void cs4231_attach(struct device *, struct device *, void *); +int cs4231_intr(void *); -void cs4231_wait __P((struct cs4231_softc *)); -int cs4231_set_speed __P((struct cs4231_softc *, u_long *)); -void cs4231_mute_monitor __P((struct cs4231_softc *, int)); -void cs4231_setup_output __P((struct cs4231_softc *sc)); +void cs4231_wait(struct cs4231_softc *); +int cs4231_set_speed(struct cs4231_softc *, u_long *); +void cs4231_mute_monitor(struct cs4231_softc *, int); +void cs4231_setup_output(struct cs4231_softc *sc); /* Audio interface */ -int cs4231_open __P((void *, int)); -void cs4231_close __P((void *)); -int cs4231_query_encoding __P((void *, struct audio_encoding *)); -int cs4231_set_params __P((void *, int, int, struct audio_params *, - struct audio_params *)); -int cs4231_round_blocksize __P((void *, int)); -int cs4231_commit_settings __P((void *)); -int cs4231_halt_output __P((void *)); -int cs4231_halt_input __P((void *)); -int cs4231_getdev __P((void *, struct audio_device *)); -int cs4231_set_port __P((void *, mixer_ctrl_t *)); -int cs4231_get_port __P((void *, mixer_ctrl_t *)); -int cs4231_query_devinfo __P((void *addr, mixer_devinfo_t *)); -void * cs4231_alloc __P((void *, int, size_t, int, int)); -void cs4231_free __P((void *, void *, int)); -size_t cs4231_round_buffersize __P((void *, int, size_t)); -int cs4231_get_props __P((void *)); +int cs4231_open(void *, int); +void cs4231_close(void *); +int cs4231_query_encoding(void *, struct audio_encoding *); +int cs4231_set_params(void *, int, int, struct audio_params *, + struct audio_params *); +int cs4231_round_blocksize(void *, int); +int cs4231_commit_settings(void *); +int cs4231_halt_output(void *); +int cs4231_halt_input(void *); +int cs4231_getdev(void *, struct audio_device *); +int cs4231_set_port(void *, mixer_ctrl_t *); +int cs4231_get_port(void *, mixer_ctrl_t *); +int cs4231_query_devinfo(void *addr, mixer_devinfo_t *); +void * cs4231_alloc(void *, int, size_t, int, int); +void cs4231_free(void *, void *, int); +size_t cs4231_round_buffersize(void *, int, size_t); +int cs4231_get_props(void *); int cs4231_trigger_output __P((void *, void *, void *, int, - void (*intr)__P((void *)), void *arg, struct audio_params *)); + void (*intr)(void *), void *arg, struct audio_params *)); int cs4231_trigger_input __P((void *, void *, void *, int, - void (*intr)__P((void *)), void *arg, struct audio_params *)); + void (*intr)(void *), void *arg, struct audio_params *)); struct audio_hw_if cs4231_sa_hw_if = { cs4231_open, @@ -648,8 +648,8 @@ cs4231_set_params(addr, setmode, usemode, p, r) { struct cs4231_softc *sc = (struct cs4231_softc *)addr; int err, bits, enc; - void (*pswcode) __P((void *, u_char *, int cnt)); - void (*rswcode) __P((void *, u_char *, int cnt)); + void (*pswcode)(void *, u_char *, int cnt); + void (*rswcode)(void *, u_char *, int cnt); enc = p->encoding; pswcode = rswcode = 0; @@ -1437,7 +1437,7 @@ int cs4231_trigger_output(addr, start, end, blksize, intr, arg, param) void *addr, *start, *end; int blksize; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; struct audio_params *param; { @@ -1504,7 +1504,7 @@ int cs4231_trigger_input(addr, start, end, blksize, intr, arg, param) void *addr, *start, *end; int blksize; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; struct audio_params *param; { diff --git a/sys/arch/sparc/dev/daadio.c b/sys/arch/sparc/dev/daadio.c index 6ff4ba3757e..7d125a97e59 100644 --- a/sys/arch/sparc/dev/daadio.c +++ b/sys/arch/sparc/dev/daadio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: daadio.c,v 1.1 1999/07/23 19:11:24 jason Exp $ */ +/* $OpenBSD: daadio.c,v 1.2 2002/03/14 01:26:42 millert Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -59,9 +59,9 @@ #include <sparc/dev/fgavar.h> #include <sparc/dev/daadioreg.h> -int daadiomatch __P((struct device *, void *, void *)); -void daadioattach __P((struct device *, struct device *, void *)); -int daadiointr __P((void *)); +int daadiomatch(struct device *, void *, void *); +void daadioattach(struct device *, struct device *, void *); +int daadiointr(void *); struct daadio_softc { struct device sc_dv; /* base device */ @@ -78,8 +78,8 @@ struct cfdriver daadio_cd = { NULL, "daadio", DV_DULL }; -void daadio_ier_setbit __P((struct daadio_softc *, u_int8_t)); -void daadio_ier_clearbit __P((struct daadio_softc *, u_int8_t)); +void daadio_ier_setbit(struct daadio_softc *, u_int8_t); +void daadio_ier_clearbit(struct daadio_softc *, u_int8_t); int daadiomatch(parent, vcf, aux) diff --git a/sys/arch/sparc/dev/dma.c b/sys/arch/sparc/dev/dma.c index 937429112ae..c9326f358bd 100644 --- a/sys/arch/sparc/dev/dma.c +++ b/sys/arch/sparc/dev/dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dma.c,v 1.16 1999/09/10 23:32:02 art Exp $ */ +/* $OpenBSD: dma.c,v 1.17 2002/03/14 01:26:42 millert Exp $ */ /* $NetBSD: dma.c,v 1.46 1997/08/27 11:24:16 bouyer Exp $ */ /* @@ -59,20 +59,20 @@ #include <sparc/dev/dmavar.h> #include <sparc/dev/espvar.h> -int dmaprint __P((void *, const char *)); -void dmaattach __P((struct device *, struct device *, void *)); -int dmamatch __P((struct device *, void *, void *)); -void dma_reset __P((struct dma_softc *, int)); -void espdma_reset __P((struct dma_softc *)); -int ledmamatch __P((struct device *, void *, void *)); -void ledma_reset __P((struct dma_softc *)); -void dma_enintr __P((struct dma_softc *)); -int dma_isintr __P((struct dma_softc *)); -int espdmaintr __P((struct dma_softc *)); -int ledmaintr __P((struct dma_softc *)); -int dma_setup __P((struct dma_softc *, caddr_t *, size_t *, - int, size_t *)); -void dma_go __P((struct dma_softc *)); +int dmaprint(void *, const char *); +void dmaattach(struct device *, struct device *, void *); +int dmamatch(struct device *, void *, void *); +void dma_reset(struct dma_softc *, int); +void espdma_reset(struct dma_softc *); +int ledmamatch(struct device *, void *, void *); +void ledma_reset(struct dma_softc *); +void dma_enintr(struct dma_softc *); +int dma_isintr(struct dma_softc *); +int espdmaintr(struct dma_softc *); +int ledmaintr(struct dma_softc *); +int dma_setup(struct dma_softc *, caddr_t *, size_t *, + int, size_t *); +void dma_go(struct dma_softc *); struct cfattach dma_ca = { sizeof(struct dma_softc), dmamatch, dmaattach diff --git a/sys/arch/sparc/dev/esp.c b/sys/arch/sparc/dev/esp.c index bfe094a03f4..feacd96c0a2 100644 --- a/sys/arch/sparc/dev/esp.c +++ b/sys/arch/sparc/dev/esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esp.c,v 1.17 2001/09/27 04:01:42 jason Exp $ */ +/* $OpenBSD: esp.c,v 1.18 2002/03/14 01:26:42 millert Exp $ */ /* $NetBSD: esp.c,v 1.69 1997/08/27 11:24:18 bouyer Exp $ */ /* @@ -128,8 +128,8 @@ #include <sparc/dev/dmavar.h> #include <sparc/dev/espvar.h> -void espattach __P((struct device *, struct device *, void *)); -int espmatch __P((struct device *, void *, void *)); +void espattach(struct device *, struct device *, void *); +int espmatch(struct device *, void *, void *); /* Linkup to the rest of the kernel */ struct cfattach esp_ca = { @@ -153,16 +153,16 @@ struct scsi_device esp_dev = { /* * Functions and the switch for the MI code. */ -u_char esp_read_reg __P((struct ncr53c9x_softc *, int)); -void esp_write_reg __P((struct ncr53c9x_softc *, int, u_char)); -int esp_dma_isintr __P((struct ncr53c9x_softc *)); -void esp_dma_reset __P((struct ncr53c9x_softc *)); -int esp_dma_intr __P((struct ncr53c9x_softc *)); -int esp_dma_setup __P((struct ncr53c9x_softc *, caddr_t *, - size_t *, int, size_t *)); -void esp_dma_go __P((struct ncr53c9x_softc *)); -void esp_dma_stop __P((struct ncr53c9x_softc *)); -int esp_dma_isactive __P((struct ncr53c9x_softc *)); +u_char esp_read_reg(struct ncr53c9x_softc *, int); +void esp_write_reg(struct ncr53c9x_softc *, int, u_char); +int esp_dma_isintr(struct ncr53c9x_softc *); +void esp_dma_reset(struct ncr53c9x_softc *); +int esp_dma_intr(struct ncr53c9x_softc *); +int esp_dma_setup(struct ncr53c9x_softc *, caddr_t *, + size_t *, int, size_t *); +void esp_dma_go(struct ncr53c9x_softc *); +void esp_dma_stop(struct ncr53c9x_softc *); +int esp_dma_isactive(struct ncr53c9x_softc *); struct ncr53c9x_glue esp_glue = { esp_read_reg, diff --git a/sys/arch/sparc/dev/fb.c b/sys/arch/sparc/dev/fb.c index c7e126ce752..77e588883bc 100644 --- a/sys/arch/sparc/dev/fb.c +++ b/sys/arch/sparc/dev/fb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fb.c,v 1.17 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: fb.c,v 1.18 2002/03/14 01:26:42 millert Exp $ */ /* $NetBSD: fb.c,v 1.23 1997/07/07 23:30:22 pk Exp $ */ /* @@ -187,7 +187,7 @@ fbmmap(dev, off, prot) off_t off; int prot; { - paddr_t (*map)__P((dev_t, off_t, int)) = devfb->fb_driver->fbd_mmap; + paddr_t (*map)(dev_t, off_t, int) = devfb->fb_driver->fbd_mmap; if (map == NULL) return (-1); @@ -361,10 +361,10 @@ fb_setsize(fb, depth, def_width, def_height, node, bustype) #ifdef RASTERCONSOLE #include <machine/kbd.h> -static void fb_bell __P((int)); +static void fb_bell(int); #if !(defined(RASTERCONS_FULLSCREEN) || defined(RASTERCONS_SMALLFONT)) -static int a2int __P((char *, int)); +static int a2int(char *, int); static int a2int(cp, deflt) diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c index 5cea4853fff..29af5b3073b 100644 --- a/sys/arch/sparc/dev/fd.c +++ b/sys/arch/sparc/dev/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.25 2002/03/13 00:24:21 miod Exp $ */ +/* $OpenBSD: fd.c,v 1.26 2002/03/14 01:26:42 millert Exp $ */ /* $NetBSD: fd.c,v 1.51 1997/05/24 20:16:19 pk Exp $ */ /*- @@ -149,8 +149,8 @@ extern struct fdcio *fdciop; #endif /* controller driver configuration */ -int fdcmatch __P((struct device *, void *, void *)); -void fdcattach __P((struct device *, struct device *, void *)); +int fdcmatch(struct device *, void *, void *); +void fdcattach(struct device *, struct device *, void *); struct cfattach fdc_ca = { sizeof(struct fdc_softc), fdcmatch, fdcattach @@ -160,7 +160,7 @@ struct cfdriver fdc_cd = { NULL, "fdc", DV_DULL }; -__inline struct fd_type *fd_dev_to_type __P((struct fd_softc *, dev_t)); +__inline struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t); /* The order of entries in the following table is important -- BEWARE! */ struct fd_type fd_types[] = { @@ -206,8 +206,8 @@ struct fd_softc { }; /* floppy driver configuration */ -int fdmatch __P((struct device *, void *, void *)); -void fdattach __P((struct device *, struct device *, void *)); +int fdmatch(struct device *, void *, void *); +void fdattach(struct device *, struct device *, void *); struct cfattach fd_ca = { sizeof(struct fd_softc), fdmatch, fdattach @@ -217,38 +217,38 @@ struct cfdriver fd_cd = { NULL, "fd", DV_DISK }; -void fdgetdisklabel __P((dev_t)); -int fd_get_parms __P((struct fd_softc *)); -void fdstrategy __P((struct buf *)); -void fdstart __P((struct fd_softc *)); -int fdprint __P((void *, const char *)); +void fdgetdisklabel(dev_t); +int fd_get_parms(struct fd_softc *); +void fdstrategy(struct buf *); +void fdstart(struct fd_softc *); +int fdprint(void *, const char *); struct dkdriver fddkdriver = { fdstrategy }; -struct fd_type *fd_nvtotype __P((char *, int, int)); -void fd_set_motor __P((struct fdc_softc *fdc)); -void fd_motor_off __P((void *arg)); -void fd_motor_on __P((void *arg)); -int fdcresult __P((struct fdc_softc *fdc)); -int out_fdc __P((struct fdc_softc *fdc, u_char x)); -void fdcstart __P((struct fdc_softc *fdc)); -void fdcstatus __P((struct device *dv, int n, char *s)); -void fdc_reset __P((struct fdc_softc *fdc)); -void fdctimeout __P((void *arg)); -void fdcpseudointr __P((void *arg)); +struct fd_type *fd_nvtotype(char *, int, int); +void fd_set_motor(struct fdc_softc *fdc); +void fd_motor_off(void *arg); +void fd_motor_on(void *arg); +int fdcresult(struct fdc_softc *fdc); +int out_fdc(struct fdc_softc *fdc, u_char x); +void fdcstart(struct fdc_softc *fdc); +void fdcstatus(struct device *dv, int n, char *s); +void fdc_reset(struct fdc_softc *fdc); +void fdctimeout(void *arg); +void fdcpseudointr(void *arg); #ifdef FDC_C_HANDLER -int fdchwintr __P((struct fdc_softc *)); +int fdchwintr(struct fdc_softc *); #else -void fdchwintr __P((void)); +void fdchwintr(void); #endif -int fdcswintr __P((struct fdc_softc *)); -int fdcstate __P((struct fdc_softc *)); -void fdcretry __P((struct fdc_softc *fdc)); -void fdfinish __P((struct fd_softc *fd, struct buf *bp)); -int fdformat __P((dev_t, struct fd_formb *, struct proc *)); -void fd_do_eject __P((struct fd_softc *)); -void fd_mountroot_hook __P((struct device *)); -static void fdconf __P((struct fdc_softc *)); +int fdcswintr(struct fdc_softc *); +int fdcstate(struct fdc_softc *); +void fdcretry(struct fdc_softc *fdc); +void fdfinish(struct fd_softc *fd, struct buf *bp); +int fdformat(dev_t, struct fd_formb *, struct proc *); +void fd_do_eject(struct fd_softc *); +void fd_mountroot_hook(struct device *); +static void fdconf(struct fdc_softc *); #if PIL_FDSOFT == 4 #define IE_FDSOFT IE_L4 diff --git a/sys/arch/sparc/dev/fga.c b/sys/arch/sparc/dev/fga.c index 2234c63b868..b3c61f22a12 100644 --- a/sys/arch/sparc/dev/fga.c +++ b/sys/arch/sparc/dev/fga.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fga.c,v 1.6 2001/12/08 02:24:07 art Exp $ */ +/* $OpenBSD: fga.c,v 1.7 2002/03/14 01:26:42 millert Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -61,13 +61,13 @@ #include <sparc/dev/fgavar.h> #include <machine/fgaio.h> -int fgamatch __P((struct device *, void *, void *)); -void fgaattach __P((struct device *, struct device *, void *)); -int fvmematch __P((struct device *, void *, void *)); -void fvmeattach __P((struct device *, struct device *, void *)); -int fgaprint __P((void *, const char *)); -int fvmeprint __P((void *, const char *)); -int fvmescan __P((struct device *parent, void *, void *)); +int fgamatch(struct device *, void *, void *); +void fgaattach(struct device *, struct device *, void *); +int fvmematch(struct device *, void *, void *); +void fvmeattach(struct device *, struct device *, void *); +int fgaprint(void *, const char *); +int fvmeprint(void *, const char *); +int fvmescan(struct device *parent, void *, void *); struct fga_softc { struct device sc_dev; /* base device */ @@ -89,24 +89,24 @@ struct fga_softc { u_int8_t sc_established; /* which hw intrs installed */ }; -int fgaopen __P((dev_t, int, int, struct proc *)); -int fgaclose __P((dev_t, int, int, struct proc *)); -int fgaioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); - -int fga_vmerangemap __P((struct fga_softc *, u_int32_t, u_int32_t, - int, int, u_int32_t, struct confargs *)); -int fga_intr_establish __P((struct fga_softc *, int, int, - struct intrhand *)); -int fga_hwintr_establish __P((struct fga_softc *, u_int8_t)); - -int fga_hwintr1 __P((void *)); -int fga_hwintr2 __P((void *)); -int fga_hwintr3 __P((void *)); -int fga_hwintr4 __P((void *)); -int fga_hwintr5 __P((void *)); -int fga_hwintr6 __P((void *)); -int fga_hwintr7 __P((void *)); -int fga_intrvec __P((struct fga_softc *, int)); +int fgaopen(dev_t, int, int, struct proc *); +int fgaclose(dev_t, int, int, struct proc *); +int fgaioctl(dev_t, u_long, caddr_t, int, struct proc *); + +int fga_vmerangemap(struct fga_softc *, u_int32_t, u_int32_t, + int, int, u_int32_t, struct confargs *); +int fga_intr_establish(struct fga_softc *, int, int, + struct intrhand *); +int fga_hwintr_establish(struct fga_softc *, u_int8_t); + +int fga_hwintr1(void *); +int fga_hwintr2(void *); +int fga_hwintr3(void *); +int fga_hwintr4(void *); +int fga_hwintr5(void *); +int fga_hwintr6(void *); +int fga_hwintr7(void *); +int fga_intrvec(struct fga_softc *, int); struct cfattach fga_ca = { sizeof (struct fga_softc), fgamatch, fgaattach diff --git a/sys/arch/sparc/dev/fgavar.h b/sys/arch/sparc/dev/fgavar.h index 7edecd8ae3d..7b2091897d3 100644 --- a/sys/arch/sparc/dev/fgavar.h +++ b/sys/arch/sparc/dev/fgavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fgavar.h,v 1.1 1999/07/23 19:11:25 jason Exp $ */ +/* $OpenBSD: fgavar.h,v 1.2 2002/03/14 01:26:43 millert Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -35,4 +35,4 @@ * POSSIBILITY OF SUCH DAMAGE. */ -int fvmeintrestablish __P((struct device *, int, int, struct intrhand *)); +int fvmeintrestablish(struct device *, int, int, struct intrhand *); diff --git a/sys/arch/sparc/dev/flash.c b/sys/arch/sparc/dev/flash.c index e7b68f459a0..caa9592bb4e 100644 --- a/sys/arch/sparc/dev/flash.c +++ b/sys/arch/sparc/dev/flash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: flash.c,v 1.1 1999/07/23 19:11:26 jason Exp $ */ +/* $OpenBSD: flash.c,v 1.2 2002/03/14 01:26:43 millert Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -48,15 +48,15 @@ #include <sparc/cpu.h> #include <sparc/sparc/cpuvar.h> -int flashmatch __P((struct device *, void *, void *)); -void flashattach __P((struct device *, struct device *, void *)); +int flashmatch(struct device *, void *, void *); +void flashattach(struct device *, struct device *, void *); -int flashopen __P((dev_t, int, int, struct proc *p)); -int flashclose __P((dev_t, int, int, struct proc *p)); -int flashread __P((dev_t, struct uio *, int)); -int flashwrite __P((dev_t, struct uio *, int)); -int flashrw __P((dev_t, struct uio *, int)); -int flashioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); +int flashopen(dev_t, int, int, struct proc *p); +int flashclose(dev_t, int, int, struct proc *p); +int flashread(dev_t, struct uio *, int); +int flashwrite(dev_t, struct uio *, int); +int flashrw(dev_t, struct uio *, int); +int flashioctl(dev_t, u_long, caddr_t, int, struct proc *); /* * We see the flash-memory in 512k windows. The current window is diff --git a/sys/arch/sparc/dev/hme.c b/sys/arch/sparc/dev/hme.c index f8e9d1e615b..7542fe5db19 100644 --- a/sys/arch/sparc/dev/hme.c +++ b/sys/arch/sparc/dev/hme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hme.c,v 1.34 2001/08/24 05:14:05 jason Exp $ */ +/* $OpenBSD: hme.c,v 1.35 2002/03/14 01:26:43 millert Exp $ */ /* * Copyright (c) 1998 Jason L. Wright (jason@thought.net) @@ -82,47 +82,47 @@ #include <sparc/dev/hmereg.h> #include <sparc/dev/hmevar.h> -int hmematch __P((struct device *, void *, void *)); -void hmeattach __P((struct device *, struct device *, void *)); -void hmewatchdog __P((struct ifnet *)); -int hmeintr __P((void *)); -int hmeioctl __P((struct ifnet *, u_long, caddr_t)); -void hmereset __P((struct hme_softc *)); -void hmestart __P((struct ifnet *)); -void hmestop __P((struct hme_softc *)); -void hmeinit __P((struct hme_softc *)); -void hme_meminit __P((struct hme_softc *)); +int hmematch(struct device *, void *, void *); +void hmeattach(struct device *, struct device *, void *); +void hmewatchdog(struct ifnet *); +int hmeintr(void *); +int hmeioctl(struct ifnet *, u_long, caddr_t); +void hmereset(struct hme_softc *); +void hmestart(struct ifnet *); +void hmestop(struct hme_softc *); +void hmeinit(struct hme_softc *); +void hme_meminit(struct hme_softc *); -void hme_tcvr_bb_writeb __P((struct hme_softc *, int)); -int hme_tcvr_bb_readb __P((struct hme_softc *, int)); +void hme_tcvr_bb_writeb(struct hme_softc *, int); +int hme_tcvr_bb_readb(struct hme_softc *, int); -void hme_poll_stop __P((struct hme_softc *sc)); +void hme_poll_stop(struct hme_softc *sc); -int hme_rint __P((struct hme_softc *)); -int hme_tint __P((struct hme_softc *)); -int hme_mint __P((struct hme_softc *, u_int32_t)); -int hme_eint __P((struct hme_softc *, u_int32_t)); +int hme_rint(struct hme_softc *); +int hme_tint(struct hme_softc *); +int hme_mint(struct hme_softc *, u_int32_t); +int hme_eint(struct hme_softc *, u_int32_t); -void hme_reset_rx __P((struct hme_softc *)); -void hme_reset_tx __P((struct hme_softc *)); +void hme_reset_rx(struct hme_softc *); +void hme_reset_tx(struct hme_softc *); -void hme_read __P((struct hme_softc *, int, int)); -int hme_put __P((struct hme_softc *, int, struct mbuf *)); +void hme_read(struct hme_softc *, int, int); +int hme_put(struct hme_softc *, int, struct mbuf *); /* * ifmedia glue */ -int hme_mediachange __P((struct ifnet *)); -void hme_mediastatus __P((struct ifnet *, struct ifmediareq *)); +int hme_mediachange(struct ifnet *); +void hme_mediastatus(struct ifnet *, struct ifmediareq *); /* * mii glue */ -int hme_mii_read __P((struct device *, int, int)); -void hme_mii_write __P((struct device *, int, int, int)); -void hme_mii_statchg __P((struct device *)); +int hme_mii_read(struct device *, int, int); +void hme_mii_write(struct device *, int, int, int); +void hme_mii_statchg(struct device *); -void hme_mcreset __P((struct hme_softc *)); +void hme_mcreset(struct hme_softc *); struct cfattach hme_ca = { sizeof (struct hme_softc), hmematch, hmeattach @@ -162,7 +162,7 @@ hmeattach(parent, self, aux) int pri; struct bootpath *bp; /* XXX the following declaration should be elsewhere */ - extern void myetheraddr __P((u_char *)); + extern void myetheraddr(u_char *); if (ca->ca_ra.ra_nintr != 1) { printf(": expected 1 interrupt, got %d\n", diff --git a/sys/arch/sparc/dev/if_en_sbus.c b/sys/arch/sparc/dev/if_en_sbus.c index 499f80901fc..0c73a96b688 100644 --- a/sys/arch/sparc/dev/if_en_sbus.c +++ b/sys/arch/sparc/dev/if_en_sbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_en_sbus.c,v 1.3 1997/08/08 08:25:08 downsj Exp $ */ +/* $OpenBSD: if_en_sbus.c,v 1.4 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: if_en_sbus.c,v 1.4 1997/05/24 20:16:22 pk Exp $ */ /* @@ -84,8 +84,8 @@ struct en_sbus_softc { * prototypes */ -static int en_sbus_match __P((struct device *, void *, void *)); -static void en_sbus_attach __P((struct device *, struct device *, void *)); +static int en_sbus_match(struct device *, void *, void *); +static void en_sbus_attach(struct device *, struct device *, void *); /* * SBUS autoconfig attachments diff --git a/sys/arch/sparc/dev/if_ie.c b/sys/arch/sparc/dev/if_ie.c index 0374cd3bbb2..c6000e5adc6 100644 --- a/sys/arch/sparc/dev/if_ie.c +++ b/sys/arch/sparc/dev/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.22 2001/12/08 02:24:07 art Exp $ */ +/* $OpenBSD: if_ie.c,v 1.23 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: if_ie.c,v 1.33 1997/07/29 17:55:38 fair Exp $ */ /*- @@ -232,15 +232,15 @@ struct ie_softc { struct arpcom sc_arpcom;/* system arpcom structure */ - void (*reset_586) __P((struct ie_softc *)); + void (*reset_586)(struct ie_softc *); /* card dependent reset function */ - void (*chan_attn) __P((struct ie_softc *)); + void (*chan_attn)(struct ie_softc *); /* card dependent attn function */ - void (*run_586) __P((struct ie_softc *)); + void (*run_586)(struct ie_softc *); /* card depenent "go on-line" function */ - void (*memcopy) __P((const void *, void *, u_int)); + void (*memcopy)(const void *, void *, u_int); /* card dependent memory copy function */ - void (*memzero) __P((void *, u_int)); + void (*memzero)(void *, u_int); /* card dependent memory zero function */ @@ -292,55 +292,55 @@ struct ie_softc { #endif }; -static void ie_obreset __P((struct ie_softc *)); -static void ie_obattend __P((struct ie_softc *)); -static void ie_obrun __P((struct ie_softc *)); -static void ie_vmereset __P((struct ie_softc *)); -static void ie_vmeattend __P((struct ie_softc *)); -static void ie_vmerun __P((struct ie_softc *)); - -void iewatchdog __P((struct ifnet *)); -int ieintr __P((void *)); -int ieinit __P((struct ie_softc *)); -int ieioctl __P((struct ifnet *, u_long, caddr_t)); -void iestart __P((struct ifnet *)); -void iereset __P((struct ie_softc *)); -static void ie_readframe __P((struct ie_softc *, int)); -static void ie_drop_packet_buffer __P((struct ie_softc *)); -int ie_setupram __P((struct ie_softc *)); -static int command_and_wait __P((struct ie_softc *, int, - void volatile *, int)); -/*static*/ void ierint __P((struct ie_softc *)); -/*static*/ void ietint __P((struct ie_softc *)); -static int ieget __P((struct ie_softc *, struct mbuf **, - struct ether_header *, int *)); -static void setup_bufs __P((struct ie_softc *)); -static int mc_setup __P((struct ie_softc *, void *)); -static void mc_reset __P((struct ie_softc *)); -static __inline int ether_equal __P((u_char *, u_char *)); -static __inline void ie_ack __P((struct ie_softc *, u_int)); -static __inline void ie_setup_config __P((volatile struct ie_config_cmd *, - int, int)); -static __inline int check_eh __P((struct ie_softc *, struct ether_header *, - int *)); -static __inline int ie_buflen __P((struct ie_softc *, int)); -static __inline int ie_packet_len __P((struct ie_softc *)); -static __inline void iexmit __P((struct ie_softc *)); -static __inline caddr_t Align __P((caddr_t)); - -static void chan_attn_timeout __P((void *)); -static void run_tdr __P((struct ie_softc *, struct ie_tdr_cmd *)); -static void iestop __P((struct ie_softc *)); +static void ie_obreset(struct ie_softc *); +static void ie_obattend(struct ie_softc *); +static void ie_obrun(struct ie_softc *); +static void ie_vmereset(struct ie_softc *); +static void ie_vmeattend(struct ie_softc *); +static void ie_vmerun(struct ie_softc *); + +void iewatchdog(struct ifnet *); +int ieintr(void *); +int ieinit(struct ie_softc *); +int ieioctl(struct ifnet *, u_long, caddr_t); +void iestart(struct ifnet *); +void iereset(struct ie_softc *); +static void ie_readframe(struct ie_softc *, int); +static void ie_drop_packet_buffer(struct ie_softc *); +int ie_setupram(struct ie_softc *); +static int command_and_wait(struct ie_softc *, int, + void volatile *, int); +/*static*/ void ierint(struct ie_softc *); +/*static*/ void ietint(struct ie_softc *); +static int ieget(struct ie_softc *, struct mbuf **, + struct ether_header *, int *); +static void setup_bufs(struct ie_softc *); +static int mc_setup(struct ie_softc *, void *); +static void mc_reset(struct ie_softc *); +static __inline int ether_equal(u_char *, u_char *); +static __inline void ie_ack(struct ie_softc *, u_int); +static __inline void ie_setup_config(volatile struct ie_config_cmd *, + int, int); +static __inline int check_eh(struct ie_softc *, struct ether_header *, + int *); +static __inline int ie_buflen(struct ie_softc *, int); +static __inline int ie_packet_len(struct ie_softc *); +static __inline void iexmit(struct ie_softc *); +static __inline caddr_t Align(caddr_t); + +static void chan_attn_timeout(void *); +static void run_tdr(struct ie_softc *, struct ie_tdr_cmd *); +static void iestop(struct ie_softc *); #ifdef IEDEBUG -void print_rbd __P((volatile struct ie_recv_buf_desc *)); +void print_rbd(volatile struct ie_recv_buf_desc *); int in_ierint = 0; int in_ietint = 0; #endif -int iematch __P((struct device *, void *, void *)); -void ieattach __P((struct device *, struct device *, void *)); +int iematch(struct device *, void *, void *); +void ieattach(struct device *, struct device *, void *); struct cfattach ie_ca = { sizeof(struct ie_softc), iematch, ieattach diff --git a/sys/arch/sparc/dev/if_le.c b/sys/arch/sparc/dev/if_le.c index df6591847bb..4cdeffedcce 100644 --- a/sys/arch/sparc/dev/if_le.c +++ b/sys/arch/sparc/dev/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.18 2001/06/11 00:29:49 miod Exp $ */ +/* $OpenBSD: if_le.c,v 1.19 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: if_le.c,v 1.50 1997/09/09 20:54:48 pk Exp $ */ /*- @@ -79,26 +79,26 @@ #include <sparc/dev/if_lereg.h> #include <sparc/dev/if_levar.h> -int lematch __P((struct device *, void *, void *)); -void leattach __P((struct device *, struct device *, void *)); +int lematch(struct device *, void *, void *); +void leattach(struct device *, struct device *, void *); /* * ifmedia interfaces */ -int lemediachange __P((struct ifnet *)); -void lemediastatus __P((struct ifnet *, struct ifmediareq *)); +int lemediachange(struct ifnet *); +void lemediastatus(struct ifnet *, struct ifmediareq *); #if defined(SUN4M) /* * media change methods (only for sun4m) */ -void lesetutp __P((struct am7990_softc *)); -void lesetaui __P((struct am7990_softc *)); +void lesetutp(struct am7990_softc *); +void lesetaui(struct am7990_softc *); #endif /* SUN4M */ #if defined(SUN4M) /* XXX */ -int myleintr __P((void *)); -int ledmaintr __P((struct dma_softc *)); +int myleintr(void *); +int ledmaintr(struct dma_softc *); int myleintr(arg) @@ -127,11 +127,11 @@ struct cfattach le_ca = { sizeof(struct le_softc), lematch, leattach }; -hide void lewrcsr __P((struct am7990_softc *, u_int16_t, u_int16_t)); -hide u_int16_t lerdcsr __P((struct am7990_softc *, u_int16_t)); -hide void lehwreset __P((struct am7990_softc *)); -hide void lehwinit __P((struct am7990_softc *)); -hide void lenocarrier __P((struct am7990_softc *)); +hide void lewrcsr(struct am7990_softc *, u_int16_t, u_int16_t); +hide u_int16_t lerdcsr(struct am7990_softc *, u_int16_t); +hide void lehwreset(struct am7990_softc *); +hide void lehwinit(struct am7990_softc *); +hide void lenocarrier(struct am7990_softc *); hide void lewrcsr(sc, port, val) @@ -423,7 +423,7 @@ leattach(parent, self, aux) #endif /* XXX the following declarations should be elsewhere */ - extern void myetheraddr __P((u_char *)); + extern void myetheraddr(u_char *); if (ca->ca_ra.ra_nintr != 1) { printf(": expected 1 interrupt, got %d\n", ca->ca_ra.ra_nintr); diff --git a/sys/arch/sparc/dev/isp_sbus.c b/sys/arch/sparc/dev/isp_sbus.c index 99548e366e3..671308cdde4 100644 --- a/sys/arch/sparc/dev/isp_sbus.c +++ b/sys/arch/sparc/dev/isp_sbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isp_sbus.c,v 1.19 2001/12/14 00:20:54 mjacob Exp $ */ +/* $OpenBSD: isp_sbus.c,v 1.20 2002/03/14 01:26:43 millert Exp $ */ /* * SBus specific probe and attach routines for Qlogic ISP SCSI adapters. * @@ -98,8 +98,8 @@ struct isp_sbussoftc { }; -static int isp_match __P((struct device *, void *, void *)); -static void isp_sbus_attach __P((struct device *, struct device *, void *)); +static int isp_match(struct device *, void *, void *); +static void isp_sbus_attach(struct device *, struct device *, void *); struct cfattach isp_sbus_ca = { sizeof (struct isp_sbussoftc), isp_match, isp_sbus_attach }; diff --git a/sys/arch/sparc/dev/kbd.c b/sys/arch/sparc/dev/kbd.c index fe5ceb1ca20..ed9119878bd 100644 --- a/sys/arch/sparc/dev/kbd.c +++ b/sys/arch/sparc/dev/kbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kbd.c,v 1.15 2001/09/24 23:06:02 mickey Exp $ */ +/* $OpenBSD: kbd.c,v 1.16 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: kbd.c,v 1.28 1997/09/13 19:12:18 pk Exp $ */ /* @@ -377,8 +377,8 @@ struct kbd_state { struct kbd_softc { struct tty *k_cons; /* uplink for ASCII data to console */ struct tty *k_kbd; /* downlink for output to keyboard */ - void (*k_open) __P((struct tty *)); /* enable dataflow */ - void (*k_close) __P((struct tty *)); /* disable dataflow */ + void (*k_open)(struct tty *); /* enable dataflow */ + void (*k_close)(struct tty *); /* disable dataflow */ int k_evmode; /* set if we should produce events */ struct kbd_state k_state; /* ASCII decode state */ struct evvar k_events; /* event queue state */ @@ -388,12 +388,12 @@ struct kbd_softc { } kbd_softc; /* Prototypes */ -void kbd_reset __P((struct kbd_state *)); -static int kbd_translate __P((int, struct kbd_state *)); -void kbdattach __P((int)); -void kbd_repeat __P((void *arg)); -u_short kbd_cnv_entry __P((u_short)); -u_short kbd_cnv_out __P((u_short)); +void kbd_reset(struct kbd_state *); +static int kbd_translate(int, struct kbd_state *); +void kbdattach(int); +void kbd_repeat(void *arg); +u_short kbd_cnv_entry(u_short); +u_short kbd_cnv_out(u_short); /* set in kbdattach() */ int kbd_repeat_start; @@ -419,8 +419,8 @@ kbd_ascii(tp) void kbd_serial(tp, iopen, iclose) struct tty *tp; - void (*iopen) __P((struct tty *)); - void (*iclose) __P((struct tty *)); + void (*iopen)(struct tty *); + void (*iclose)(struct tty *); { register struct kbd_softc *k; register char *cp; diff --git a/sys/arch/sparc/dev/lebuffer.c b/sys/arch/sparc/dev/lebuffer.c index 9e99c092881..fbc3c8d6c32 100644 --- a/sys/arch/sparc/dev/lebuffer.c +++ b/sys/arch/sparc/dev/lebuffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lebuffer.c,v 1.4 1998/11/11 00:26:00 jason Exp $ */ +/* $OpenBSD: lebuffer.c,v 1.5 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: lebuffer.c,v 1.3 1997/05/24 20:16:28 pk Exp $ */ /* @@ -49,9 +49,9 @@ #include <sparc/dev/lebuffervar.h> #include <sparc/dev/dmareg.h>/*XXX*/ -int lebufprint __P((void *, const char *)); -int lebufmatch __P((struct device *, void *, void *)); -void lebufattach __P((struct device *, struct device *, void *)); +int lebufprint(void *, const char *); +int lebufmatch(struct device *, void *, void *); +void lebufattach(struct device *, struct device *, void *); struct cfattach lebuffer_ca = { sizeof(struct lebuf_softc), lebufmatch, lebufattach diff --git a/sys/arch/sparc/dev/led.c b/sys/arch/sparc/dev/led.c index 867c14aa543..6f080214f0b 100644 --- a/sys/arch/sparc/dev/led.c +++ b/sys/arch/sparc/dev/led.c @@ -1,4 +1,4 @@ -/* $OpenBSD: led.c,v 1.8 2001/06/11 21:33:42 miod Exp $ */ +/* $OpenBSD: led.c,v 1.9 2002/03/14 01:26:43 millert Exp $ */ /* * Copyright (c) 1998 Jason L. Wright (jason@thought.net) @@ -52,9 +52,9 @@ #include <sparc/sparc/cpuvar.h> #include <sparc/dev/led.h> -int ledmatch __P((struct device *, void *, void *)); -void ledattach __P((struct device *, struct device *, void *)); -void led_cycle __P((void *)); +int ledmatch(struct device *, void *, void *); +void ledattach(struct device *, struct device *, void *); +void led_cycle(void *); struct cfattach led_ca = { sizeof (struct led_softc), ledmatch, ledattach diff --git a/sys/arch/sparc/dev/led.h b/sys/arch/sparc/dev/led.h index 202d66cdbd6..29cfb4d52d1 100644 --- a/sys/arch/sparc/dev/led.h +++ b/sys/arch/sparc/dev/led.h @@ -1,4 +1,4 @@ -/* $OpenBSD: led.h,v 1.4 2001/01/30 03:55:10 jason Exp $ */ +/* $OpenBSD: led.h,v 1.5 2002/03/14 01:26:43 millert Exp $ */ /* * Copyright (c) 1998 Jason L. Wright (jason@thought.net) @@ -44,4 +44,4 @@ struct led_softc { }; extern struct led_softc *led_sc; -void led_cycle __P((void *)); +void led_cycle(void *); diff --git a/sys/arch/sparc/dev/magmareg.h b/sys/arch/sparc/dev/magmareg.h index a85598cfc6f..213f9f16551 100644 --- a/sys/arch/sparc/dev/magmareg.h +++ b/sys/arch/sparc/dev/magmareg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: magmareg.h,v 1.6 2002/01/30 20:45:34 nordin Exp $ */ +/* $OpenBSD: magmareg.h,v 1.7 2002/03/14 01:26:43 millert Exp $ */ /* magmareg.h * @@ -195,29 +195,29 @@ struct mbpp_softc { /* internal function prototypes */ -int cd1400_compute_baud __P((speed_t, int, int *, int *)); -__inline void cd1400_write_ccr __P((struct cd1400 *, u_char)); -__inline u_char cd1400_read_reg __P((struct cd1400 *, int)); -__inline void cd1400_write_reg __P((struct cd1400 *, int, u_char)); -void cd1400_enable_transmitter __P((struct cd1400 *, int)); - -int magma_match __P((struct device *, void *, void *)); -void magma_attach __P((struct device *, struct device *, void *)); -int magma_hard __P((void *)); -int magma_soft __P((void *)); - -int mtty_match __P((struct device *, void *, void *)); -void mtty_attach __P((struct device *, struct device *, void *)); -int mtty_modem_control __P((struct mtty_port *, int, int)); -int mtty_param __P((struct tty *, struct termios *)); -void mtty_start __P((struct tty *)); - -int mbpp_match __P((struct device *, void *, void *)); -void mbpp_attach __P((struct device *, struct device *, void *)); -int mbpp_rw __P((dev_t, struct uio *)); -void mbpp_timeout __P((void *)); -void mbpp_start __P((void *)); -int mbpp_send __P((struct mbpp_port *, caddr_t, int)); -int mbpp_recv __P((struct mbpp_port *, caddr_t, int)); -int mbpp_hztoms __P((int)); -int mbpp_mstohz __P((int)); +int cd1400_compute_baud(speed_t, int, int *, int *); +__inline void cd1400_write_ccr(struct cd1400 *, u_char); +__inline u_char cd1400_read_reg(struct cd1400 *, int); +__inline void cd1400_write_reg(struct cd1400 *, int, u_char); +void cd1400_enable_transmitter(struct cd1400 *, int); + +int magma_match(struct device *, void *, void *); +void magma_attach(struct device *, struct device *, void *); +int magma_hard(void *); +int magma_soft(void *); + +int mtty_match(struct device *, void *, void *); +void mtty_attach(struct device *, struct device *, void *); +int mtty_modem_control(struct mtty_port *, int, int); +int mtty_param(struct tty *, struct termios *); +void mtty_start(struct tty *); + +int mbpp_match(struct device *, void *, void *); +void mbpp_attach(struct device *, struct device *, void *); +int mbpp_rw(dev_t, struct uio *); +void mbpp_timeout(void *); +void mbpp_start(void *); +int mbpp_send(struct mbpp_port *, caddr_t, int); +int mbpp_recv(struct mbpp_port *, caddr_t, int); +int mbpp_hztoms(int); +int mbpp_mstohz(int); diff --git a/sys/arch/sparc/dev/ms.c b/sys/arch/sparc/dev/ms.c index d314a7e5adb..db8b58043bb 100644 --- a/sys/arch/sparc/dev/ms.c +++ b/sys/arch/sparc/dev/ms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ms.c,v 1.7 1999/09/05 16:27:58 jason Exp $ */ +/* $OpenBSD: ms.c,v 1.8 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: ms.c,v 1.10 1996/09/12 01:36:18 mrg Exp $ */ /* @@ -84,8 +84,8 @@ struct ms_softc { int ms_dx; /* delta-x */ int ms_dy; /* delta-y */ struct tty *ms_mouse; /* downlink for output to mouse */ - void (*ms_open) __P((struct tty *)); /* enable dataflow */ - void (*ms_close) __P((struct tty *));/* disable dataflow */ + void (*ms_open)(struct tty *); /* enable dataflow */ + void (*ms_close)(struct tty *);/* disable dataflow */ volatile int ms_ready; /* event queue is ready */ struct evvar ms_events; /* event queue state */ } ms_softc; @@ -98,8 +98,8 @@ struct ms_softc { void ms_serial(tp, iopen, iclose) struct tty *tp; - void (*iopen) __P((struct tty *)); - void (*iclose) __P((struct tty *)); + void (*iopen)(struct tty *); + void (*iclose)(struct tty *); { ms_softc.ms_mouse = tp; diff --git a/sys/arch/sparc/dev/obio.c b/sys/arch/sparc/dev/obio.c index 95d5f1d1abd..bd0f3a46bc5 100644 --- a/sys/arch/sparc/dev/obio.c +++ b/sys/arch/sparc/dev/obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: obio.c,v 1.11 2002/01/10 00:06:17 nordin Exp $ */ +/* $OpenBSD: obio.c,v 1.12 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: obio.c,v 1.37 1997/07/29 09:58:11 fair Exp $ */ /* @@ -74,20 +74,20 @@ struct bus_softc { /* autoconfiguration driver */ -static int busmatch __P((struct device *, void *, void *)); -static void obioattach __P((struct device *, struct device *, void *)); -static void vmesattach __P((struct device *, struct device *, void *)); -static void vmelattach __P((struct device *, struct device *, void *)); -static void vmeattach __P((struct device *, struct device *, void *)); - -int busprint __P((void *, const char *)); -int vmeprint __P((void *, const char *)); -static int busattach __P((struct device *, void *, void *, int)); -int obio_scan __P((struct device *, void *, void *)); -int vmes_scan __P((struct device *, void *, void *)); -int vmel_scan __P((struct device *, void *, void *)); -void vmebus_translate __P((struct device *, struct confargs *, int)); -int vmeintr __P((void *)); +static int busmatch(struct device *, void *, void *); +static void obioattach(struct device *, struct device *, void *); +static void vmesattach(struct device *, struct device *, void *); +static void vmelattach(struct device *, struct device *, void *); +static void vmeattach(struct device *, struct device *, void *); + +int busprint(void *, const char *); +int vmeprint(void *, const char *); +static int busattach(struct device *, void *, void *, int); +int obio_scan(struct device *, void *, void *); +int vmes_scan(struct device *, void *, void *); +int vmel_scan(struct device *, void *, void *); +void vmebus_translate(struct device *, struct confargs *, int); +int vmeintr(void *); struct cfattach obio_ca = { sizeof(struct bus_softc), busmatch, obioattach diff --git a/sys/arch/sparc/dev/p9100.c b/sys/arch/sparc/dev/p9100.c index 0e1bf109e7a..2c3e2c7edf9 100644 --- a/sys/arch/sparc/dev/p9100.c +++ b/sys/arch/sparc/dev/p9100.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p9100.c,v 1.6 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: p9100.c,v 1.7 2002/03/14 01:26:43 millert Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -99,9 +99,9 @@ struct fbdriver p9100fbdriver = { extern int fbnode; extern struct tty *fbconstty; -void p9100loadcmap __P((struct p9100_softc *, int, int)); -void p9100_set_video __P((struct p9100_softc *, int)); -int p9100_get_video __P((struct p9100_softc *)); +void p9100loadcmap(struct p9100_softc *, int, int); +void p9100_set_video(struct p9100_softc *, int); +int p9100_get_video(struct p9100_softc *); /* * System control and command registers diff --git a/sys/arch/sparc/dev/pfour.c b/sys/arch/sparc/dev/pfour.c index 50f53484c3e..0dfe5e3e7d3 100644 --- a/sys/arch/sparc/dev/pfour.c +++ b/sys/arch/sparc/dev/pfour.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfour.c,v 1.7 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: pfour.c,v 1.8 2002/03/14 01:26:43 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -56,8 +56,8 @@ struct pfour_softc { int nothing; }; -static int pfourmatch __P((struct device *, void *, void *)); -static void pfourattach __P((struct device *, struct device *, void *)); +static int pfourmatch(struct device *, void *, void *); +static void pfourattach(struct device *, struct device *, void *); struct cfdriver pfourcd = { NULL, "pfour", pfourmatch, pfourattach, DV_DULL, sizeof(struct pfour_softc) }; diff --git a/sys/arch/sparc/dev/power.c b/sys/arch/sparc/dev/power.c index 0d31d68c9d4..8e356a7f563 100644 --- a/sys/arch/sparc/dev/power.c +++ b/sys/arch/sparc/dev/power.c @@ -1,4 +1,4 @@ -/* $OpenBSD: power.c,v 1.5 1999/05/05 07:08:03 deraadt Exp $ */ +/* $OpenBSD: power.c,v 1.6 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: power.c,v 1.2 1996/05/16 15:56:56 abrown Exp $ */ /* @@ -50,8 +50,8 @@ #include <sparc/dev/power.h> -static int powermatch __P((struct device *, void *, void *)); -static void powerattach __P((struct device *, struct device *, void *)); +static int powermatch(struct device *, void *, void *); +static void powerattach(struct device *, struct device *, void *); struct cfattach power_ca = { sizeof(struct device), powermatch, powerattach diff --git a/sys/arch/sparc/dev/power.h b/sys/arch/sparc/dev/power.h index 4ed01e64b5b..48654220cde 100644 --- a/sys/arch/sparc/dev/power.h +++ b/sys/arch/sparc/dev/power.h @@ -1,4 +1,4 @@ -/* $OpenBSD: power.h,v 1.2 2000/03/03 00:54:55 todd Exp $ */ +/* $OpenBSD: power.h,v 1.3 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: power.h,v 1.2 1996/05/16 15:56:57 abrown Exp $ */ /* @@ -57,4 +57,4 @@ volatile u_char *power_reg; #endif -void powerdown __P((void)); /* power off function */ +void powerdown(void); /* power off function */ diff --git a/sys/arch/sparc/dev/qe.c b/sys/arch/sparc/dev/qe.c index aee12234387..d216a45a88a 100644 --- a/sys/arch/sparc/dev/qe.c +++ b/sys/arch/sparc/dev/qe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qe.c,v 1.20 2002/02/08 19:02:41 jason Exp $ */ +/* $OpenBSD: qe.c,v 1.21 2002/03/14 01:26:43 millert Exp $ */ /* * Copyright (c) 1998, 2000 Jason L. Wright. @@ -79,24 +79,24 @@ #include <sparc/dev/qereg.h> #include <sparc/dev/qevar.h> -int qematch __P((struct device *, void *, void *)); -void qeattach __P((struct device *, struct device *, void *)); - -void qeinit __P((struct qesoftc *)); -void qestart __P((struct ifnet *)); -void qestop __P((struct qesoftc *)); -void qewatchdog __P((struct ifnet *)); -int qeioctl __P((struct ifnet *, u_long, caddr_t)); -void qereset __P((struct qesoftc *)); - -int qeintr __P((void *)); -int qe_eint __P((struct qesoftc *, u_int32_t)); -int qe_rint __P((struct qesoftc *)); -int qe_tint __P((struct qesoftc *)); -void qe_read __P((struct qesoftc *, int, int)); -void qe_mcreset __P((struct qesoftc *)); -void qe_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); -int qe_ifmedia_upd __P((struct ifnet *)); +int qematch(struct device *, void *, void *); +void qeattach(struct device *, struct device *, void *); + +void qeinit(struct qesoftc *); +void qestart(struct ifnet *); +void qestop(struct qesoftc *); +void qewatchdog(struct ifnet *); +int qeioctl(struct ifnet *, u_long, caddr_t); +void qereset(struct qesoftc *); + +int qeintr(void *); +int qe_eint(struct qesoftc *, u_int32_t); +int qe_rint(struct qesoftc *); +int qe_tint(struct qesoftc *); +void qe_read(struct qesoftc *, int, int); +void qe_mcreset(struct qesoftc *); +void qe_ifmedia_sts(struct ifnet *, struct ifmediareq *); +int qe_ifmedia_upd(struct ifnet *); struct cfdriver qe_cd = { NULL, "qe", DV_IFNET @@ -130,7 +130,7 @@ qeattach(parent, self, aux) struct ifnet *ifp = &sc->sc_arpcom.ac_if; struct confargs *ca = aux; struct bootpath *bp; - extern void myetheraddr __P((u_char *)); + extern void myetheraddr(u_char *); int pri; if (qec->sc_pri == 0) { diff --git a/sys/arch/sparc/dev/qec.c b/sys/arch/sparc/dev/qec.c index 98c57ebc56a..b7ba3aff655 100644 --- a/sys/arch/sparc/dev/qec.c +++ b/sys/arch/sparc/dev/qec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qec.c,v 1.14 2002/02/08 18:52:25 jason Exp $ */ +/* $OpenBSD: qec.c,v 1.15 2002/03/14 01:26:43 millert Exp $ */ /* * Copyright (c) 1998 Theo de Raadt and Jason L. Wright. @@ -63,11 +63,11 @@ #include <sparc/dev/qecreg.h> #include <sparc/dev/qecvar.h> -int qecprint __P((void *, const char *)); -int qecmatch __P((struct device *, void *, void *)); -void qecattach __P((struct device *, struct device *, void *)); -void qec_fix_range __P((struct qec_softc *, struct sbus_softc *)); -void qec_translate __P((struct qec_softc *, struct confargs *)); +int qecprint(void *, const char *); +int qecmatch(struct device *, void *, void *); +void qecattach(struct device *, struct device *, void *); +void qec_fix_range(struct qec_softc *, struct sbus_softc *); +void qec_translate(struct qec_softc *, struct confargs *); struct cfattach qec_ca = { sizeof(struct qec_softc), qecmatch, qecattach diff --git a/sys/arch/sparc/dev/qecvar.h b/sys/arch/sparc/dev/qecvar.h index d6d47c75d62..3f7ebfb1426 100644 --- a/sys/arch/sparc/dev/qecvar.h +++ b/sys/arch/sparc/dev/qecvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: qecvar.h,v 1.8 2001/01/30 07:17:07 jason Exp $ */ +/* $OpenBSD: qecvar.h,v 1.9 2002/03/14 01:26:43 millert Exp $ */ /* * Copyright (c) 1998 Theo de Raadt and Jason L. Wright. @@ -47,6 +47,6 @@ struct qec_softc { u_int32_t sc_rsize; /* qec buffer size for receive */ }; -void qec_reset __P((struct qec_softc *)); -int qec_put __P((u_int8_t *, struct mbuf *)); -struct mbuf *qec_get __P((struct ifnet *, u_int8_t *, int)); +void qec_reset(struct qec_softc *); +int qec_put(u_int8_t *, struct mbuf *); +struct mbuf *qec_get(struct ifnet *, u_int8_t *, int); diff --git a/sys/arch/sparc/dev/sbus.c b/sys/arch/sparc/dev/sbus.c index 140776501e2..294ffff2009 100644 --- a/sys/arch/sparc/dev/sbus.c +++ b/sys/arch/sparc/dev/sbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbus.c,v 1.10 2001/11/19 19:22:43 deraadt Exp $ */ +/* $OpenBSD: sbus.c,v 1.11 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: sbus.c,v 1.17 1997/06/01 22:10:39 pk Exp $ */ /* @@ -63,12 +63,12 @@ #include <sparc/dev/xboxvar.h> #include <sparc/dev/dmareg.h> -int sbus_print __P((void *, const char *)); -void sbusreset __P((int)); +int sbus_print(void *, const char *); +void sbusreset(int); /* autoconfiguration driver */ -void sbus_attach __P((struct device *, struct device *, void *)); -int sbus_match __P((struct device *, void *, void *)); +void sbus_attach(struct device *, struct device *, void *); +int sbus_match(struct device *, void *, void *); struct cfattach sbus_ca = { sizeof(struct sbus_softc), sbus_match, sbus_attach diff --git a/sys/arch/sparc/dev/sbusvar.h b/sys/arch/sparc/dev/sbusvar.h index 90abe2456fc..e43cc3e35e0 100644 --- a/sys/arch/sparc/dev/sbusvar.h +++ b/sys/arch/sparc/dev/sbusvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sbusvar.h,v 1.5 1998/11/11 00:26:01 jason Exp $ */ +/* $OpenBSD: sbusvar.h,v 1.6 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: sbusvar.h,v 1.4 1996/04/22 02:35:05 abrown Exp $ */ /* @@ -51,7 +51,7 @@ struct sbusdev { struct device *sd_dev; /* backpointer to generic */ struct sbusdev *sd_bchain; /* forward link in bus chain */ - void (*sd_reset) __P((struct device *)); + void (*sd_reset)(struct device *); }; /* @@ -73,7 +73,7 @@ struct sbus_softc { int sc_burst; /* burst transfer sizes supported */ }; -int sbusdev_match __P((struct cfdata *, void *)); -void sbus_establish __P((struct sbusdev *, struct device *)); -void sbus_translate __P((struct device *, struct confargs *)); -int sbus_testdma __P((struct sbus_softc *, struct confargs *)); +int sbusdev_match(struct cfdata *, void *); +void sbus_establish(struct sbusdev *, struct device *); +void sbus_translate(struct device *, struct confargs *); +int sbus_testdma(struct sbus_softc *, struct confargs *); diff --git a/sys/arch/sparc/dev/scf.c b/sys/arch/sparc/dev/scf.c index 3955015fdfc..2b9b08b33c9 100644 --- a/sys/arch/sparc/dev/scf.c +++ b/sys/arch/sparc/dev/scf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scf.c,v 1.3 2001/03/24 10:07:20 ho Exp $ */ +/* $OpenBSD: scf.c,v 1.4 2002/03/14 01:26:43 millert Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -57,12 +57,12 @@ #include <machine/scfio.h> #include <sparc/dev/scfreg.h> -int scfmatch __P((struct device *, void *, void *)); -void scfattach __P((struct device *, struct device *, void *)); +int scfmatch(struct device *, void *, void *); +void scfattach(struct device *, struct device *, void *); -int scfopen __P((dev_t, int, int, struct proc *)); -int scfclose __P((dev_t, int, int, struct proc *)); -int scfioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); +int scfopen(dev_t, int, int, struct proc *); +int scfclose(dev_t, int, int, struct proc *); +int scfioctl(dev_t, u_long, caddr_t, int, struct proc *); struct scf_softc { struct device sc_dv; /* base device */ diff --git a/sys/arch/sparc/dev/si.c b/sys/arch/sparc/dev/si.c index 032fc2aaf8b..3b6a078287a 100644 --- a/sys/arch/sparc/dev/si.c +++ b/sys/arch/sparc/dev/si.c @@ -1,4 +1,4 @@ -/* $OpenBSD: si.c,v 1.14 2000/09/21 17:45:12 mickey Exp $ */ +/* $OpenBSD: si.c,v 1.15 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: si.c,v 1.38 1997/08/27 11:24:20 bouyer Exp $ */ /*- @@ -201,31 +201,31 @@ int sw_options = SI_ENABLE_DMA; /* How long to wait for DMA before declaring an error. */ int si_dma_intr_timo = 500; /* ticks (sec. X 100) */ -static int si_match __P((struct device *, void *, void *)); -static void si_attach __P((struct device *, struct device *, void *)); -static int si_intr __P((void *)); -static void si_reset_adapter __P((struct ncr5380_softc *)); -static void si_minphys __P((struct buf *)); +static int si_match(struct device *, void *, void *); +static void si_attach(struct device *, struct device *, void *); +static int si_intr(void *); +static void si_reset_adapter(struct ncr5380_softc *); +static void si_minphys(struct buf *); -void si_dma_alloc __P((struct ncr5380_softc *)); -void si_dma_free __P((struct ncr5380_softc *)); -void si_dma_poll __P((struct ncr5380_softc *)); +void si_dma_alloc(struct ncr5380_softc *); +void si_dma_free(struct ncr5380_softc *); +void si_dma_poll(struct ncr5380_softc *); -void si_vme_dma_setup __P((struct ncr5380_softc *)); -void si_vme_dma_start __P((struct ncr5380_softc *)); -void si_vme_dma_eop __P((struct ncr5380_softc *)); -void si_vme_dma_stop __P((struct ncr5380_softc *)); +void si_vme_dma_setup(struct ncr5380_softc *); +void si_vme_dma_start(struct ncr5380_softc *); +void si_vme_dma_eop(struct ncr5380_softc *); +void si_vme_dma_stop(struct ncr5380_softc *); -void si_vme_intr_on __P((struct ncr5380_softc *)); -void si_vme_intr_off __P((struct ncr5380_softc *)); +void si_vme_intr_on(struct ncr5380_softc *); +void si_vme_intr_off(struct ncr5380_softc *); -void si_obio_dma_setup __P((struct ncr5380_softc *)); -void si_obio_dma_start __P((struct ncr5380_softc *)); -void si_obio_dma_eop __P((struct ncr5380_softc *)); -void si_obio_dma_stop __P((struct ncr5380_softc *)); +void si_obio_dma_setup(struct ncr5380_softc *); +void si_obio_dma_start(struct ncr5380_softc *); +void si_obio_dma_eop(struct ncr5380_softc *); +void si_obio_dma_stop(struct ncr5380_softc *); -void si_obio_intr_on __P((struct ncr5380_softc *)); -void si_obio_intr_off __P((struct ncr5380_softc *)); +void si_obio_intr_on(struct ncr5380_softc *); +void si_obio_intr_off(struct ncr5380_softc *); static struct scsi_adapter si_ops = { ncr5380_scsi_cmd, /* scsi_cmd() */ diff --git a/sys/arch/sparc/dev/spif.c b/sys/arch/sparc/dev/spif.c index 7af04e8bef4..99e06b56e32 100644 --- a/sys/arch/sparc/dev/spif.c +++ b/sys/arch/sparc/dev/spif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spif.c,v 1.9 2002/01/30 20:45:34 nordin Exp $ */ +/* $OpenBSD: spif.c,v 1.10 2002/03/14 01:26:43 millert Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -68,42 +68,42 @@ # error "no suitable software interrupt bit" #endif -int spifmatch __P((struct device *, void *, void *)); -void spifattach __P((struct device *, struct device *, void *)); - -int sttymatch __P((struct device *, void *, void *)); -void sttyattach __P((struct device *, struct device *, void *)); -int sttyopen __P((dev_t, int, int, struct proc *)); -int sttyclose __P((dev_t, int, int, struct proc *)); -int sttyread __P((dev_t, struct uio *, int)); -int sttywrite __P((dev_t, struct uio *, int)); -int sttyioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); -int sttystop __P((struct tty *, int)); - -int spifstcintr __P((void *)); -int spifstcintr_mx __P((struct spif_softc *, int *)); -int spifstcintr_tx __P((struct spif_softc *, int *)); -int spifstcintr_rx __P((struct spif_softc *, int *)); -int spifstcintr_rxexception __P((struct spif_softc *, int *)); -int spifsoftintr __P((void *)); - -int stty_param __P((struct tty *, struct termios *)); -struct tty *sttytty __P((dev_t)); -int stty_modem_control __P((struct stty_port *, int, int)); -static __inline void stty_write_ccr __P((struct stcregs *, u_int8_t)); -int stty_compute_baud __P((speed_t, int, u_int8_t *, u_int8_t *)); -void stty_start __P((struct tty *)); - -int sbppmatch __P((struct device *, void *, void *)); -void sbppattach __P((struct device *, struct device *, void *)); -int sbppopen __P((dev_t, int, int, struct proc *)); -int sbppclose __P((dev_t, int, int, struct proc *)); -int sbppread __P((dev_t, struct uio *, int)); -int sbppwrite __P((dev_t, struct uio *, int)); -int sbpp_rw __P((dev_t, struct uio *)); -int spifppcintr __P((void *)); -int sbppselect __P((dev_t, int, struct proc *)); -int sbppioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); +int spifmatch(struct device *, void *, void *); +void spifattach(struct device *, struct device *, void *); + +int sttymatch(struct device *, void *, void *); +void sttyattach(struct device *, struct device *, void *); +int sttyopen(dev_t, int, int, struct proc *); +int sttyclose(dev_t, int, int, struct proc *); +int sttyread(dev_t, struct uio *, int); +int sttywrite(dev_t, struct uio *, int); +int sttyioctl(dev_t, u_long, caddr_t, int, struct proc *); +int sttystop(struct tty *, int); + +int spifstcintr(void *); +int spifstcintr_mx(struct spif_softc *, int *); +int spifstcintr_tx(struct spif_softc *, int *); +int spifstcintr_rx(struct spif_softc *, int *); +int spifstcintr_rxexception(struct spif_softc *, int *); +int spifsoftintr(void *); + +int stty_param(struct tty *, struct termios *); +struct tty *sttytty(dev_t); +int stty_modem_control(struct stty_port *, int, int); +static __inline void stty_write_ccr(struct stcregs *, u_int8_t); +int stty_compute_baud(speed_t, int, u_int8_t *, u_int8_t *); +void stty_start(struct tty *); + +int sbppmatch(struct device *, void *, void *); +void sbppattach(struct device *, struct device *, void *); +int sbppopen(dev_t, int, int, struct proc *); +int sbppclose(dev_t, int, int, struct proc *); +int sbppread(dev_t, struct uio *, int); +int sbppwrite(dev_t, struct uio *, int); +int sbpp_rw(dev_t, struct uio *); +int spifppcintr(void *); +int sbppselect(dev_t, int, struct proc *); +int sbppioctl(dev_t, u_long, caddr_t, int, struct proc *); struct cfattach spif_ca = { sizeof (struct spif_softc), spifmatch, spifattach diff --git a/sys/arch/sparc/dev/tctrl.c b/sys/arch/sparc/dev/tctrl.c index 0c86714b7cb..108bfff17e3 100644 --- a/sys/arch/sparc/dev/tctrl.c +++ b/sys/arch/sparc/dev/tctrl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tctrl.c,v 1.2 1999/09/07 12:36:20 jason Exp $ */ +/* $OpenBSD: tctrl.c,v 1.3 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: tctrl.c,v 1.2 1999/08/11 00:46:06 matt Exp $ */ /*- @@ -100,14 +100,14 @@ struct tctrl_softc { struct evcnt sc_intrcnt; /* interrupt counting */ }; -int tctrl_match __P((struct device *, void *, void *)); -void tctrl_attach __P((struct device *, struct device *, void *)); +int tctrl_match(struct device *, void *, void *); +void tctrl_attach(struct device *, struct device *, void *); -void tctrl_write_data __P((struct tctrl_softc *, u_int8_t)); -u_int8_t tctrl_read_data __P((struct tctrl_softc *)); -int tctrl_intr __P((void *)); -void tctrl_setup_bitport __P((struct tctrl_softc *, int)); -void tctrl_process_response __P((struct tctrl_softc *)); +void tctrl_write_data(struct tctrl_softc *, u_int8_t); +u_int8_t tctrl_read_data(struct tctrl_softc *); +int tctrl_intr(void *); +void tctrl_setup_bitport(struct tctrl_softc *, int); +void tctrl_process_response(struct tctrl_softc *); struct cfattach tctrl_ca = { sizeof(struct tctrl_softc), tctrl_match, tctrl_attach diff --git a/sys/arch/sparc/dev/tcx.c b/sys/arch/sparc/dev/tcx.c index 36ff835dd2a..ef8f0b120ce 100644 --- a/sys/arch/sparc/dev/tcx.c +++ b/sys/arch/sparc/dev/tcx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcx.c,v 1.5 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: tcx.c,v 1.6 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: tcx.c,v 1.8 1997/07/29 09:58:14 fair Exp $ */ /* @@ -104,9 +104,9 @@ struct tcx_softc { }; /* autoconfiguration driver */ -static void tcxattach __P((struct device *, struct device *, void *)); -static int tcxmatch __P((struct device *, void *, void *)); -static void tcx_unblank __P((struct device *)); +static void tcxattach(struct device *, struct device *, void *); +static int tcxmatch(struct device *, void *, void *); +static void tcx_unblank(struct device *); struct cfattach tcx_ca = { sizeof(struct tcx_softc), tcxmatch, tcxattach @@ -123,8 +123,8 @@ static struct fbdriver tcx_fbdriver = { extern int fbnode; -static void tcx_reset __P((struct tcx_softc *)); -static void tcx_loadcmap __P((struct tcx_softc *, int, int)); +static void tcx_reset(struct tcx_softc *); +static void tcx_loadcmap(struct tcx_softc *, int, int); #define OBPNAME "SUNW,tcx" /* diff --git a/sys/arch/sparc/dev/xbox.c b/sys/arch/sparc/dev/xbox.c index a534e0c4b2e..119ccffd545 100644 --- a/sys/arch/sparc/dev/xbox.c +++ b/sys/arch/sparc/dev/xbox.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xbox.c,v 1.1 1999/04/18 03:24:26 jason Exp $ */ +/* $OpenBSD: xbox.c,v 1.2 2002/03/14 01:26:43 millert Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -53,10 +53,10 @@ #include <sparc/dev/xboxreg.h> #include <sparc/dev/xboxvar.h> -int xboxmatch __P((struct device *, void *, void *)); -void xboxattach __P((struct device *, struct device *, void *)); -int xboxprint __P((void *, const char *)); -void xbox_fix_range __P((struct xbox_softc *sc, struct sbus_softc *sbp)); +int xboxmatch(struct device *, void *, void *); +void xboxattach(struct device *, struct device *, void *); +int xboxprint(void *, const char *); +void xbox_fix_range(struct xbox_softc *sc, struct sbus_softc *sbp); struct cfattach xbox_ca = { sizeof (struct xbox_softc), xboxmatch, xboxattach diff --git a/sys/arch/sparc/dev/xd.c b/sys/arch/sparc/dev/xd.c index 4d2e3d5e3d5..76a433b9149 100644 --- a/sys/arch/sparc/dev/xd.c +++ b/sys/arch/sparc/dev/xd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xd.c,v 1.20 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: xd.c,v 1.21 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: xd.c,v 1.37 1997/07/29 09:58:16 fair Exp $ */ /* @@ -207,36 +207,36 @@ extern int pil_to_vme[]; /* from obio.c */ /* internals */ -int xdc_cmd __P((struct xdc_softc *, int, int, int, int, int, char *, int)); -char *xdc_e2str __P((int)); -int xdc_error __P((struct xdc_softc *, struct xd_iorq *, - struct xd_iopb *, int, int)); -int xdc_ioctlcmd __P((struct xd_softc *, dev_t dev, struct xd_iocmd *)); -void xdc_perror __P((struct xd_iorq *, struct xd_iopb *, int)); -int xdc_piodriver __P((struct xdc_softc *, int, int)); -int xdc_remove_iorq __P((struct xdc_softc *)); -int xdc_reset __P((struct xdc_softc *, int, int, int, struct xd_softc *)); -inline void xdc_rqinit __P((struct xd_iorq *, struct xdc_softc *, +int xdc_cmd(struct xdc_softc *, int, int, int, int, int, char *, int); +char *xdc_e2str(int); +int xdc_error(struct xdc_softc *, struct xd_iorq *, + struct xd_iopb *, int, int); +int xdc_ioctlcmd(struct xd_softc *, dev_t dev, struct xd_iocmd *); +void xdc_perror(struct xd_iorq *, struct xd_iopb *, int); +int xdc_piodriver(struct xdc_softc *, int, int); +int xdc_remove_iorq(struct xdc_softc *); +int xdc_reset(struct xdc_softc *, int, int, int, struct xd_softc *); +inline void xdc_rqinit(struct xd_iorq *, struct xdc_softc *, struct xd_softc *, int, u_long, int, - caddr_t, struct buf *)); -void xdc_rqtopb __P((struct xd_iorq *, struct xd_iopb *, int, int)); -void xdc_start __P((struct xdc_softc *, int)); -int xdc_startbuf __P((struct xdc_softc *, struct xd_softc *, struct buf *)); -int xdc_submit_iorq __P((struct xdc_softc *, int, int)); -void xdc_tick __P((void *)); -void xdc_xdreset __P((struct xdc_softc *, struct xd_softc *)); + caddr_t, struct buf *); +void xdc_rqtopb(struct xd_iorq *, struct xd_iopb *, int, int); +void xdc_start(struct xdc_softc *, int); +int xdc_startbuf(struct xdc_softc *, struct xd_softc *, struct buf *); +int xdc_submit_iorq(struct xdc_softc *, int, int); +void xdc_tick(void *); +void xdc_xdreset(struct xdc_softc *, struct xd_softc *); /* machine interrupt hook */ -int xdcintr __P((void *)); +int xdcintr(void *); /* autoconf */ -int xdcmatch __P((struct device *, void *, void *)); -void xdcattach __P((struct device *, struct device *, void *)); -int xdmatch __P((struct device *, void *, void *)); -void xdattach __P((struct device *, struct device *, void *)); +int xdcmatch(struct device *, void *, void *); +void xdcattach(struct device *, struct device *, void *); +int xdmatch(struct device *, void *, void *); +void xdattach(struct device *, struct device *, void *); -static void xddummystrat __P((struct buf *)); -int xdgetdisklabel __P((struct xd_softc *, void *)); +static void xddummystrat(struct buf *); +int xdgetdisklabel(struct xd_softc *, void *); /* * cfdrivers: device driver interface to autoconfig diff --git a/sys/arch/sparc/dev/xy.c b/sys/arch/sparc/dev/xy.c index b9278ca6231..05c948e501f 100644 --- a/sys/arch/sparc/dev/xy.c +++ b/sys/arch/sparc/dev/xy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xy.c,v 1.17 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: xy.c,v 1.18 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: xy.c,v 1.26 1997/07/19 21:43:56 pk Exp $ */ /* @@ -144,40 +144,40 @@ extern int pil_to_vme[]; /* from obio.c */ /* internals */ -struct xy_iopb *xyc_chain __P((struct xyc_softc *, struct xy_iorq *)); -int xyc_cmd __P((struct xyc_softc *, int, int, int, int, int, char *, int)); -char *xyc_e2str __P((int)); -int xyc_entoact __P((int)); -int xyc_error __P((struct xyc_softc *, struct xy_iorq *, - struct xy_iopb *, int)); -int xyc_ioctlcmd __P((struct xy_softc *, dev_t dev, struct xd_iocmd *)); -void xyc_perror __P((struct xy_iorq *, struct xy_iopb *, int)); -int xyc_piodriver __P((struct xyc_softc *, struct xy_iorq *)); -int xyc_remove_iorq __P((struct xyc_softc *)); -int xyc_reset __P((struct xyc_softc *, int, struct xy_iorq *, int, - struct xy_softc *)); -inline void xyc_rqinit __P((struct xy_iorq *, struct xyc_softc *, +struct xy_iopb *xyc_chain(struct xyc_softc *, struct xy_iorq *); +int xyc_cmd(struct xyc_softc *, int, int, int, int, int, char *, int); +char *xyc_e2str(int); +int xyc_entoact(int); +int xyc_error(struct xyc_softc *, struct xy_iorq *, + struct xy_iopb *, int); +int xyc_ioctlcmd(struct xy_softc *, dev_t dev, struct xd_iocmd *); +void xyc_perror(struct xy_iorq *, struct xy_iopb *, int); +int xyc_piodriver(struct xyc_softc *, struct xy_iorq *); +int xyc_remove_iorq(struct xyc_softc *); +int xyc_reset(struct xyc_softc *, int, struct xy_iorq *, int, + struct xy_softc *); +inline void xyc_rqinit(struct xy_iorq *, struct xyc_softc *, struct xy_softc *, int, u_long, int, - caddr_t, struct buf *)); -void xyc_rqtopb __P((struct xy_iorq *, struct xy_iopb *, int, int)); -void xyc_start __P((struct xyc_softc *, struct xy_iorq *)); -int xyc_startbuf __P((struct xyc_softc *, struct xy_softc *, struct buf *)); -int xyc_submit_iorq __P((struct xyc_softc *, struct xy_iorq *, int)); -void xyc_tick __P((void *)); -int xyc_unbusy __P((struct xyc *, int)); -void xyc_xyreset __P((struct xyc_softc *, struct xy_softc *)); + caddr_t, struct buf *); +void xyc_rqtopb(struct xy_iorq *, struct xy_iopb *, int, int); +void xyc_start(struct xyc_softc *, struct xy_iorq *); +int xyc_startbuf(struct xyc_softc *, struct xy_softc *, struct buf *); +int xyc_submit_iorq(struct xyc_softc *, struct xy_iorq *, int); +void xyc_tick(void *); +int xyc_unbusy(struct xyc *, int); +void xyc_xyreset(struct xyc_softc *, struct xy_softc *); /* machine interrupt hook */ -int xycintr __P((void *)); +int xycintr(void *); /* autoconf */ -int xycmatch __P((struct device *, void *, void *)); -void xycattach __P((struct device *, struct device *, void *)); -int xymatch __P((struct device *, void *, void *)); -void xyattach __P((struct device *, struct device *, void *)); +int xycmatch(struct device *, void *, void *); +void xycattach(struct device *, struct device *, void *); +int xymatch(struct device *, void *, void *); +void xyattach(struct device *, struct device *, void *); -static void xydummystrat __P((struct buf *)); -int xygetdisklabel __P((struct xy_softc *, void *)); +static void xydummystrat(struct buf *); +int xygetdisklabel(struct xy_softc *, void *); /* * cfdrivers: device driver interface to autoconfig diff --git a/sys/arch/sparc/dev/zs.c b/sys/arch/sparc/dev/zs.c index 3762e8118a9..5cbda3bb015 100644 --- a/sys/arch/sparc/dev/zs.c +++ b/sys/arch/sparc/dev/zs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zs.c,v 1.32 2002/03/13 00:24:21 miod Exp $ */ +/* $OpenBSD: zs.c,v 1.33 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: zs.c,v 1.49 1997/08/31 21:26:37 pk Exp $ */ /* @@ -125,8 +125,8 @@ struct zs_softc { }; /* Definition of the driver for autoconfig. */ -static int zsmatch __P((struct device *, void *, void *)); -static void zsattach __P((struct device *, struct device *, void *)); +static int zsmatch(struct device *, void *, void *); +static void zsattach(struct device *, struct device *, void *); struct cfattach zs_ca = { sizeof(struct zs_softc), zsmatch, zsattach @@ -137,53 +137,53 @@ struct cfdriver zs_cd = { }; /* Interrupt handlers. */ -static int zshard __P((void *)); +static int zshard(void *); static struct intrhand levelhard = { zshard }; -static int zssoft __P((void *)); +static int zssoft(void *); static struct intrhand levelsoft = { zssoft }; struct zs_chanstate *zslist; /* Routines called from other code. */ -static void zsiopen __P((struct tty *)); -static void zsiclose __P((struct tty *)); -static void zsstart __P((struct tty *)); -static int zsparam __P((struct tty *, struct termios *)); +static void zsiopen(struct tty *); +static void zsiclose(struct tty *); +static void zsstart(struct tty *); +static int zsparam(struct tty *, struct termios *); /* Routines purely local to this driver. */ -static int zs_getspeed __P((volatile struct zschan *)); +static int zs_getspeed(volatile struct zschan *); #ifdef KGDB -static void zs_reset __P((volatile struct zschan *, int, int)); +static void zs_reset(volatile struct zschan *, int, int); #endif -static void zs_modem __P((struct zs_chanstate *, int)); -static void zs_loadchannelregs __P((volatile struct zschan *, u_char *)); -static void tiocm_to_zs __P((struct zs_chanstate *, int how, int data)); +static void zs_modem(struct zs_chanstate *, int); +static void zs_loadchannelregs(volatile struct zschan *, u_char *); +static void tiocm_to_zs(struct zs_chanstate *, int how, int data); /* Console stuff. */ static struct tty *zs_ctty; /* console `struct tty *' */ static int zs_consin = -1, zs_consout = -1; static struct zs_chanstate *zs_conscs = NULL; /*console channel state */ -static void zscnputc __P((int)); /* console putc function */ +static void zscnputc(int); /* console putc function */ static volatile struct zschan *zs_conschan; -static struct tty *zs_checkcons __P((struct zs_softc *, int, - struct zs_chanstate *)); +static struct tty *zs_checkcons(struct zs_softc *, int, + struct zs_chanstate *); #ifdef KGDB /* KGDB stuff. Must reboot to change zs_kgdbunit. */ extern int kgdb_dev, kgdb_rate; static int zs_kgdb_savedspeed; -static void zs_checkkgdb __P((int, struct zs_chanstate *, struct tty *)); -void zskgdb __P((int)); -static int zs_kgdb_getc __P((void *)); -static void zs_kgdb_putc __P((void *, int)); +static void zs_checkkgdb(int, struct zs_chanstate *, struct tty *); +void zskgdb(int); +static int zs_kgdb_getc(void *); +static void zs_kgdb_putc(void *, int); #endif -static int zsrint __P((struct zs_chanstate *, volatile struct zschan *)); -static int zsxint __P((struct zs_chanstate *, volatile struct zschan *)); -static int zssint __P((struct zs_chanstate *, volatile struct zschan *)); +static int zsrint(struct zs_chanstate *, volatile struct zschan *); +static int zsxint(struct zs_chanstate *, volatile struct zschan *); +static int zssint(struct zs_chanstate *, volatile struct zschan *); -void zsabort __P((int)); -static void zsoverrun __P((int, long *, char *)); +void zsabort(int); +static void zsoverrun(int, long *, char *); static volatile struct zsdevice *zsaddr[NZS]; /* XXX, but saves work */ @@ -203,8 +203,8 @@ int zshardscope; int zsshortcuts; /* number of "shortcut" software interrupts */ #ifdef SUN4 -static u_int zs_read __P((volatile struct zschan *, u_int reg)); -static u_int zs_write __P((volatile struct zschan *, u_int, u_int)); +static u_int zs_read(volatile struct zschan *, u_int reg); +static u_int zs_write(volatile struct zschan *, u_int, u_int); static u_int zs_read(zc, reg) @@ -445,7 +445,7 @@ zsconsole(tp, unit, out, fnstop) register struct tty *tp; register int unit; int out; - int (**fnstop) __P((struct tty *, int)); + int (**fnstop)(struct tty *, int); { int zs; volatile struct zsdevice *addr; @@ -853,9 +853,9 @@ zstty(dev) return (cs->cs_ttyp); } -static int zsrint __P((struct zs_chanstate *, volatile struct zschan *)); -static int zsxint __P((struct zs_chanstate *, volatile struct zschan *)); -static int zssint __P((struct zs_chanstate *, volatile struct zschan *)); +static int zsrint(struct zs_chanstate *, volatile struct zschan *); +static int zsxint(struct zs_chanstate *, volatile struct zschan *); +static int zssint(struct zs_chanstate *, volatile struct zschan *); /* * ZS hardware interrupt. Scan all ZS channels. NB: we know here that diff --git a/sys/arch/sparc/fpu/fpu_extern.h b/sys/arch/sparc/fpu/fpu_extern.h index fa7ca68daec..a1a1df73beb 100644 --- a/sys/arch/sparc/fpu/fpu_extern.h +++ b/sys/arch/sparc/fpu/fpu_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu_extern.h,v 1.2 1997/08/08 08:25:53 downsj Exp $ */ +/* $OpenBSD: fpu_extern.h,v 1.3 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: fpu_extern.h,v 1.1 1996/03/14 19:41:56 christos Exp $ */ /* @@ -38,40 +38,40 @@ struct fpemu; struct fpn; /* fpu.c */ -void fpu_cleanup __P((struct proc *, struct fpstate *)); -int fpu_emulate __P((struct proc *, struct trapframe *, struct fpstate *)); -int fpu_execute __P((struct fpemu *, union instr)); +void fpu_cleanup(struct proc *, struct fpstate *); +int fpu_emulate(struct proc *, struct trapframe *, struct fpstate *); +int fpu_execute(struct fpemu *, union instr); /* fpu_add.c */ -struct fpn *fpu_add __P((struct fpemu *)); +struct fpn *fpu_add(struct fpemu *); /* fpu_compare.c */ -void fpu_compare __P((struct fpemu *, int)); +void fpu_compare(struct fpemu *, int); /* fpu_div.c */ -struct fpn *fpu_div __P((struct fpemu *)); +struct fpn *fpu_div(struct fpemu *); /* fpu_explode.c */ -int fpu_itof __P((struct fpn *, u_int)); -int fpu_stof __P((struct fpn *, u_int)); -int fpu_dtof __P((struct fpn *, u_int, u_int )); -int fpu_xtof __P((struct fpn *, u_int, u_int , u_int , u_int )); -void fpu_explode __P((struct fpemu *, struct fpn *, int, int )); +int fpu_itof(struct fpn *, u_int); +int fpu_stof(struct fpn *, u_int); +int fpu_dtof(struct fpn *, u_int, u_int ); +int fpu_xtof(struct fpn *, u_int, u_int , u_int , u_int ); +void fpu_explode(struct fpemu *, struct fpn *, int, int ); /* fpu_implode.c */ -u_int fpu_ftoi __P((struct fpemu *, struct fpn *)); -u_int fpu_ftos __P((struct fpemu *, struct fpn *)); -u_int fpu_ftod __P((struct fpemu *, struct fpn *, u_int *)); -u_int fpu_ftox __P((struct fpemu *, struct fpn *, u_int *)); -void fpu_implode __P((struct fpemu *, struct fpn *, int, u_int *)); +u_int fpu_ftoi(struct fpemu *, struct fpn *); +u_int fpu_ftos(struct fpemu *, struct fpn *); +u_int fpu_ftod(struct fpemu *, struct fpn *, u_int *); +u_int fpu_ftox(struct fpemu *, struct fpn *, u_int *); +void fpu_implode(struct fpemu *, struct fpn *, int, u_int *); /* fpu_mul.c */ -struct fpn *fpu_mul __P((struct fpemu *)); +struct fpn *fpu_mul(struct fpemu *); /* fpu_sqrt.c */ -struct fpn *fpu_sqrt __P((struct fpemu *)); +struct fpn *fpu_sqrt(struct fpemu *); /* fpu_subr.c */ -int fpu_shr __P((register struct fpn *, register int)); -void fpu_norm __P((register struct fpn *)); -struct fpn *fpu_newnan __P((register struct fpemu *)); +int fpu_shr(register struct fpn *, register int); +void fpu_norm(register struct fpn *); +struct fpn *fpu_newnan(register struct fpemu *); diff --git a/sys/arch/sparc/fpu/fpu_implode.c b/sys/arch/sparc/fpu/fpu_implode.c index 5d07ac1e23b..b3eca3edc0d 100644 --- a/sys/arch/sparc/fpu/fpu_implode.c +++ b/sys/arch/sparc/fpu/fpu_implode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu_implode.c,v 1.3 1997/08/08 08:25:56 downsj Exp $ */ +/* $OpenBSD: fpu_implode.c,v 1.4 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: fpu_implode.c,v 1.3 1996/03/14 19:41:59 christos Exp $ */ /* @@ -61,8 +61,8 @@ #include <sparc/fpu/fpu_emu.h> #include <sparc/fpu/fpu_extern.h> -static int round __P((register struct fpemu *, register struct fpn *)); -static int toinf __P((struct fpemu *, int)); +static int round(register struct fpemu *, register struct fpn *); +static int toinf(struct fpemu *, int); /* * Round a number (algorithm from Motorola MC68882 manual, modified for diff --git a/sys/arch/sparc/include/autoconf.h b/sys/arch/sparc/include/autoconf.h index 88688854650..346059f0ef2 100644 --- a/sys/arch/sparc/include/autoconf.h +++ b/sys/arch/sparc/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.8 2001/05/05 22:34:17 art Exp $ */ +/* $OpenBSD: autoconf.h,v 1.9 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: autoconf.h,v 1.20 1997/05/24 20:03:03 pk Exp $ */ /* @@ -126,8 +126,8 @@ struct confargs { * it will use that instead of creating one, but you must only do this if * you get it from ../sparc/vaddrs.h. */ -void *mapdev __P((struct rom_reg *pa, int va, - int offset, int size)); +void *mapdev(struct rom_reg *pa, int va, + int offset, int size); #define mapiodev(pa, offset, size) \ mapdev(pa, 0, offset, size) /* @@ -137,18 +137,18 @@ void *mapdev __P((struct rom_reg *pa, int va, (((u_int)(rr)->rr_paddr + (offset)) | PMAP_IOENC((rr)->rr_iospace) ) /* For VME and sun4/obio busses */ -void *bus_map __P((struct rom_reg *, int)); -void bus_untmp __P((void)); +void *bus_map(struct rom_reg *, int); +void bus_untmp(void); /* * The various getprop* functions obtain `properties' from the ROMs. * getprop() obtains a property as a byte-sequence, and returns its * length; the others convert or make some other guarantee. */ -int getproplen __P((int node, char *name)); -int getprop __P((int node, char *name, void *buf, int bufsiz)); -char *getpropstring __P((int node, char *name)); -int getpropint __P((int node, char *name, int deflt)); +int getproplen(int node, char *name); +int getprop(int node, char *name, void *buf, int bufsiz); +char *getpropstring(int node, char *name); +int getpropint(int node, char *name, int deflt); /* Frequently used options node */ extern int optionsnode; @@ -158,7 +158,7 @@ extern int optionsnode; * and fills in a romaux. It returns 1 on success, 0 if the physical * address is not available as a "reg" property. */ -int romprop __P((struct romaux *ra, const char *name, int node)); +int romprop(struct romaux *ra, const char *name, int node); /* * The matchbyname function is useful in drivers that are matched @@ -168,13 +168,13 @@ int romprop __P((struct romaux *ra, const char *name, int node)); */ struct device; struct cfdata; -int matchbyname __P((struct device *, void *cf, void *aux)); +int matchbyname(struct device *, void *cf, void *aux); /* * `clockfreq' produces a printable representation of a clock frequency * (this is just a frill). */ -char *clockfreq __P((int freq)); +char *clockfreq(int freq); /* * Memory description arrays. Shared between pmap.c and autoconf.c; no @@ -190,7 +190,7 @@ int makememarr(struct memarr *, int max, int which); #define MEMARR_TOTALPHYS 1 /* Pass a string to the FORTH interpreter. May fail silently. */ -void rominterpret __P((char *)); +void rominterpret(char *); /* Openprom V2 style boot path */ struct bootpath { @@ -199,24 +199,24 @@ struct bootpath { struct device *dev; /* device that recognised this component */ }; -struct bootpath *bootpath_store __P((int, struct bootpath *)); -int sd_crazymap __P((int)); +struct bootpath *bootpath_store(int, struct bootpath *); +int sd_crazymap(int); /* Parse a disk string into a dev_t, return device struct pointer */ -struct device *parsedisk __P((char *, int, int, dev_t *)); +struct device *parsedisk(char *, int, int, dev_t *); /* Establish a mountroot_hook, for benefit of floppy drive, mostly. */ -void mountroot_hook_establish __P((void (*) __P((struct device *)), +void mountroot_hook_establish __P((void (*)(struct device *), struct device *)); -void bootstrap __P((void)); -int firstchild __P((int)); -int nextsibling __P((int)); -void callrom __P((void)); -struct device *getdevunit __P((char *, int)); -void *findzs __P((int)); -int romgetcursoraddr __P((int **, int **)); -int findroot __P((void)); -int findnode __P((int, const char *)); -int opennode __P((char *)); -int node_has_property __P((int, const char *)); +void bootstrap(void); +int firstchild(int); +int nextsibling(int); +void callrom(void); +struct device *getdevunit(char *, int); +void *findzs(int); +int romgetcursoraddr(int **, int **); +int findroot(void); +int findnode(int, const char *); +int opennode(char *); +int node_has_property(int, const char *); diff --git a/sys/arch/sparc/include/bsd_openprom.h b/sys/arch/sparc/include/bsd_openprom.h index 40f37590f22..b7b89d9078c 100644 --- a/sys/arch/sparc/include/bsd_openprom.h +++ b/sys/arch/sparc/include/bsd_openprom.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bsd_openprom.h,v 1.8 2001/08/08 13:48:21 art Exp $ */ +/* $OpenBSD: bsd_openprom.h,v 1.9 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: bsd_openprom.h,v 1.11 1996/05/18 12:27:43 mrg Exp $ */ /* @@ -75,15 +75,15 @@ * and so forth). */ struct v0devops { - int (*v0_open) __P((char *dev)); - int (*v0_close) __P((int d)); - int (*v0_rbdev) __P((int d, int nblks, int blkno, void *addr)); - int (*v0_wbdev) __P((int d, int nblks, int blkno, void *addr)); - int (*v0_wnet) __P((int d, int nbytes, void *addr)); - int (*v0_rnet) __P((int d, int nbytes, void *addr)); - int (*v0_rcdev) __P((int d, int nbytes, int, void *addr)); - int (*v0_wcdev) __P((int d, int nbytes, int, void *addr)); - int (*v0_seek) __P((int d, long offset, int whence)); + int (*v0_open)(char *dev); + int (*v0_close)(int d); + int (*v0_rbdev)(int d, int nblks, int blkno, void *addr); + int (*v0_wbdev)(int d, int nblks, int blkno, void *addr); + int (*v0_wnet)(int d, int nbytes, void *addr); + int (*v0_rnet)(int d, int nbytes, void *addr); + int (*v0_rcdev)(int d, int nbytes, int, void *addr); + int (*v0_wcdev)(int d, int nbytes, int, void *addr); + int (*v0_seek)(int d, long offset, int whence); }; /* @@ -101,25 +101,25 @@ struct v2devops { * Convert an `instance handle' (acquired through v2_open()) to * a `package handle', a.k.a. a `node'. */ - int (*v2_fd_phandle) __P((int d)); + int (*v2_fd_phandle)(int d); /* Memory allocation and release. */ - void *(*v2_malloc) __P((caddr_t va, u_int sz)); - void (*v2_free) __P((caddr_t va, u_int sz)); + void *(*v2_malloc)(caddr_t va, u_int sz); + void (*v2_free)(caddr_t va, u_int sz); /* Device memory mapper. */ - caddr_t (*v2_mmap) __P((caddr_t va, int asi, u_int pa, u_int sz)); - void (*v2_munmap) __P((caddr_t va, u_int sz)); + caddr_t (*v2_mmap)(caddr_t va, int asi, u_int pa, u_int sz); + void (*v2_munmap)(caddr_t va, u_int sz); /* Device open, close, etc. */ - int (*v2_open) __P((char *devpath)); - void (*v2_close) __P((int d)); - int (*v2_read) __P((int d, void *buf, int nbytes)); - int (*v2_write) __P((int d, void *buf, int nbytes)); - void (*v2_seek) __P((int d, int hi, int lo)); - - void (*v2_chain) __P((void)); /* ??? */ - void (*v2_release) __P((void)); /* ??? */ + int (*v2_open)(char *devpath); + void (*v2_close)(int d); + int (*v2_read)(int d, void *buf, int nbytes); + int (*v2_write)(int d, void *buf, int nbytes); + void (*v2_seek)(int d, int hi, int lo); + + void (*v2_chain)(void); /* ??? */ + void (*v2_release)(void); /* ??? */ }; /* @@ -209,37 +209,37 @@ struct promvec { #define PROMDEV_TTYB 2 /* in/out to ttyb */ /* Blocking getchar/putchar. NOT REENTRANT! (grr) */ - int (*pv_getchar) __P((void)); - void (*pv_putchar) __P((int ch)); + int (*pv_getchar)(void); + void (*pv_putchar)(int ch); /* Non-blocking variants that return -1 on error. */ - int (*pv_nbgetchar) __P((void)); - int (*pv_nbputchar) __P((int ch)); + int (*pv_nbgetchar)(void); + int (*pv_nbputchar)(int ch); /* Put counted string (can be very slow). */ - void (*pv_putstr) __P((char *str, int len)); + void (*pv_putstr)(char *str, int len); /* Miscellany. */ - void (*pv_reboot) __P((char *bootstr)); - void (*pv_printf) __P((const char *fmt, ...)); - void (*pv_abort) __P((void)); /* L1-A abort */ + void (*pv_reboot)(char *bootstr); + void (*pv_printf)(const char *fmt, ...); + void (*pv_abort)(void); /* L1-A abort */ int *pv_ticks; /* Ticks since last reset */ - void (*pv_halt) __P((void)) __attribute__((__noreturn__));/* Halt! */ - void (**pv_synchook) __P((void)); /* "sync" command hook */ + void (*pv_halt)(void) __attribute__((__noreturn__));/* Halt! */ + void (**pv_synchook)(void); /* "sync" command hook */ /* * This eval's a FORTH string. Unfortunately, its interface * changed between V0 and V2, which gave us much pain. */ union { - void (*v0_eval) __P((int len, char *str)); - void (*v2_eval) __P((char *str)); + void (*v0_eval)(int len, char *str); + void (*v2_eval)(char *str); } pv_fortheval; struct v0bootargs **pv_v0bootargs; /* V0: Boot args */ /* Extract Ethernet address from network device. */ - u_int (*pv_enaddr) __P((int d, char *enaddr)); + u_int (*pv_enaddr)(int d, char *enaddr); struct v2bootargs pv_v2bootargs; /* V2: Boot args + std in/out */ struct v2devops pv_v2devops; /* V2: device operations */ @@ -257,17 +257,17 @@ struct promvec { * all memory references go to the PROM, so the PROM can do it * easily. */ - void (*pv_setctxt) __P((int ctxt, caddr_t va, int pmeg)); + void (*pv_setctxt)(int ctxt, caddr_t va, int pmeg); #if defined(SUN4M) && defined(notyet) /* * The following are V3 ROM functions to handle MP machines in the * Sun4m series. They have undefined results when run on a uniprocessor! */ - int (*pv_v3cpustart) __P((u_int module, u_int ctxtbl, - int context, caddr_t pc)); - int (*pv_v3cpustop) __P((u_int module)); - int (*pv_v3cpuidle) __P((u_int module)); - int (*pv_v3cpuresume) __P((u_int module)); + int (*pv_v3cpustart)(u_int module, u_int ctxtbl, + int context, caddr_t pc); + int (*pv_v3cpustop)(u_int module); + int (*pv_v3cpuidle)(u_int module); + int (*pv_v3cpuresume)(u_int module); #endif }; @@ -305,22 +305,22 @@ struct nodeops { /* * Tree traversal. */ - int (*no_nextnode) __P((int node)); /* next(node) */ - int (*no_child) __P((int node)); /* first child */ + int (*no_nextnode)(int node); /* next(node) */ + int (*no_child)(int node); /* first child */ /* * Property functions. Proper use of getprop requires calling * proplen first to make sure it fits. Kind of a pain, but no * doubt more convenient for the PROM coder. */ - int (*no_proplen) __P((int node, caddr_t name)); - int (*no_getprop) __P((int node, caddr_t name, caddr_t val)); - int (*no_setprop) __P((int node, caddr_t name, caddr_t val, - int len)); - caddr_t (*no_nextprop) __P((int node, caddr_t name)); + int (*no_proplen)(int node, caddr_t name); + int (*no_getprop)(int node, caddr_t name, caddr_t val); + int (*no_setprop)(int node, caddr_t name, caddr_t val, + int len); + caddr_t (*no_nextprop)(int node, caddr_t name); }; -__dead void romhalt __P((void)); -__dead void romboot __P((char *)); +__dead void romhalt(void); +__dead void romboot(char *); extern struct promvec *promvec; diff --git a/sys/arch/sparc/include/cpu.h b/sys/arch/sparc/include/cpu.h index a6082b68af8..c23c0b32ef3 100644 --- a/sys/arch/sparc/include/cpu.h +++ b/sys/arch/sparc/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.11 2001/11/06 18:41:10 art Exp $ */ +/* $OpenBSD: cpu.h,v 1.12 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: cpu.h,v 1.24 1997/03/15 22:25:15 pk Exp $ */ /* @@ -112,7 +112,7 @@ extern union sir sir; #define SIR_CLOCK 1 #if defined(SUN4M) -extern void raise __P((int, int)); +extern void raise(int, int); #if !(defined(SUN4) || defined(SUN4C)) #define setsoftint() raise(0,1) #else /* both defined */ @@ -155,13 +155,13 @@ extern int foundfpu; /* true => we have an FPU */ * argument, or with a pointer to a clockframe if ih_arg is NULL. */ struct intrhand { - int (*ih_fun) __P((void *)); + int (*ih_fun)(void *); void *ih_arg; struct intrhand *ih_next; }; extern struct intrhand *intrhand[15]; -void intr_establish __P((int level, struct intrhand *)); -void vmeintr_establish __P((int vec, int level, struct intrhand *)); +void intr_establish(int level, struct intrhand *); +void vmeintr_establish(int vec, int level, struct intrhand *); /* * intr_fasttrap() is a lot like intr_establish, but is used for ``fast'' @@ -171,68 +171,68 @@ void vmeintr_establish __P((int vec, int level, struct intrhand *)); void intr_fasttrap __P((int level, void (*vec)(void))); /* auxreg.c */ -void led_blink __P((void *)); +void led_blink(void *); /* scf.c */ -void scfblink __P((void *)); +void scfblink(void *); /* disksubr.c */ struct dkbad; -int isbad __P((struct dkbad *bt, int, int, int)); +int isbad(struct dkbad *bt, int, int, int); /* machdep.c */ -int ldcontrolb __P((caddr_t)); -void dumpconf __P((void)); -caddr_t reserve_dumppages __P((caddr_t)); +int ldcontrolb(caddr_t); +void dumpconf(void); +caddr_t reserve_dumppages(caddr_t); /* clock.c */ struct timeval; -void lo_microtime __P((struct timeval *)); -int statintr __P((void *)); -int clockintr __P((void *));/* level 10 (clock) interrupt code */ -int statintr __P((void *)); /* level 14 (statclock) interrupt code */ +void lo_microtime(struct timeval *); +int statintr(void *); +int clockintr(void *);/* level 10 (clock) interrupt code */ +int statintr(void *); /* level 14 (statclock) interrupt code */ /* locore.s */ struct fpstate; -void savefpstate __P((struct fpstate *)); -void loadfpstate __P((struct fpstate *)); -int probeget __P((caddr_t, int)); -void write_all_windows __P((void)); -void write_user_windows __P((void)); -void proc_trampoline __P((void)); +void savefpstate(struct fpstate *); +void loadfpstate(struct fpstate *); +int probeget(caddr_t, int); +void write_all_windows(void); +void write_user_windows(void); +void proc_trampoline(void); struct pcb; -void snapshot __P((struct pcb *)); -struct frame *getfp __P((void)); -int xldcontrolb __P((caddr_t, struct pcb *)); -void copywords __P((const void *, void *, size_t)); -void qcopy __P((const void *, void *, size_t)); -void qzero __P((void *, size_t)); +void snapshot(struct pcb *); +struct frame *getfp(void); +int xldcontrolb(caddr_t, struct pcb *); +void copywords(const void *, void *, size_t); +void qcopy(const void *, void *, size_t); +void qzero(void *, size_t); /* locore2.c */ -void remrunqueue __P((struct proc *)); +void remrunqueue(struct proc *); /* trap.c */ -void kill_user_windows __P((struct proc *)); -int rwindow_save __P((struct proc *)); +void kill_user_windows(struct proc *); +int rwindow_save(struct proc *); /* amd7930intr.s */ -void amd7930_trap __P((void)); +void amd7930_trap(void); /* cons.c */ -int cnrom __P((void)); +int cnrom(void); /* zs.c */ void zsconsole __P((struct tty *, int, int, int (**)(struct tty *, int))); #ifdef KGDB -void zs_kgdb_init __P((void)); +void zs_kgdb_init(void); #endif /* fb.c */ -void fb_unblank __P((void)); +void fb_unblank(void); /* cache.c */ -void cache_flush __P((caddr_t, u_int)); +void cache_flush(caddr_t, u_int); /* kgdb_stub.c */ #ifdef KGDB void kgdb_attach __P((int (*)(void *), void (*)(void *, int), void *)); -void kgdb_connect __P((int)); -void kgdb_panic __P((void)); +void kgdb_connect(int); +void kgdb_panic(void); #endif /* iommu.c */ -void iommu_enter __P((u_int, u_int)); -void iommu_remove __P((u_int, u_int)); +void iommu_enter(u_int, u_int); +void iommu_remove(u_int, u_int); /* emul.c */ struct trapframe; -int fixalign __P((struct proc *, struct trapframe *)); -int emulinstr __P((int, struct trapframe *)); +int fixalign(struct proc *, struct trapframe *); +int emulinstr(int, struct trapframe *); /* * @@ -253,8 +253,8 @@ struct trapvec { }; extern struct trapvec *trapbase; /* the 256 vectors */ -extern void wzero __P((void *, u_int)); -extern void wcopy __P((const void *, void *, u_int)); +extern void wzero(void *, u_int); +extern void wcopy(const void *, void *, u_int); #endif /* _KERNEL */ #endif /* _SPARC_CPU_H_ */ diff --git a/sys/arch/sparc/include/db_machdep.h b/sys/arch/sparc/include/db_machdep.h index 93d6161e098..fa8860c157d 100644 --- a/sys/arch/sparc/include/db_machdep.h +++ b/sys/arch/sparc/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.7 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.8 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: db_machdep.h,v 1.10 1997/08/31 21:23:40 pk Exp $ */ /* @@ -86,8 +86,8 @@ db_regs_t ddb_regs; /* register state */ #define DB_MACHINE_COMMANDS -void db_machine_init __P((void)); -int kdb_trap __P((int, struct trapframe *)); +void db_machine_init(void); +int kdb_trap(int, struct trapframe *); /* * We use a.out symbols in DDB. diff --git a/sys/arch/sparc/include/eeprom.h b/sys/arch/sparc/include/eeprom.h index 4a7d4c39ea1..7be53cc0e04 100644 --- a/sys/arch/sparc/include/eeprom.h +++ b/sys/arch/sparc/include/eeprom.h @@ -1,4 +1,4 @@ -/* $OpenBSD: eeprom.h,v 1.8 1997/11/11 12:50:53 niklas Exp $ */ +/* $OpenBSD: eeprom.h,v 1.9 2002/03/14 01:26:43 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -361,7 +361,7 @@ struct eeprom { #ifdef _KERNEL extern char *eeprom_va; -int eeprom_uio __P((struct uio *)); +int eeprom_uio(struct uio *); /* * Compatibility defines with NetBSD's eeprom.h. diff --git a/sys/arch/sparc/include/fbvar.h b/sys/arch/sparc/include/fbvar.h index a9491f2eda9..6ddf438f567 100644 --- a/sys/arch/sparc/include/fbvar.h +++ b/sys/arch/sparc/include/fbvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fbvar.h,v 1.4 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: fbvar.h,v 1.5 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: fbvar.h,v 1.9 1997/07/07 23:31:30 pk Exp $ */ /* @@ -56,11 +56,11 @@ struct fbdriver { /* device unblank function (force kernel output to display) */ - void (*fbd_unblank) __P((struct device *)); - int (*fbd_open) __P((dev_t, int, int, struct proc *)); - int (*fbd_close) __P((dev_t, int, int, struct proc *)); - int (*fbd_ioctl) __P((dev_t, u_long, caddr_t, int, struct proc *)); - paddr_t (*fbd_mmap) __P((dev_t, off_t, int)); + void (*fbd_unblank)(struct device *); + int (*fbd_open)(dev_t, int, int, struct proc *); + int (*fbd_close)(dev_t, int, int, struct proc *); + int (*fbd_ioctl)(dev_t, u_long, caddr_t, int, struct proc *); + paddr_t (*fbd_mmap)(dev_t, off_t, int); #ifdef notyet void (*fbd_wrrop)(); /* `write region' rasterop */ void (*fbd_cprop)(); /* `copy region' rasterop */ @@ -90,16 +90,16 @@ struct fbdevice { #endif }; -void fb_attach __P((struct fbdevice *, int)); -void fb_setsize __P((struct fbdevice *, int, int, int, int, int)); +void fb_attach(struct fbdevice *, int); +void fb_setsize(struct fbdevice *, int, int, int, int, int); #ifdef RASTERCONSOLE -void fbrcons_init __P((struct fbdevice *)); -int fbrcons_rows __P((void)); -int fbrcons_cols __P((void)); +void fbrcons_init(struct fbdevice *); +int fbrcons_rows(void); +int fbrcons_cols(void); #endif #if defined(SUN4) -int fb_pfour_id __P((void *)); -int fb_pfour_get_video __P((struct fbdevice *)); -void fb_pfour_set_video __P((struct fbdevice *, int)); +int fb_pfour_id(void *); +int fb_pfour_get_video(struct fbdevice *); +void fb_pfour_set_video(struct fbdevice *, int); #endif diff --git a/sys/arch/sparc/include/float.h b/sys/arch/sparc/include/float.h index 8a724573044..e6c33429deb 100644 --- a/sys/arch/sparc/include/float.h +++ b/sys/arch/sparc/include/float.h @@ -1,4 +1,4 @@ -/* $OpenBSD: float.h,v 1.3 1997/08/08 08:26:19 downsj Exp $ */ +/* $OpenBSD: float.h,v 1.4 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: float.h,v 1.6 1997/07/18 05:11:52 thorpej Exp $ */ /* @@ -51,7 +51,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/sparc/include/kbd.h b/sys/arch/sparc/include/kbd.h index f957a62d815..b42aea16183 100644 --- a/sys/arch/sparc/include/kbd.h +++ b/sys/arch/sparc/include/kbd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kbd.h,v 1.7 1999/08/21 20:31:39 maja Exp $ */ +/* $OpenBSD: kbd.h,v 1.8 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: kbd.h,v 1.6 1996/03/31 22:21:35 pk Exp $ */ /* @@ -164,8 +164,8 @@ void kbd_serial __P((struct tty *, void (*)(struct tty *), void (*)(struct tty *))); void ms_serial __P((struct tty *, void (*)(struct tty *), void (*)(struct tty *))); -void kbd_rint __P((int)); -void ms_rint __P((int)); -void kbd_ascii __P((struct tty *)); -int kbd_docmd __P((int, int)); +void kbd_rint(int); +void ms_rint(int); +void kbd_ascii(struct tty *); +int kbd_docmd(int, int); #endif diff --git a/sys/arch/sparc/include/oldmon.h b/sys/arch/sparc/include/oldmon.h index cd3288dcec2..0fc60a09c06 100644 --- a/sys/arch/sparc/include/oldmon.h +++ b/sys/arch/sparc/include/oldmon.h @@ -1,4 +1,4 @@ -/* $OpenBSD: oldmon.h,v 1.7 2001/08/08 13:48:21 art Exp $ */ +/* $OpenBSD: oldmon.h,v 1.8 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: oldmon.h,v 1.11 1996/03/31 22:21:38 pk Exp $ */ /* @@ -116,15 +116,12 @@ struct saioreq { */ struct om_boottable { char b_devname[2]; /* The name of the device */ - int (*b_probe) __P((void)); /* probe() --> -1 or found controller + int (*b_probe)(void); /* probe() --> -1 or found controller number */ - int (*b_boot) __P((void)); /* boot(bp) --> -1 or start address */ - int (*b_open) - __P((struct saioreq *));/* open(iobp) --> -1 or 0 */ - int (*b_close) - __P((struct saioreq *));/* close(iobp) --> -1 or 0 */ - int (*b_strategy) - __P((struct saioreq *, int));/* strategy(iobp,rw) --> -1 or 0 */ + int (*b_boot)(void); /* boot(bp) --> -1 or start address */ + int (*b_open)(struct saioreq *);/* open(iobp) --> -1 or 0 */ + int (*b_close)(struct saioreq *);/* close(iobp) --> -1 or 0 */ + int (*b_strategy)(struct saioreq *, int);/* strategy(iobp,rw) --> -1 or 0 */ char *b_desc; /* Printable string describing dev */ struct devinfo *b_devinfo; /* info to configure device. */ }; @@ -154,7 +151,7 @@ struct om_bootparam { */ struct om_vector { char *initSp; /* Initial system stack ptr for hardware */ - int (*startMon) __P((void));/* Initial PC for hardware */ + int (*startMon)(void);/* Initial PC for hardware */ int *diagberr; /* Bus err handler for diags */ /* Monitor and hardware revision and identification */ @@ -162,10 +159,10 @@ struct om_vector { u_long *memorySize; /* Usable memory in bytes */ /* Single-character input and output */ - int (*getChar) __P((void)); /* Get char from input source */ - void (*putChar) __P((int)); /* Put char to output sink */ - int (*mayGet) __P((void)); /* Maybe get char, or -1 */ - int (*mayPut) __P((int)); /* Maybe put char, or -1 */ + int (*getChar)(void); /* Get char from input source */ + void (*putChar)(int); /* Put char to output sink */ + int (*mayGet)(void); /* Maybe get char, or -1 */ + int (*mayPut)(int); /* Maybe put char, or -1 */ u_char *echo; /* Should getchar echo? */ u_char *inSource; /* Input source selector */ u_char *outSink; /* Output sink selector */ @@ -175,8 +172,8 @@ struct om_vector { #define PROMDEV_TTYB 2 /* in/out to ttyb */ /* Keyboard input (scanned by monitor nmi routine) */ - int (*getKey) __P((void)); /* Get next key if one exists */ - int (*initGetKey) __P((void));/* Initialize get key */ + int (*getKey)(void); /* Get next key if one exists */ + int (*initGetKey)(void);/* Initialize get key */ u_int *translation; /* Kbd translation selector */ u_char *keyBid; /* Keyboard ID byte */ int *screen_x; /* V2: Screen x pos (R/O) */ @@ -187,36 +184,36 @@ struct om_vector { char *monId; /* Frame buffer output and terminal emulation */ - int (*fbWriteChar) __P((void));/* Write a character to FB */ + int (*fbWriteChar)(void);/* Write a character to FB */ int *fbAddr; /* Address of frame buffer */ char **font; /* Font table for FB */ - void (*fbWriteStr) __P((char *, int)); + void (*fbWriteStr)(char *, int); /* Quickly write string to FB */ /* Reboot interface routine -- resets and reboots system. */ - void (*reBoot) __P((char *)); /* e.g. reBoot("xy()vmunix") */ + void (*reBoot)(char *); /* e.g. reBoot("xy()vmunix") */ /* Line input and parsing */ u_char *lineBuf; /* The line input buffer */ u_char **linePtr; /* Cur pointer into linebuf */ int *lineSize; /* length of line in linebuf */ - int (*getLine) __P((void)); /* Get line from user */ - u_char (*getNextChar) __P((void));/* Get next char from linebuf */ - u_char (*peekNextChar) __P((void));/* Peek at next char */ + int (*getLine)(void); /* Get line from user */ + u_char (*getNextChar)(void);/* Get next char from linebuf */ + u_char (*peekNextChar)(void);/* Peek at next char */ int *fbThere; /* =1 if frame buffer there */ - int (*getNum) __P((void)); /* Grab hex num from line */ + int (*getNum)(void); /* Grab hex num from line */ /* Print formatted output to current output sink */ - int (*printf) __P((void)); /* Similar to "Kernel printf" */ - int (*printHex) __P((void));/* Format N digits in hex */ + int (*printf)(void); /* Similar to "Kernel printf" */ + int (*printHex)(void);/* Format N digits in hex */ /* Led stuff */ u_char *leds; /* RAM copy of LED register */ - int (*setLeds) __P((void)); /* Sets LED's and RAM copy */ + int (*setLeds)(void); /* Sets LED's and RAM copy */ /* Non-maskable interrupt (nmi) information */ - int (*nmiAddr) __P((void)); /* Addr for level 7 vector */ - void (*abortEntry) __P((void));/* Entry for keyboard abort */ + int (*nmiAddr)(void); /* Addr for level 7 vector */ + void (*abortEntry)(void);/* Entry for keyboard abort */ int *nmiClock; /* Counts up in msec */ /* Frame buffer type: see <machine/fbio.h> */ @@ -234,11 +231,10 @@ struct om_vector { long *resetMap; /* pgmap entry for resetaddr */ /* Really struct pgmapent * */ - void (*exitToMon) __P((void)) __attribute__((__noreturn__));/* Exit from user program */ + void (*exitToMon)(void) __attribute__((__noreturn__));/* Exit from user program */ u_char **memorybitmap; /* V1: &{0 or &bits} */ - void (*setcxsegmap) /* Set seg in any context */ - __P((int, caddr_t, int)); - void (**vector_cmd) __P((u_long, char *));/* V2: Handler for 'v' cmd */ + void (*setcxsegmap) /* Set seg in any context */(int, caddr_t, int); + void (**vector_cmd)(u_long, char *);/* V2: Handler for 'v' cmd */ u_long *ExpectedTrapSig; u_long *TrapVectorTable; int dummy1z; @@ -306,8 +302,8 @@ struct saif { #if defined(SUN4) -void oldmon_w_trace __P((u_long)); -void oldmon_w_cmd __P((u_long, char *)); +void oldmon_w_trace(u_long); +void oldmon_w_cmd(u_long, char *); #endif #endif /* _MACHINE_OLDMON_H */ diff --git a/sys/arch/sparc/include/param.h b/sys/arch/sparc/include/param.h index 6cc039b0f4b..2772902ae78 100644 --- a/sys/arch/sparc/include/param.h +++ b/sys/arch/sparc/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.24 2002/03/13 00:24:21 miod Exp $ */ +/* $OpenBSD: param.h,v 1.25 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: param.h,v 1.29 1997/03/10 22:50:37 pk Exp $ */ /* @@ -165,12 +165,12 @@ extern vaddr_t dvma_base; extern vaddr_t dvma_end; extern struct extent *dvmamap_extent; -extern caddr_t kdvma_mapin __P((caddr_t, int, int)); -extern caddr_t dvma_malloc_space __P((size_t, void *, int, int)); -extern void dvma_free __P((caddr_t, size_t, void *)); +extern caddr_t kdvma_mapin(caddr_t, int, int); +extern caddr_t dvma_malloc_space(size_t, void *, int, int); +extern void dvma_free(caddr_t, size_t, void *); #define dvma_malloc(len,kaddr,flags) dvma_malloc_space(len,kaddr,flags,0) -extern void delay __P((unsigned int)); +extern void delay(unsigned int); #define DELAY(n) delay(n) extern int cputyp; diff --git a/sys/arch/sparc/include/pmap.h b/sys/arch/sparc/include/pmap.h index ff2f0d93710..abf6e162643 100644 --- a/sys/arch/sparc/include/pmap.h +++ b/sys/arch/sparc/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.30 2001/12/19 08:58:05 art Exp $ */ +/* $OpenBSD: pmap.h,v 1.31 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: pmap.h,v 1.30 1997/08/04 20:00:47 pk Exp $ */ /* @@ -260,8 +260,8 @@ extern struct pmap kernel_pmap_store; /* Encode IO space for pmap_enter() */ #define PMAP_IOENC(io) (CPU_ISSUN4M ? PMAP_IOENC_SRMMU(io) : PMAP_IOENC_4(io)) -int pmap_dumpsize __P((void)); -int pmap_dumpmmu __P((int (*)__P((dev_t, daddr_t, caddr_t, size_t)), +int pmap_dumpsize(void); +int pmap_dumpmmu __P((int (*)(dev_t, daddr_t, caddr_t, size_t), daddr_t)); #define pmap_kernel() (&kernel_pmap_store) @@ -276,37 +276,37 @@ int pmap_dumpmmu __P((int (*)__P((dev_t, daddr_t, caddr_t, size_t)), /* FUNCTION DECLARATIONS FOR COMMON PMAP MODULE */ struct proc; -void pmap_activate __P((struct proc *)); -void pmap_deactivate __P((struct proc *)); -void pmap_bootstrap __P((int nmmu, int nctx, int nregion)); -int pmap_count_ptes __P((struct pmap *)); -void pmap_prefer __P((vaddr_t, vaddr_t *)); -int pmap_pa_exists __P((paddr_t)); -void *pmap_bootstrap_alloc __P((int)); -void pmap_unwire __P((pmap_t, vaddr_t)); -void pmap_collect __P((pmap_t)); -void pmap_copy __P((pmap_t, pmap_t, vaddr_t, vsize_t, vaddr_t)); -pmap_t pmap_create __P((void)); -void pmap_destroy __P((pmap_t)); -void pmap_init __P((void)); -vaddr_t pmap_map __P((vaddr_t, paddr_t, paddr_t, int)); -vaddr_t pmap_phys_address __P((int)); -void pmap_pinit __P((pmap_t)); -void pmap_reference __P((pmap_t)); -void pmap_release __P((pmap_t)); -void pmap_remove __P((pmap_t, vaddr_t, vaddr_t)); -void pmap_init __P((void)); -int pmap_page_index __P((paddr_t)); -void pmap_virtual_space __P((vaddr_t *, vaddr_t *)); -void pmap_redzone __P((void)); -void kvm_setcache __P((caddr_t, int, int)); +void pmap_activate(struct proc *); +void pmap_deactivate(struct proc *); +void pmap_bootstrap(int nmmu, int nctx, int nregion); +int pmap_count_ptes(struct pmap *); +void pmap_prefer(vaddr_t, vaddr_t *); +int pmap_pa_exists(paddr_t); +void *pmap_bootstrap_alloc(int); +void pmap_unwire(pmap_t, vaddr_t); +void pmap_collect(pmap_t); +void pmap_copy(pmap_t, pmap_t, vaddr_t, vsize_t, vaddr_t); +pmap_t pmap_create(void); +void pmap_destroy(pmap_t); +void pmap_init(void); +vaddr_t pmap_map(vaddr_t, paddr_t, paddr_t, int); +vaddr_t pmap_phys_address(int); +void pmap_pinit(pmap_t); +void pmap_reference(pmap_t); +void pmap_release(pmap_t); +void pmap_remove(pmap_t, vaddr_t, vaddr_t); +void pmap_init(void); +int pmap_page_index(paddr_t); +void pmap_virtual_space(vaddr_t *, vaddr_t *); +void pmap_redzone(void); +void kvm_setcache(caddr_t, int, int); #define kvm_uncache(addr, npages) kvm_setcache(addr, npages, 0) #define kvm_recache(addr, npages) kvm_setcache(addr, npages, 1) -void pmap_cache_enable __P((void)); +void pmap_cache_enable(void); struct user; -void switchexit __P((struct proc *)); -int mmu_pagein __P((struct pmap *pm, vaddr_t, int)); -void pmap_writetext __P((unsigned char *, int)); +void switchexit(struct proc *); +int mmu_pagein(struct pmap *pm, vaddr_t, int); +void pmap_writetext(unsigned char *, int); #define pmap_update(pm) /* nothing */ #define pmap_copy(DP,SP,D,L,S) /* nothing */ @@ -314,37 +314,37 @@ void pmap_writetext __P((unsigned char *, int)); /* SUN4/SUN4C SPECIFIC DECLARATIONS */ #if defined(SUN4) || defined(SUN4C) -boolean_t pmap_clear_modify4_4c __P((struct vm_page *)); -boolean_t pmap_clear_reference4_4c __P((struct vm_page *)); -void pmap_copy_page4_4c __P((paddr_t, paddr_t)); -int pmap_enter4_4c __P((pmap_t, vaddr_t, paddr_t, vm_prot_t, int)); -boolean_t pmap_extract4_4c __P((pmap_t, vaddr_t, paddr_t *)); -boolean_t pmap_is_modified4_4c __P((struct vm_page *)); -boolean_t pmap_is_referenced4_4c __P((struct vm_page *)); -void pmap_kenter_pa4_4c __P((vaddr_t, paddr_t, vm_prot_t)); -void pmap_kremove4_4c __P((vaddr_t, vsize_t)); -void pmap_page_protect4_4c __P((struct vm_page *, vm_prot_t)); -void pmap_protect4_4c __P((pmap_t, vaddr_t, vaddr_t, vm_prot_t)); -void pmap_zero_page4_4c __P((paddr_t)); -void pmap_changeprot4_4c __P((pmap_t, vaddr_t, vm_prot_t, int)); +boolean_t pmap_clear_modify4_4c(struct vm_page *); +boolean_t pmap_clear_reference4_4c(struct vm_page *); +void pmap_copy_page4_4c(paddr_t, paddr_t); +int pmap_enter4_4c(pmap_t, vaddr_t, paddr_t, vm_prot_t, int); +boolean_t pmap_extract4_4c(pmap_t, vaddr_t, paddr_t *); +boolean_t pmap_is_modified4_4c(struct vm_page *); +boolean_t pmap_is_referenced4_4c(struct vm_page *); +void pmap_kenter_pa4_4c(vaddr_t, paddr_t, vm_prot_t); +void pmap_kremove4_4c(vaddr_t, vsize_t); +void pmap_page_protect4_4c(struct vm_page *, vm_prot_t); +void pmap_protect4_4c(pmap_t, vaddr_t, vaddr_t, vm_prot_t); +void pmap_zero_page4_4c(paddr_t); +void pmap_changeprot4_4c(pmap_t, vaddr_t, vm_prot_t, int); #endif /* SIMILAR DECLARATIONS FOR SUN4M MODULE */ #if defined(SUN4M) -boolean_t pmap_clear_modify4m __P((struct vm_page *)); -boolean_t pmap_clear_reference4m __P((struct vm_page *)); -void pmap_copy_page4m __P((paddr_t, paddr_t)); -int pmap_enter4m __P((pmap_t, vaddr_t, paddr_t, vm_prot_t, int)); -boolean_t pmap_extract4m __P((pmap_t, vaddr_t, paddr_t *)); -boolean_t pmap_is_modified4m __P((struct vm_page *)); -boolean_t pmap_is_referenced4m __P((struct vm_page *)); -void pmap_kenter_pa4m __P((vaddr_t, paddr_t, vm_prot_t)); -void pmap_kremove4m __P((vaddr_t, vsize_t)); -void pmap_page_protect4m __P((struct vm_page *, vm_prot_t)); -void pmap_protect4m __P((pmap_t, vaddr_t, vaddr_t, vm_prot_t)); -void pmap_zero_page4m __P((paddr_t)); -void pmap_changeprot4m __P((pmap_t, vaddr_t, vm_prot_t, int)); +boolean_t pmap_clear_modify4m(struct vm_page *); +boolean_t pmap_clear_reference4m(struct vm_page *); +void pmap_copy_page4m(paddr_t, paddr_t); +int pmap_enter4m(pmap_t, vaddr_t, paddr_t, vm_prot_t, int); +boolean_t pmap_extract4m(pmap_t, vaddr_t, paddr_t *); +boolean_t pmap_is_modified4m(struct vm_page *); +boolean_t pmap_is_referenced4m(struct vm_page *); +void pmap_kenter_pa4m(vaddr_t, paddr_t, vm_prot_t); +void pmap_kremove4m(vaddr_t, vsize_t); +void pmap_page_protect4m(struct vm_page *, vm_prot_t); +void pmap_protect4m(pmap_t, vaddr_t, vaddr_t, vm_prot_t); +void pmap_zero_page4m(paddr_t); +void pmap_changeprot4m(pmap_t, vaddr_t, vm_prot_t, int); #endif /* defined SUN4M */ #if !defined(SUN4M) && (defined(SUN4) || defined(SUN4C)) @@ -381,23 +381,23 @@ void pmap_changeprot4m __P((pmap_t, vaddr_t, vm_prot_t, int)); #else /* must use function pointers */ -extern boolean_t (*pmap_clear_modify_p) __P((struct vm_page *)); -extern boolean_t (*pmap_clear_reference_p) __P((struct vm_page *)); -extern void (*pmap_copy_page_p) __P((paddr_t, paddr_t)); -extern int (*pmap_enter_p) __P((pmap_t, vaddr_t, paddr_t, - vm_prot_t, int)); -extern boolean_t (*pmap_extract_p) __P((pmap_t, vaddr_t, paddr_t *)); -extern boolean_t (*pmap_is_modified_p) __P((struct vm_page *)); -extern boolean_t (*pmap_is_referenced_p) __P((struct vm_page *)); -extern void (*pmap_kenter_pa_p) __P((vaddr_t, paddr_t, vm_prot_t)); -extern void (*pmap_kremove_p) __P((vaddr_t, vsize_t)); -extern void (*pmap_page_protect_p) __P((struct vm_page *, - vm_prot_t)); -extern void (*pmap_protect_p) __P((pmap_t, vaddr_t, vaddr_t, - vm_prot_t)); -extern void (*pmap_zero_page_p) __P((paddr_t)); -extern void (*pmap_changeprot_p) __P((pmap_t, vaddr_t, - vm_prot_t, int)); +extern boolean_t (*pmap_clear_modify_p)(struct vm_page *); +extern boolean_t (*pmap_clear_reference_p)(struct vm_page *); +extern void (*pmap_copy_page_p)(paddr_t, paddr_t); +extern int (*pmap_enter_p)(pmap_t, vaddr_t, paddr_t, + vm_prot_t, int); +extern boolean_t (*pmap_extract_p)(pmap_t, vaddr_t, paddr_t *); +extern boolean_t (*pmap_is_modified_p)(struct vm_page *); +extern boolean_t (*pmap_is_referenced_p)(struct vm_page *); +extern void (*pmap_kenter_pa_p)(vaddr_t, paddr_t, vm_prot_t); +extern void (*pmap_kremove_p)(vaddr_t, vsize_t); +extern void (*pmap_page_protect_p)(struct vm_page *, + vm_prot_t); +extern void (*pmap_protect_p)(pmap_t, vaddr_t, vaddr_t, + vm_prot_t); +extern void (*pmap_zero_page_p)(paddr_t); +extern void (*pmap_changeprot_p)(pmap_t, vaddr_t, + vm_prot_t, int); #define pmap_clear_modify (*pmap_clear_modify_p) #define pmap_clear_reference (*pmap_clear_reference_p) diff --git a/sys/arch/sparc/include/psl.h b/sys/arch/sparc/include/psl.h index 8959f9f1072..11ee3b022b2 100644 --- a/sys/arch/sparc/include/psl.h +++ b/sys/arch/sparc/include/psl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psl.h,v 1.8 2001/12/19 08:58:05 art Exp $ */ +/* $OpenBSD: psl.h,v 1.9 2002/03/14 01:26:43 millert Exp $ */ /* $NetBSD: psl.h,v 1.12 1997/03/10 21:49:11 pk Exp $ */ /* @@ -80,12 +80,12 @@ #if defined(_KERNEL) && !defined(_LOCORE) -static __inline int getpsr __P((void)); -static __inline void setpsr __P((int)); -static __inline int spl0 __P((void)); -static __inline int splhigh __P((void)); -static __inline void splx __P((int)); -static __inline int getmid __P((void)); +static __inline int getpsr(void); +static __inline void setpsr(int); +static __inline int spl0(void); +static __inline int splhigh(void); +static __inline void splx(int); +static __inline int getmid(void); /* * GCC pseudo-functions for manipulating PSR (primarily PIL field). @@ -142,7 +142,7 @@ static __inline int spl0() * into the ipl field.) */ #define SPL(name, newipl) \ -static __inline int name __P((void)); \ +static __inline int name(void); \ static __inline int name() \ { \ int psr, oldipl; \ @@ -156,7 +156,7 @@ static __inline int name() \ } /* A non-priority-decreasing version of SPL */ #define SPLHOLD(name, newipl) \ -static __inline int name __P((void)); \ +static __inline int name(void); \ static __inline int name() \ { \ int psr, oldipl; \ diff --git a/sys/arch/sparc/include/sun_disklabel.h b/sys/arch/sparc/include/sun_disklabel.h index a137ae3e34d..234051e21ed 100644 --- a/sys/arch/sparc/include/sun_disklabel.h +++ b/sys/arch/sparc/include/sun_disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sun_disklabel.h,v 1.7 2002/01/23 19:16:09 fgsch Exp $ */ +/* $OpenBSD: sun_disklabel.h,v 1.8 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: sun_disklabel.h,v 1.6 1996/01/07 22:03:09 thorpej Exp $ */ /* @@ -115,8 +115,8 @@ struct sun_disklabel { /* total size = 512 bytes */ #ifdef _KERNEL /* reads sun label in sector at [cp..cp+511] and sets *lp to BSD label */ -int sun_disklabel __P((caddr_t, struct disklabel *)); /* true on success */ +int sun_disklabel(caddr_t, struct disklabel *); /* true on success */ /* compatibility dk ioctl's */ -int sun_dkioctl __P((struct disk *, u_long, caddr_t, int)); +int sun_dkioctl(struct disk *, u_long, caddr_t, int); #endif diff --git a/sys/arch/sparc/include/svr4_machdep.h b/sys/arch/sparc/include/svr4_machdep.h index a4984efdc72..77b8e9b8251 100644 --- a/sys/arch/sparc/include/svr4_machdep.h +++ b/sys/arch/sparc/include/svr4_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: svr4_machdep.h,v 1.6 1997/08/08 08:26:50 downsj Exp $ */ +/* $OpenBSD: svr4_machdep.h,v 1.7 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: svr4_machdep.h,v 1.4 1996/03/31 22:21:45 pk Exp $ */ /* @@ -99,11 +99,11 @@ typedef struct { struct svr4_ucontext; -void svr4_getcontext __P((struct proc *, struct svr4_ucontext *, - int, int)); -int svr4_setcontext __P((struct proc *p, struct svr4_ucontext *)); -void svr4_sendsig __P((sig_t, int, int, u_long, int, union sigval)); -int svr4_trap __P((int, struct proc *)); +void svr4_getcontext(struct proc *, struct svr4_ucontext *, + int, int); +int svr4_setcontext(struct proc *p, struct svr4_ucontext *); +void svr4_sendsig(sig_t, int, int, u_long, int, union sigval); +int svr4_trap(int, struct proc *); /* * Processor traps diff --git a/sys/arch/sparc/include/vmparam.h b/sys/arch/sparc/include/vmparam.h index 20feed1b633..2c36e5edec3 100644 --- a/sys/arch/sparc/include/vmparam.h +++ b/sys/arch/sparc/include/vmparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmparam.h,v 1.23 2002/02/17 22:59:53 maja Exp $ */ +/* $OpenBSD: vmparam.h,v 1.24 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: vmparam.h,v 1.13 1997/07/12 16:20:03 perry Exp $ */ /* @@ -127,8 +127,8 @@ struct pmap_physseg { #if defined (_KERNEL) && !defined(_LOCORE) struct vm_map; #define dvma_mapin(map,va,len,canwait) dvma_mapin_space(map,va,len,canwait,0) -vaddr_t dvma_mapin_space __P((struct vm_map *, vaddr_t, int, int, int)); -void dvma_mapout __P((vaddr_t, vaddr_t, int)); +vaddr_t dvma_mapin_space(struct vm_map *, vaddr_t, int, int, int); +void dvma_mapout(vaddr_t, vaddr_t, int); #endif #endif /* _SPARC_VMPARAM_H_ */ diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c index c9ba0bc7899..39355f676db 100644 --- a/sys/arch/sparc/sparc/autoconf.c +++ b/sys/arch/sparc/sparc/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.48 2002/02/15 20:45:30 nordin Exp $ */ +/* $OpenBSD: autoconf.c,v 1.49 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: autoconf.c,v 1.73 1997/07/29 09:41:53 fair Exp $ */ /* @@ -104,26 +104,26 @@ extern int kgdb_debug_panic; #endif static int rootnode; -void setroot __P((void)); -static char *str2hex __P((char *, int *)); -static int getstr __P((char *, int)); -int findblkmajor __P((struct device *)); -char *findblkname __P((int)); -static struct device *getdisk __P((char *, int, int, dev_t *)); -static int mbprint __P((void *, const char *)); -static void crazymap __P((char *, int *)); -int st_crazymap __P((int)); -void swapconf __P((void)); -void sync_crash __P((void)); -int mainbus_match __P((struct device *, void *, void *)); -static void mainbus_attach __P((struct device *, struct device *, void *)); +void setroot(void); +static char *str2hex(char *, int *); +static int getstr(char *, int); +int findblkmajor(struct device *); +char *findblkname(int); +static struct device *getdisk(char *, int, int, dev_t *); +static int mbprint(void *, const char *); +static void crazymap(char *, int *); +int st_crazymap(int); +void swapconf(void); +void sync_crash(void); +int mainbus_match(struct device *, void *, void *); +static void mainbus_attach(struct device *, struct device *, void *); struct bootpath bootpath[8]; int nbootpath; -static void bootpath_build __P((void)); -static void bootpath_fake __P((struct bootpath *, char *)); -static void bootpath_print __P((struct bootpath *)); -int search_prom __P((int, char *)); +static void bootpath_build(void); +static void bootpath_fake(struct bootpath *, char *); +static void bootpath_print(struct bootpath *); +int search_prom(int, char *); char mainbus_model[30]; /* @@ -134,7 +134,7 @@ char mainbus_model[30]; struct mountroot_hook { LIST_ENTRY(mountroot_hook) mr_link; struct device *mr_device; - void (*mr_func) __P((struct device *)); + void (*mr_func)(struct device *); }; LIST_HEAD(, mountroot_hook) mrh_list; @@ -202,7 +202,7 @@ bootstrap() { #if defined(SUN4) if (CPU_ISSUN4) { - extern void oldmon_w_cmd __P((u_long, char *)); + extern void oldmon_w_cmd(u_long, char *); /* * XXX: @@ -272,7 +272,7 @@ bootstrap() struct romaux ra; register u_int pte; register int i; - extern void setpte4m __P((u_int, u_int)); + extern void setpte4m(u_int, u_int); extern struct timer_4m *timerreg_4m; extern struct counter_4m *counterreg_4m; @@ -1586,7 +1586,7 @@ nextsibling(node) return (promvec->pv_nodeops->no_nextnode(node)); } -u_int hexatoi __P((const char *)); +u_int hexatoi(const char *); /* The following recursively searches a PROM tree for a given node */ int @@ -1853,7 +1853,7 @@ parsedisk(str, len, defpart, devp) void mountroot_hook_establish(func, dev) - void (*func) __P((struct device *)); + void (*func)(struct device *); struct device *dev; { struct mountroot_hook *mrhp; diff --git a/sys/arch/sparc/sparc/auxioreg.h b/sys/arch/sparc/sparc/auxioreg.h index 82dc31b45b4..751cd09c3fa 100644 --- a/sys/arch/sparc/sparc/auxioreg.h +++ b/sys/arch/sparc/sparc/auxioreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: auxioreg.h,v 1.1 1997/08/25 08:38:46 downsj Exp $ */ +/* $OpenBSD: auxioreg.h,v 1.2 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: auxreg.h,v 1.7 1997/05/17 17:52:52 pk Exp $ */ /* @@ -125,6 +125,6 @@ #ifndef _LOCORE volatile u_char *auxio_reg; /* Copy of AUXIO_REG */ u_char auxio_regval; -unsigned int auxregbisc __P((int, int)); +unsigned int auxregbisc(int, int); #endif diff --git a/sys/arch/sparc/sparc/auxreg.c b/sys/arch/sparc/sparc/auxreg.c index 7728814a834..27d3c4ce681 100644 --- a/sys/arch/sparc/sparc/auxreg.c +++ b/sys/arch/sparc/sparc/auxreg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auxreg.c,v 1.8 2000/07/19 15:31:26 art Exp $ */ +/* $OpenBSD: auxreg.c,v 1.9 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: auxreg.c,v 1.21 1997/05/24 20:15:59 pk Exp $ */ /* @@ -56,8 +56,8 @@ #include <sparc/sparc/vaddrs.h> #include <sparc/sparc/auxioreg.h> -static int auxregmatch __P((struct device *, void *, void *)); -static void auxregattach __P((struct device *, struct device *, void *)); +static int auxregmatch(struct device *, void *, void *); +static void auxregattach(struct device *, struct device *, void *); struct cfattach auxreg_ca = { sizeof(struct device), auxregmatch, auxregattach diff --git a/sys/arch/sparc/sparc/cache.h b/sys/arch/sparc/sparc/cache.h index e4c58416831..9c0accc6c82 100644 --- a/sys/arch/sparc/sparc/cache.h +++ b/sys/arch/sparc/sparc/cache.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cache.h,v 1.6 2001/12/19 08:58:05 art Exp $ */ +/* $OpenBSD: cache.h,v 1.7 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: cache.h,v 1.16 1997/07/06 21:15:14 pk Exp $ */ /* @@ -150,55 +150,55 @@ extern int cache_alias_bits; /* * Routines for dealing with the cache. */ -void sun4_cache_enable __P((void)); /* turn it on */ -void ms1_cache_enable __P((void)); /* turn it on */ -void viking_cache_enable __P((void)); /* turn it on */ -void hypersparc_cache_enable __P((void)); /* turn it on */ -void swift_cache_enable __P((void)); /* turn it on */ -void cypress_cache_enable __P((void)); /* turn it on */ -void turbosparc_cache_enable __P((void)); /* turn it on */ +void sun4_cache_enable(void); /* turn it on */ +void ms1_cache_enable(void); /* turn it on */ +void viking_cache_enable(void); /* turn it on */ +void hypersparc_cache_enable(void); /* turn it on */ +void swift_cache_enable(void); /* turn it on */ +void cypress_cache_enable(void); /* turn it on */ +void turbosparc_cache_enable(void); /* turn it on */ -void sun4_vcache_flush_context __P((void)); /* flush current context */ -void sun4_vcache_flush_region __P((int)); /* flush region in cur ctx */ -void sun4_vcache_flush_segment __P((int, int));/* flush seg in cur ctx */ -void sun4_vcache_flush_page __P((int va)); /* flush page in cur ctx */ -void sun4_cache_flush __P((caddr_t, u_int));/* flush region */ +void sun4_vcache_flush_context(void); /* flush current context */ +void sun4_vcache_flush_region(int); /* flush region in cur ctx */ +void sun4_vcache_flush_segment(int, int);/* flush seg in cur ctx */ +void sun4_vcache_flush_page(int va); /* flush page in cur ctx */ +void sun4_cache_flush(caddr_t, u_int);/* flush region */ -void srmmu_vcache_flush_context __P((void)); /* flush current context */ -void srmmu_vcache_flush_region __P((int)); /* flush region in cur ctx */ -void srmmu_vcache_flush_segment __P((int, int));/* flush seg in cur ctx */ -void srmmu_vcache_flush_page __P((int va)); /* flush page in cur ctx */ -void srmmu_cache_flush __P((caddr_t, u_int));/* flush region */ -void hypersparc_pure_vcache_flush __P((void)); +void srmmu_vcache_flush_context(void); /* flush current context */ +void srmmu_vcache_flush_region(int); /* flush region in cur ctx */ +void srmmu_vcache_flush_segment(int, int);/* flush seg in cur ctx */ +void srmmu_vcache_flush_page(int va); /* flush page in cur ctx */ +void srmmu_cache_flush(caddr_t, u_int);/* flush region */ +void hypersparc_pure_vcache_flush(void); -void ms1_cache_flush_all __P((void)); -void srmmu_cache_flush_all __P((void)); -void cypress_cache_flush_all __P((void)); -void hypersparc_cache_flush_all __P((void)); +void ms1_cache_flush_all(void); +void srmmu_cache_flush_all(void); +void cypress_cache_flush_all(void); +void hypersparc_cache_flush_all(void); -void ms1_cache_flush __P((caddr_t, u_int)); -void viking_cache_flush __P((caddr_t, u_int)); -void viking_pcache_flush_line __P((int, int)); -void srmmu_pcache_flush_line __P((int, int)); +void ms1_cache_flush(caddr_t, u_int); +void viking_cache_flush(caddr_t, u_int); +void viking_pcache_flush_line(int, int); +void srmmu_pcache_flush_line(int, int); -extern void sparc_noop __P((void)); +extern void sparc_noop(void); #define noop_vcache_flush_context \ - (void (*)__P((void))) sparc_noop + (void (*)(void)) sparc_noop #define noop_vcache_flush_region \ - (void (*)__P((int))) sparc_noop + (void (*)(int)) sparc_noop #define noop_vcache_flush_segment \ - (void (*)__P((int,int))) sparc_noop + (void (*)(int,int)) sparc_noop #define noop_vcache_flush_page \ - (void (*)__P((int))) sparc_noop + (void (*)(int)) sparc_noop #define noop_cache_flush \ - (void (*)__P((caddr_t, u_int))) sparc_noop + (void (*)(caddr_t, u_int)) sparc_noop #define noop_pcache_flush_line \ - (void (*)__P((int, int))) sparc_noop + (void (*)(int, int)) sparc_noop #define noop_pure_vcache_flush \ - (void (*)__P((void))) sparc_noop + (void (*)(void)) sparc_noop #define noop_cache_flush_all \ - (void (*)__P((void))) sparc_noop + (void (*)(void)) sparc_noop #define cache_flush_page(va) cpuinfo.vcache_flush_page(va) #define cache_flush_segment(vr,vs) cpuinfo.vcache_flush_segment(vr,vs) diff --git a/sys/arch/sparc/sparc/clock.c b/sys/arch/sparc/sparc/clock.c index 68a5bdc0bcd..380e9c6b3ae 100644 --- a/sys/arch/sparc/sparc/clock.c +++ b/sys/arch/sparc/sparc/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.15 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: clock.c,v 1.16 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: clock.c,v 1.52 1997/05/24 20:16:05 pk Exp $ */ /* @@ -121,16 +121,16 @@ extern struct idprom idprom; static int oldclk = 0; struct intersil7170 *i7; -long oclk_get_secs __P((void)); -void oclk_get_dt __P((struct intersil_dt *)); -void dt_to_gmt __P((struct intersil_dt *, long *)); -void oclk_set_dt __P((struct intersil_dt *)); -void oclk_set_secs __P((long)); -void gmt_to_dt __P((long *, struct intersil_dt *)); +long oclk_get_secs(void); +void oclk_get_dt(struct intersil_dt *); +void dt_to_gmt(struct intersil_dt *, long *); +void oclk_set_dt(struct intersil_dt *); +void oclk_set_secs(long); +void gmt_to_dt(long *, struct intersil_dt *); #endif -int oclockmatch __P((struct device *, void *, void *)); -void oclockattach __P((struct device *, struct device *, void *)); +int oclockmatch(struct device *, void *, void *); +void oclockattach(struct device *, struct device *, void *); struct cfattach oclock_ca = { sizeof(struct device), oclockmatch, oclockattach @@ -154,13 +154,13 @@ char *eeprom_va = NULL; static int eeprom_busy = 0; static int eeprom_wanted = 0; static int eeprom_nvram = 0; /* non-zero if eeprom is on Mostek */ -int eeprom_take __P((void)); -void eeprom_give __P((void)); -int eeprom_update __P((char *, int, int)); +int eeprom_take(void); +void eeprom_give(void); +int eeprom_update(char *, int, int); #endif -int eeprom_match __P((struct device *, void *, void *)); -void eeprom_attach __P((struct device *, struct device *, void *)); +int eeprom_match(struct device *, void *, void *); +void eeprom_attach(struct device *, struct device *, void *); struct cfattach eeprom_ca = { sizeof(struct device), eeprom_match, eeprom_attach @@ -170,8 +170,8 @@ struct cfdriver eeprom_cd = { NULL, "eeprom", DV_DULL }; -int clockmatch __P((struct device *, void *, void *)); -void clockattach __P((struct device *, struct device *, void *)); +int clockmatch(struct device *, void *, void *); +void clockattach(struct device *, struct device *, void *); struct cfattach clock_ca = { sizeof(struct device), clockmatch, clockattach @@ -181,8 +181,8 @@ struct cfdriver clock_cd = { NULL, "clock", DV_DULL }; -int timermatch __P((struct device *, void *, void *)); -void timerattach __P((struct device *, struct device *, void *)); +int timermatch(struct device *, void *, void *); +void timerattach(struct device *, struct device *, void *); struct timer_4m *timerreg_4m; /* XXX - need more cleanup */ struct counter_4m *counterreg_4m; @@ -197,10 +197,10 @@ struct cfdriver timer_cd = { }; struct chiptime; -void clk_wenable __P((int)); -void myetheraddr __P((u_char *)); -int chiptotime __P((int, int, int, int, int, int)); -void timetochip __P((struct chiptime *)); +void clk_wenable(int); +void myetheraddr(u_char *); +int chiptotime(int, int, int, int, int, int); +void timetochip(struct chiptime *); int timerblurb = 10; /* Guess a value; used before clock is attached */ diff --git a/sys/arch/sparc/sparc/cpu.c b/sys/arch/sparc/sparc/cpu.c index e2662c99a49..c32239bfdce 100644 --- a/sys/arch/sparc/sparc/cpu.c +++ b/sys/arch/sparc/sparc/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.36 2001/12/19 08:58:05 art Exp $ */ +/* $OpenBSD: cpu.c,v 1.37 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: cpu.c,v 1.56 1997/09/15 20:52:36 pk Exp $ */ /* @@ -84,8 +84,8 @@ extern char mainbus_model[]; /* from autoconf.c */ int foundfpu; /* from machine/cpu.h */ /* The CPU configuration driver. */ -void cpu_attach __P((struct device *, struct device *, void *)); -int cpu_match __P((struct device *, void *, void *)); +void cpu_attach(struct device *, struct device *, void *); +int cpu_match(struct device *, void *, void *); struct cfattach cpu_ca = { sizeof(struct cpu_softc), cpu_match, cpu_attach @@ -95,11 +95,11 @@ struct cfdriver cpu_cd = { NULL, "cpu", DV_CPU }; -char *fsrtoname __P((int, int, int, char *)); -void cache_print __P((struct cpu_softc *)); -void cpu_spinup __P((struct cpu_softc *)); -void fpu_init __P((struct cpu_softc *)); -void replacemul __P((void)); +char *fsrtoname(int, int, int, char *); +void cache_print(struct cpu_softc *); +void cpu_spinup(struct cpu_softc *); +void fpu_init(struct cpu_softc *); +void replacemul(void); #define IU_IMPL(psr) ((u_int)(psr) >> 28) #define IU_VERS(psr) (((psr) >> 24) & 0xf) @@ -358,40 +358,40 @@ cache_print(sc) /*------------*/ -void cpumatch_unknown __P((struct cpu_softc *, struct module_info *, int)); -void cpumatch_sun4 __P((struct cpu_softc *, struct module_info *, int)); -void cpumatch_sun4c __P((struct cpu_softc *, struct module_info *, int)); -void cpumatch_ms __P((struct cpu_softc *, struct module_info *, int)); -void cpumatch_viking __P((struct cpu_softc *, struct module_info *, int)); -void cpumatch_hypersparc __P((struct cpu_softc *, struct module_info *, int)); -void cpumatch_turbosparc __P((struct cpu_softc *, struct module_info *, int)); - -void getcacheinfo_sun4 __P((struct cpu_softc *, int node)); -void getcacheinfo_sun4c __P((struct cpu_softc *, int node)); -void getcacheinfo_obp __P((struct cpu_softc *, int node)); - -void sun4_hotfix __P((struct cpu_softc *)); -void viking_hotfix __P((struct cpu_softc *)); -void turbosparc_hotfix __P((struct cpu_softc *)); -void swift_hotfix __P((struct cpu_softc *)); - -void ms1_mmu_enable __P((void)); -void viking_mmu_enable __P((void)); -void swift_mmu_enable __P((void)); -void hypersparc_mmu_enable __P((void)); - -void srmmu_get_syncflt __P((void)); -void ms1_get_syncflt __P((void)); -void viking_get_syncflt __P((void)); -void swift_get_syncflt __P((void)); -void turbosparc_get_syncflt __P((void)); -void hypersparc_get_syncflt __P((void)); -void cypress_get_syncflt __P((void)); - -int srmmu_get_asyncflt __P((u_int *, u_int *)); -int hypersparc_get_asyncflt __P((u_int *, u_int *)); -int cypress_get_asyncflt __P((u_int *, u_int *)); -int no_asyncflt_regs __P((u_int *, u_int *)); +void cpumatch_unknown(struct cpu_softc *, struct module_info *, int); +void cpumatch_sun4(struct cpu_softc *, struct module_info *, int); +void cpumatch_sun4c(struct cpu_softc *, struct module_info *, int); +void cpumatch_ms(struct cpu_softc *, struct module_info *, int); +void cpumatch_viking(struct cpu_softc *, struct module_info *, int); +void cpumatch_hypersparc(struct cpu_softc *, struct module_info *, int); +void cpumatch_turbosparc(struct cpu_softc *, struct module_info *, int); + +void getcacheinfo_sun4(struct cpu_softc *, int node); +void getcacheinfo_sun4c(struct cpu_softc *, int node); +void getcacheinfo_obp(struct cpu_softc *, int node); + +void sun4_hotfix(struct cpu_softc *); +void viking_hotfix(struct cpu_softc *); +void turbosparc_hotfix(struct cpu_softc *); +void swift_hotfix(struct cpu_softc *); + +void ms1_mmu_enable(void); +void viking_mmu_enable(void); +void swift_mmu_enable(void); +void hypersparc_mmu_enable(void); + +void srmmu_get_syncflt(void); +void ms1_get_syncflt(void); +void viking_get_syncflt(void); +void swift_get_syncflt(void); +void turbosparc_get_syncflt(void); +void hypersparc_get_syncflt(void); +void cypress_get_syncflt(void); + +int srmmu_get_asyncflt(u_int *, u_int *); +int hypersparc_get_asyncflt(u_int *, u_int *); +int cypress_get_asyncflt(u_int *, u_int *); +int no_asyncflt_regs(u_int *, u_int *); struct module_info module_unknown = { CPUTYP_UNKNOWN, @@ -491,7 +491,7 @@ getcacheinfo_sun4(sc, node) } struct idprom idprom; -void getidprom __P((struct idprom *, int size)); +void getidprom(struct idprom *, int size); void cpumatch_sun4(sc, mp, node) diff --git a/sys/arch/sparc/sparc/cpuvar.h b/sys/arch/sparc/sparc/cpuvar.h index fc6e4de2778..86a39b6d872 100644 --- a/sys/arch/sparc/sparc/cpuvar.h +++ b/sys/arch/sparc/sparc/cpuvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpuvar.h,v 1.7 2001/12/19 08:58:05 art Exp $ */ +/* $OpenBSD: cpuvar.h,v 1.8 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: cpuvar.h,v 1.4 1997/07/06 21:14:25 pk Exp $ */ /* @@ -56,24 +56,24 @@ struct cpu_softc; struct module_info { int cpu_type; enum vactype vactype; - void (*cpu_match) __P((struct cpu_softc *, struct module_info *, int)); - void (*getcacheinfo) __P((struct cpu_softc *sc, int node)); - void (*hotfix) __P((struct cpu_softc *)); - void (*mmu_enable) __P((void)); - void (*cache_enable) __P((void)); + void (*cpu_match)(struct cpu_softc *, struct module_info *, int); + void (*getcacheinfo)(struct cpu_softc *sc, int node); + void (*hotfix)(struct cpu_softc *); + void (*mmu_enable)(void); + void (*cache_enable)(void); int ncontext; /* max. # of contexts (we use) */ - void (*get_syncflt) __P((void)); - int (*get_asyncflt) __P((u_int *, u_int *)); - void (*cache_flush) __P((caddr_t, u_int)); - void (*vcache_flush_page) __P((int)); - void (*vcache_flush_segment) __P((int, int)); - void (*vcache_flush_region) __P((int)); - void (*vcache_flush_context) __P((void)); - void (*pcache_flush_line) __P((int, int)); - void (*pure_vcache_flush) __P((void)); - void (*cache_flush_all)__P((void)); - void (*memerr) __P((unsigned, u_int, u_int, struct trapframe *)); + void (*get_syncflt)(void); + int (*get_asyncflt)(u_int *, u_int *); + void (*cache_flush)(caddr_t, u_int); + void (*vcache_flush_page)(int); + void (*vcache_flush_segment)(int, int); + void (*vcache_flush_region)(int); + void (*vcache_flush_context)(void); + void (*pcache_flush_line)(int, int); + void (*pure_vcache_flush)(void); + void (*cache_flush_all)(void); + void (*memerr)(unsigned, u_int, u_int, struct trapframe *); }; @@ -160,15 +160,15 @@ struct cpu_softc { */ /* bootup things: access to physical memory */ - u_int (*read_physmem) __P((u_int addr, int space)); - void (*write_physmem) __P((u_int addr, u_int data)); - void (*cache_tablewalks) __P((void)); - void (*mmu_enable) __P((void)); - void (*hotfix) __P((struct cpu_softc *)); + u_int (*read_physmem)(u_int addr, int space); + void (*write_physmem)(u_int addr, u_int data); + void (*cache_tablewalks)(void); + void (*mmu_enable)(void); + void (*hotfix)(struct cpu_softc *); /* locore defined: */ - void (*get_syncflt) __P((void)); /* Not C-callable */ - int (*get_asyncflt) __P((u_int *, u_int *)); + void (*get_syncflt)(void); /* Not C-callable */ + int (*get_asyncflt)(u_int *, u_int *); /* Synchronous Fault Status; temporary storage */ struct { @@ -177,31 +177,30 @@ struct cpu_softc { } syncfltdump; /* Cache handling functions */ - void (*cache_enable) __P((void)); - void (*cache_flush)__P((caddr_t, u_int)); - void (*vcache_flush_page)__P((int)); - void (*vcache_flush_segment)__P((int, int)); - void (*vcache_flush_region)__P((int)); - void (*vcache_flush_context)__P((void)); - void (*pcache_flush_line)__P((int, int)); - void (*pure_vcache_flush) __P((void)); - void (*cache_flush_all)__P((void)); + void (*cache_enable)(void); + void (*cache_flush)(caddr_t, u_int); + void (*vcache_flush_page)(int); + void (*vcache_flush_segment)(int, int); + void (*vcache_flush_region)(int); + void (*vcache_flush_context)(void); + void (*pcache_flush_line)(int, int); + void (*pure_vcache_flush)(void); + void (*cache_flush_all)(void); #ifdef SUN4M /* hardware-assisted block operation routines */ - void (*hwbcopy) - __P((const void *from, void *to, size_t len)); - void (*hwbzero) __P((void *buf, size_t len)); + void (*hwbcopy)(const void *from, void *to, size_t len); + void (*hwbzero)(void *buf, size_t len); /* routine to clear mbus-sbus buffers */ - void (*mbusflush) __P((void)); + void (*mbusflush)(void); #endif /* * Memory error handler; parity errors, unhandled NMIs and other * unrecoverable faults end up here. */ - void (*memerr)__P((unsigned, u_int, u_int, struct trapframe *)); + void (*memerr)(unsigned, u_int, u_int, struct trapframe *); /* XXX: Add more here! */ }; @@ -281,9 +280,9 @@ struct cpu_softc { /* * Related function prototypes */ -void getcpuinfo __P((struct cpu_softc *sc, int node)); -void mmu_install_tables __P((struct cpu_softc *)); -void pmap_alloc_cpu __P((struct cpu_softc *)); +void getcpuinfo(struct cpu_softc *sc, int node); +void mmu_install_tables(struct cpu_softc *); +void pmap_alloc_cpu(struct cpu_softc *); #define cpuinfo (*(struct cpu_softc *)CPUINFO_VA) #endif /* _SPARC_CPUVAR_H */ diff --git a/sys/arch/sparc/sparc/db_interface.c b/sys/arch/sparc/sparc/db_interface.c index 378063f2434..81e696a9536 100644 --- a/sys/arch/sparc/sparc/db_interface.c +++ b/sys/arch/sparc/sparc/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.9 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: db_interface.c,v 1.10 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: db_interface.c,v 1.18 1997/09/01 00:16:31 pk Exp $ */ /* @@ -159,8 +159,8 @@ int db_active = 0; extern char *trap_type[]; -void kdb_kbd_trap __P((struct trapframe *)); -void db_prom_cmd __P((db_expr_t, int, db_expr_t, char *)); +void kdb_kbd_trap(struct trapframe *); +void db_prom_cmd(db_expr_t, int, db_expr_t, char *); /* * Received keyboard interrupt sequence. diff --git a/sys/arch/sparc/sparc/disksubr.c b/sys/arch/sparc/sparc/disksubr.c index ba941b0bc80..e0825040fa7 100644 --- a/sys/arch/sparc/sparc/disksubr.c +++ b/sys/arch/sparc/sparc/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.26 2001/10/15 04:03:45 jason Exp $ */ +/* $OpenBSD: disksubr.c,v 1.27 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: disksubr.c,v 1.16 1996/04/28 20:25:59 thorpej Exp $ */ /* @@ -58,9 +58,9 @@ #warn beware: Sun disklabel compatibility assumes MAXPARTITIONS == 16 #endif -static char *disklabel_sun_to_bsd __P((char *, struct disklabel *)); -static int disklabel_bsd_to_sun __P((struct disklabel *, char *)); -static __inline u_long sun_extended_sum __P((struct sun_disklabel *)); +static char *disklabel_sun_to_bsd(char *, struct disklabel *); +static int disklabel_bsd_to_sun(struct disklabel *, char *); +static __inline u_long sun_extended_sum(struct sun_disklabel *); #define b_cylin b_resid @@ -122,7 +122,7 @@ dk_establish(dk, dev) #if NCD > 0 /* XXX for comparison below. */ -extern void cdstrategy __P((struct buf *)); +extern void cdstrategy(struct buf *); #endif /* @@ -140,7 +140,7 @@ extern void cdstrategy __P((struct buf *)); char * readdisklabel(dev, strat, lp, clp, spoofonly) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *clp; int spoofonly; @@ -268,7 +268,7 @@ setdisklabel(olp, nlp, openmask, clp) int writedisklabel(dev, strat, lp, clp) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); register struct disklabel *lp; struct cpu_disklabel *clp; { diff --git a/sys/arch/sparc/sparc/emul.c b/sys/arch/sparc/sparc/emul.c index a591bd9d04c..b8cd88b5e3e 100644 --- a/sys/arch/sparc/sparc/emul.c +++ b/sys/arch/sparc/sparc/emul.c @@ -1,4 +1,4 @@ -/* $OpenBSD: emul.c,v 1.2 2000/02/21 21:05:59 art Exp $ */ +/* $OpenBSD: emul.c,v 1.3 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: emul.c,v 1.3 1997/07/29 09:42:01 fair Exp $ */ /* @@ -49,13 +49,13 @@ #define IPR(tf, i) ((int32_t *) tf->tf_out[6])[i - 16] #define FPR(p, i) ((int32_t) p->p_md.md_fpstate->fs_regs[i]) -static __inline int readgpreg __P((struct trapframe *, int, void *)); -static __inline int readfpreg __P((struct proc *, int, void *)); -static __inline int writegpreg __P((struct trapframe *, int, const void *)); -static __inline int writefpreg __P((struct proc *, int, const void *)); -static __inline int decodeaddr __P((struct trapframe *, union instr *, void *)); -static int muldiv __P((struct trapframe *, union instr *, int32_t *, int32_t *, - int32_t *)); +static __inline int readgpreg(struct trapframe *, int, void *); +static __inline int readfpreg(struct proc *, int, void *); +static __inline int writegpreg(struct trapframe *, int, const void *); +static __inline int writefpreg(struct proc *, int, const void *); +static __inline int decodeaddr(struct trapframe *, union instr *, void *); +static int muldiv(struct trapframe *, union instr *, int32_t *, int32_t *, + int32_t *); #define REGNAME(i) "goli"[i >> 3], i & 7 diff --git a/sys/arch/sparc/sparc/intr.c b/sys/arch/sparc/sparc/intr.c index 5da80cea168..8d53eab0140 100644 --- a/sys/arch/sparc/sparc/intr.c +++ b/sys/arch/sparc/sparc/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.17 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: intr.c,v 1.18 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: intr.c,v 1.20 1997/07/29 09:42:03 fair Exp $ */ /* @@ -78,8 +78,8 @@ #include <netinet6/ip6_var.h> #endif -void strayintr __P((struct clockframe *)); -int soft01intr __P((void *)); +void strayintr(struct clockframe *); +int soft01intr(void *); /* * Stray interrupt handler. Clear it if possible. @@ -148,7 +148,7 @@ soft01intr(fp) } #if defined(SUN4M) -void nmi_hard __P((void)); +void nmi_hard(void); void nmi_hard() { @@ -297,7 +297,7 @@ intr_establish(level, ih) void intr_fasttrap(level, vec) int level; - void (*vec) __P((void)); + void (*vec)(void); { struct trapvec *tv; u_long hi22, lo10; diff --git a/sys/arch/sparc/sparc/intreg.h b/sys/arch/sparc/sparc/intreg.h index 2c619934ee8..7b9fe8661d9 100644 --- a/sys/arch/sparc/sparc/intreg.h +++ b/sys/arch/sparc/sparc/intreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intreg.h,v 1.4 2000/02/21 17:08:36 art Exp $ */ +/* $OpenBSD: intreg.h,v 1.5 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: intreg.h,v 1.6 1997/07/22 20:19:10 pk Exp $ */ /* @@ -73,8 +73,8 @@ #define IE_ALLIE 0x01 /* enable interrupts */ #ifndef _LOCORE -void ienab_bis __P((int bis)); /* set given bits */ -void ienab_bic __P((int bic)); /* clear given bits */ +void ienab_bis(int bis); /* set given bits */ +void ienab_bic(int bic); /* clear given bits */ #endif #if defined(SUN4M) diff --git a/sys/arch/sparc/sparc/iommu.c b/sys/arch/sparc/sparc/iommu.c index 871857a51c1..5775aee68af 100644 --- a/sys/arch/sparc/sparc/iommu.c +++ b/sys/arch/sparc/sparc/iommu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iommu.c,v 1.14 2002/02/21 19:55:13 jason Exp $ */ +/* $OpenBSD: iommu.c,v 1.15 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: iommu.c,v 1.13 1997/07/29 09:42:04 fair Exp $ */ /* @@ -66,9 +66,9 @@ int has_iocache; /* autoconfiguration driver */ -int iommu_print __P((void *, const char *)); -void iommu_attach __P((struct device *, struct device *, void *)); -int iommu_match __P((struct device *, void *, void *)); +int iommu_print(void *, const char *); +void iommu_attach(struct device *, struct device *, void *); +int iommu_match(struct device *, void *, void *); struct cfattach iommu_ca = { sizeof(struct iommu_softc), iommu_match, iommu_attach diff --git a/sys/arch/sparc/sparc/kgdb_machdep.c b/sys/arch/sparc/sparc/kgdb_machdep.c index c331beb4c73..15e3883e98d 100644 --- a/sys/arch/sparc/sparc/kgdb_machdep.c +++ b/sys/arch/sparc/sparc/kgdb_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kgdb_machdep.c,v 1.4 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: kgdb_machdep.c,v 1.5 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: kgdb_machdep.c,v 1.1 1997/08/31 21:22:45 pk Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -114,8 +114,8 @@ #define setpte4(va, pte) sta(va, ASI_PTE, pte) #endif -static __inline void kgdb_copy __P((char *, char *, int)); -static __inline void kgdb_zero __P((char *, int)); +static __inline void kgdb_copy(char *, char *, int); +static __inline void kgdb_zero(char *, int); /* * This little routine exists simply so that bcopy() can be debugged. diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c index 7026027154e..936d909d1aa 100644 --- a/sys/arch/sparc/sparc/machdep.c +++ b/sys/arch/sparc/sparc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.80 2002/02/20 22:28:23 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.81 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: machdep.c,v 1.85 1997/09/12 08:55:02 pk Exp $ */ /* @@ -153,9 +153,9 @@ int safepri = 0; vaddr_t dvma_base, dvma_end; struct extent *dvmamap_extent; -caddr_t allocsys __P((caddr_t)); -void dumpsys __P((void)); -void stackdump __P((void)); +caddr_t allocsys(caddr_t); +void dumpsys(void); +void stackdump(void); /* * Machine-dependent startup code @@ -826,7 +826,7 @@ dumpsys() { int psize; daddr_t blkno; - int (*dump) __P((dev_t, daddr_t, caddr_t, size_t)); + int (*dump)(dev_t, daddr_t, caddr_t, size_t); int error = 0; struct memarr *mp; int nmem; @@ -1008,7 +1008,7 @@ cpu_exec_aout_makecmds(p, epp) int error = ENOEXEC; #ifdef COMPAT_SUNOS - extern int sunos_exec_aout_makecmds __P((struct proc *, struct exec_package *)); + extern int sunos_exec_aout_makecmds(struct proc *, struct exec_package *); if ((error = sunos_exec_aout_makecmds(p, epp)) == 0) return 0; #endif diff --git a/sys/arch/sparc/sparc/memreg.c b/sys/arch/sparc/sparc/memreg.c index 4d186cd2b5c..fb74e9f3276 100644 --- a/sys/arch/sparc/sparc/memreg.c +++ b/sys/arch/sparc/sparc/memreg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: memreg.c,v 1.9 2000/02/21 17:08:37 art Exp $ */ +/* $OpenBSD: memreg.c,v 1.10 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: memreg.c,v 1.21 1997/07/29 09:42:08 fair Exp $ */ /* @@ -62,8 +62,8 @@ #include <machine/reg.h> /* for trapframe */ #include <machine/trap.h> /* for trap types */ -int memregmatch __P((struct device *, void *, void *)); -void memregattach __P((struct device *, struct device *, void *)); +int memregmatch(struct device *, void *, void *); +void memregattach(struct device *, struct device *, void *); struct cfattach memreg_ca = { sizeof(struct device), memregmatch, memregattach @@ -74,7 +74,7 @@ struct cfdriver memreg_cd = { }; #if defined(SUN4M) -void hardmemerr4m __P((unsigned int, u_int, u_int, u_int, u_int)); +void hardmemerr4m(unsigned int, u_int, u_int, u_int, u_int); #endif /* diff --git a/sys/arch/sparc/sparc/memreg.h b/sys/arch/sparc/sparc/memreg.h index e2e63df8cfd..595570c04b4 100644 --- a/sys/arch/sparc/sparc/memreg.h +++ b/sys/arch/sparc/sparc/memreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: memreg.h,v 1.5 2000/02/21 17:08:37 art Exp $ */ +/* $OpenBSD: memreg.h,v 1.6 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: memreg.h,v 1.4 1996/03/31 22:52:13 pk Exp $ */ /* @@ -72,7 +72,7 @@ volatile u_int *par_err_reg; /* virtual address; NULL if not yet mapped */ * sun4m ... */ struct trapframe; -void memerr4_4c __P((unsigned, u_int, u_int, u_int, u_int, struct trapframe *)); -void memerr4m __P((unsigned, u_int, u_int, struct trapframe *)); -void viking_memerr __P((unsigned, u_int, u_int, struct trapframe *)); -void hypersparc_memerr __P((unsigned, u_int, u_int, struct trapframe *)); +void memerr4_4c(unsigned, u_int, u_int, u_int, u_int, struct trapframe *); +void memerr4m(unsigned, u_int, u_int, struct trapframe *); +void viking_memerr(unsigned, u_int, u_int, struct trapframe *); +void hypersparc_memerr(unsigned, u_int, u_int, struct trapframe *); diff --git a/sys/arch/sparc/sparc/openprom.c b/sys/arch/sparc/sparc/openprom.c index ed362afe3cd..70a413344ca 100644 --- a/sys/arch/sparc/sparc/openprom.c +++ b/sys/arch/sparc/sparc/openprom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: openprom.c,v 1.3 1997/08/08 08:27:34 downsj Exp $ */ +/* $OpenBSD: openprom.c,v 1.4 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: openprom.c,v 1.8 1996/03/31 23:45:34 pk Exp $ */ /* @@ -62,8 +62,8 @@ static int lastnode; /* speed hack */ extern int optionsnode; /* node ID of ROM's options */ extern struct promvec *promvec; -static int openpromcheckid __P((int, int)); -static int openpromgetstr __P((int, char *, char **)); +static int openpromcheckid(int, int); +static int openpromgetstr(int, char *, char **); int openpromopen(dev, flags, mode, p) diff --git a/sys/arch/sparc/sparc/pmap.c b/sys/arch/sparc/sparc/pmap.c index 477df39f5b6..f9231f5e3a6 100644 --- a/sys/arch/sparc/sparc/pmap.c +++ b/sys/arch/sparc/sparc/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.120 2002/03/13 00:24:21 miod Exp $ */ +/* $OpenBSD: pmap.c,v 1.121 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: pmap.c,v 1.118 1998/05/19 19:00:18 thorpej Exp $ */ /* @@ -162,12 +162,12 @@ int pmapdebug = 0; /* * Internal helpers. */ -static __inline struct pvlist *pvhead __P((int)); -static __inline struct pvlist *pvalloc __P((void)); -static __inline void pvfree __P((struct pvlist *)); +static __inline struct pvlist *pvhead(int); +static __inline struct pvlist *pvalloc(void); +static __inline void pvfree(struct pvlist *); #if defined(SUN4M) -static u_int VA2PA __P((caddr_t)); +static u_int VA2PA(caddr_t); #endif /* @@ -221,13 +221,13 @@ struct pool_allocator pgt_allocator = { pgt_page_alloc, pgt_page_free, 0, }; -void pcache_flush __P((caddr_t, caddr_t, int)); +void pcache_flush(caddr_t, caddr_t, int); void pcache_flush(va, pa, n) caddr_t va, pa; int n; { - void (*f)__P((int,int)) = cpuinfo.pcache_flush_line; + void (*f)(int,int) = cpuinfo.pcache_flush_line; while ((n -= 4) >= 0) (*f)((u_int)va+n, (u_int)pa+n); @@ -402,9 +402,9 @@ vaddr_t pagetables_start, pagetables_end; struct memarr pmemarr[MA_SIZE];/* physical memory regions */ int npmemarr; /* number of entries in pmemarr */ -static void pmap_page_upload __P((paddr_t)); -void pmap_pinit __P((pmap_t)); -void pmap_release __P((pmap_t)); +static void pmap_page_upload(paddr_t); +void pmap_pinit(pmap_t); +void pmap_release(pmap_t); int mmu_has_hole; @@ -462,9 +462,9 @@ static u_long segfixmask = 0xffffffff; /* all bits valid to start */ #if defined(SUN4M) #define getpte4m(va) lda((va & 0xFFFFF000) | ASI_SRMMUFP_L3, \ ASI_SRMMUFP) -u_int *getptep4m __P((struct pmap *, vaddr_t)); -static __inline void setpgt4m __P((int *, int)); -void setpte4m __P((vaddr_t va, int pte)); +u_int *getptep4m(struct pmap *, vaddr_t); +static __inline void setpgt4m(int *, int); +void setpte4m(vaddr_t va, int pte); #endif #if defined(SUN4) || defined(SUN4C) @@ -486,35 +486,35 @@ void setpte4m __P((vaddr_t va, int pte)); */ #if defined(SUN4M) -static void mmu_setup4m_L1 __P((int, struct pmap *)); -static void mmu_setup4m_L2 __P((int, struct regmap *)); -static void mmu_setup4m_L3 __P((int, struct segmap *)); -void mmu_reservemon4m __P((struct pmap *)); - -void pmap_rmk4m __P((struct pmap *, vaddr_t, vaddr_t, int, int)); -void pmap_rmu4m __P((struct pmap *, vaddr_t, vaddr_t, int, int)); -int pmap_enk4m __P((struct pmap *, vaddr_t, vm_prot_t, - int, struct pvlist *, int)); -int pmap_enu4m __P((struct pmap *, vaddr_t, vm_prot_t, - int, struct pvlist *, int)); -void pv_changepte4m __P((struct pvlist *, int, int)); -int pv_syncflags4m __P((struct pvlist *)); -int pv_link4m __P((struct pvlist *, struct pmap *, vaddr_t, int)); -void pv_unlink4m __P((struct pvlist *, struct pmap *, vaddr_t)); +static void mmu_setup4m_L1(int, struct pmap *); +static void mmu_setup4m_L2(int, struct regmap *); +static void mmu_setup4m_L3(int, struct segmap *); +void mmu_reservemon4m(struct pmap *); + +void pmap_rmk4m(struct pmap *, vaddr_t, vaddr_t, int, int); +void pmap_rmu4m(struct pmap *, vaddr_t, vaddr_t, int, int); +int pmap_enk4m(struct pmap *, vaddr_t, vm_prot_t, + int, struct pvlist *, int); +int pmap_enu4m(struct pmap *, vaddr_t, vm_prot_t, + int, struct pvlist *, int); +void pv_changepte4m(struct pvlist *, int, int); +int pv_syncflags4m(struct pvlist *); +int pv_link4m(struct pvlist *, struct pmap *, vaddr_t, int); +void pv_unlink4m(struct pvlist *, struct pmap *, vaddr_t); #endif #if defined(SUN4) || defined(SUN4C) -void mmu_reservemon4_4c __P((int *, int *)); -void pmap_rmk4_4c __P((struct pmap *, vaddr_t, vaddr_t, int, int)); -void pmap_rmu4_4c __P((struct pmap *, vaddr_t, vaddr_t, int, int)); -int pmap_enk4_4c __P((struct pmap *, vaddr_t, vm_prot_t, - int, struct pvlist *, int)); -int pmap_enu4_4c __P((struct pmap *, vaddr_t, vm_prot_t, - int, struct pvlist *, int)); -void pv_changepte4_4c __P((struct pvlist *, int, int)); -int pv_syncflags4_4c __P((struct pvlist *)); -int pv_link4_4c __P((struct pvlist *, struct pmap *, vaddr_t, int)); -void pv_unlink4_4c __P((struct pvlist *, struct pmap *, vaddr_t)); +void mmu_reservemon4_4c(int *, int *); +void pmap_rmk4_4c(struct pmap *, vaddr_t, vaddr_t, int, int); +void pmap_rmu4_4c(struct pmap *, vaddr_t, vaddr_t, int, int); +int pmap_enk4_4c(struct pmap *, vaddr_t, vm_prot_t, + int, struct pvlist *, int); +int pmap_enu4_4c(struct pmap *, vaddr_t, vm_prot_t, + int, struct pvlist *, int); +void pv_changepte4_4c(struct pvlist *, int, int); +int pv_syncflags4_4c(struct pvlist *); +int pv_link4_4c(struct pvlist *, struct pmap *, vaddr_t, int); +void pv_unlink4_4c(struct pvlist *, struct pmap *, vaddr_t); #endif #if !defined(SUN4M) && (defined(SUN4) || defined(SUN4C)) @@ -529,22 +529,22 @@ void pv_unlink4_4c __P((struct pvlist *, struct pmap *, vaddr_t)); /* function pointer declarations */ /* from pmap.h: */ -boolean_t (*pmap_clear_modify_p) __P((struct vm_page *)); -boolean_t (*pmap_clear_reference_p) __P((struct vm_page *)); -void (*pmap_copy_page_p) __P((paddr_t, paddr_t)); -int (*pmap_enter_p) __P((pmap_t, vaddr_t, paddr_t, vm_prot_t, int)); -boolean_t (*pmap_extract_p) __P((pmap_t, vaddr_t, paddr_t *)); -boolean_t (*pmap_is_modified_p) __P((struct vm_page *)); -boolean_t (*pmap_is_referenced_p) __P((struct vm_page *)); -void (*pmap_kenter_pa_p) __P((vaddr_t, paddr_t, vm_prot_t)); -void (*pmap_kremove_p) __P((vaddr_t, vsize_t)); -void (*pmap_page_protect_p) __P((struct vm_page *, vm_prot_t)); -void (*pmap_protect_p) __P((pmap_t, vaddr_t, vaddr_t, vm_prot_t)); -void (*pmap_zero_page_p) __P((paddr_t)); -void (*pmap_changeprot_p) __P((pmap_t, vaddr_t, vm_prot_t, int)); +boolean_t (*pmap_clear_modify_p)(struct vm_page *); +boolean_t (*pmap_clear_reference_p)(struct vm_page *); +void (*pmap_copy_page_p)(paddr_t, paddr_t); +int (*pmap_enter_p)(pmap_t, vaddr_t, paddr_t, vm_prot_t, int); +boolean_t (*pmap_extract_p)(pmap_t, vaddr_t, paddr_t *); +boolean_t (*pmap_is_modified_p)(struct vm_page *); +boolean_t (*pmap_is_referenced_p)(struct vm_page *); +void (*pmap_kenter_pa_p)(vaddr_t, paddr_t, vm_prot_t); +void (*pmap_kremove_p)(vaddr_t, vsize_t); +void (*pmap_page_protect_p)(struct vm_page *, vm_prot_t); +void (*pmap_protect_p)(pmap_t, vaddr_t, vaddr_t, vm_prot_t); +void (*pmap_zero_page_p)(paddr_t); +void (*pmap_changeprot_p)(pmap_t, vaddr_t, vm_prot_t, int); /* local: */ -void (*pmap_rmk_p) __P((struct pmap *, vaddr_t, vaddr_t, int, int)); -void (*pmap_rmu_p) __P((struct pmap *, vaddr_t, vaddr_t, int, int)); +void (*pmap_rmk_p)(struct pmap *, vaddr_t, vaddr_t, int, int); +void (*pmap_rmu_p)(struct pmap *, vaddr_t, vaddr_t, int, int); #define pmap_rmk (*pmap_rmk_p) #define pmap_rmu (*pmap_rmu_p) @@ -709,15 +709,15 @@ setpte4m(va, pte) } while (0) -static void sortm __P((struct memarr *, int)); -void ctx_alloc __P((struct pmap *)); -void ctx_free __P((struct pmap *)); -void pv_flushcache __P((struct pvlist *)); -void kvm_iocache __P((caddr_t, int)); +static void sortm(struct memarr *, int); +void ctx_alloc(struct pmap *); +void ctx_free(struct pmap *); +void pv_flushcache(struct pvlist *); +void kvm_iocache(caddr_t, int); #ifdef DEBUG -void pm_check __P((char *, struct pmap *)); -void pm_check_k __P((char *, struct pmap *)); -void pm_check_u __P((char *, struct pmap *)); +void pm_check(char *, struct pmap *); +void pm_check_k(char *, struct pmap *); +void pm_check_u(char *, struct pmap *); #endif /* @@ -1146,10 +1146,10 @@ mmu_setup4m_L3(pagtblptd, sp) /* * MMU management. */ -struct mmuentry *me_alloc __P((struct mmuhd *, struct pmap *, int, int)); -void me_free __P((struct pmap *, u_int)); -struct mmuentry *region_alloc __P((struct mmuhd *, struct pmap *, int)); -void region_free __P((struct pmap *, u_int)); +struct mmuentry *me_alloc(struct mmuhd *, struct pmap *, int, int); +void me_free(struct pmap *, u_int); +struct mmuentry *region_alloc(struct mmuhd *, struct pmap *, int); +void region_free(struct pmap *, u_int); /* * Change contexts. We need the old context number as well as the new @@ -2559,10 +2559,10 @@ int nptesg; #endif #if defined(SUN4M) -static void pmap_bootstrap4m __P((void)); +static void pmap_bootstrap4m(void); #endif #if defined(SUN4) || defined(SUN4C) -static void pmap_bootstrap4_4c __P((int, int, int)); +static void pmap_bootstrap4_4c(int, int, int); #endif /* @@ -6460,7 +6460,7 @@ pmap_dumpsize() int pmap_dumpmmu(dump, blkno) daddr_t blkno; - int (*dump) __P((dev_t, daddr_t, caddr_t, size_t)); + int (*dump)(dev_t, daddr_t, caddr_t, size_t); { kcore_seg_t *ksegp; cpu_kcore_hdr_t *kcpup; @@ -6619,7 +6619,7 @@ pmap_writetext(dst, ch) #ifdef EXTREME_DEBUG -static void test_region __P((int, int, int)); +static void test_region(int, int, int); void debug_pagetables() diff --git a/sys/arch/sparc/sparc/svr4_machdep.c b/sys/arch/sparc/sparc/svr4_machdep.c index 92bb3522029..cfd23afdf5d 100644 --- a/sys/arch/sparc/sparc/svr4_machdep.c +++ b/sys/arch/sparc/sparc/svr4_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: svr4_machdep.c,v 1.9 1997/08/08 08:27:42 downsj Exp $ */ +/* $OpenBSD: svr4_machdep.c,v 1.10 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: svr4_machdep.c,v 1.24 1997/07/29 10:04:45 fair Exp $ */ /* @@ -55,7 +55,7 @@ #include <machine/trap.h> #include <machine/svr4_machdep.h> -static void svr4_getsiginfo __P((union svr4_siginfo *, int, u_long, int, caddr_t)); +static void svr4_getsiginfo(union svr4_siginfo *, int, u_long, int, caddr_t); #ifdef DEBUG extern int sigdebug; @@ -66,7 +66,7 @@ extern int sigpid; #endif #ifdef DEBUG_SVR4 -static void svr4_printcontext __P((const char *, struct svr4_ucontext *)); +static void svr4_printcontext(const char *, struct svr4_ucontext *); static void svr4_printcontext(fun, uc) diff --git a/sys/arch/sparc/sparc/swapgeneric.c b/sys/arch/sparc/sparc/swapgeneric.c index 4869f641952..b840d91c58d 100644 --- a/sys/arch/sparc/sparc/swapgeneric.c +++ b/sys/arch/sparc/sparc/swapgeneric.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapgeneric.c,v 1.6 2001/09/29 18:40:32 miod Exp $ */ +/* $OpenBSD: swapgeneric.c,v 1.7 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: swapgeneric.c,v 1.8 1996/03/14 21:09:32 christos Exp $ */ /*- @@ -43,7 +43,7 @@ #include <sys/param.h> #include <sys/conf.h> -int (*mountroot) __P((void)) = NULL; /* tells autoconf.c that we are "generic" */ +int (*mountroot)(void) = NULL; /* tells autoconf.c that we are "generic" */ dev_t rootdev = NODEV; dev_t dumpdev = NODEV; diff --git a/sys/arch/sparc/sparc/trap.c b/sys/arch/sparc/sparc/trap.c index 22ed3032786..7b11d51d082 100644 --- a/sys/arch/sparc/sparc/trap.c +++ b/sys/arch/sparc/sparc/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.35 2001/11/28 13:47:39 art Exp $ */ +/* $OpenBSD: trap.c,v 1.36 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: trap.c,v 1.58 1997/09/12 08:55:01 pk Exp $ */ /* @@ -192,12 +192,12 @@ const char *trap_type[] = { #define N_TRAP_TYPES (sizeof trap_type / sizeof *trap_type) -static __inline void userret __P((struct proc *, int, u_quad_t)); -void trap __P((unsigned, int, int, struct trapframe *)); -static __inline void share_fpu __P((struct proc *, struct trapframe *)); -void mem_access_fault __P((unsigned, int, u_int, int, int, struct trapframe *)); -void mem_access_fault4m __P((unsigned, u_int, u_int, struct trapframe *)); -void syscall __P((register_t, struct trapframe *, register_t)); +static __inline void userret(struct proc *, int, u_quad_t); +void trap(unsigned, int, int, struct trapframe *); +static __inline void share_fpu(struct proc *, struct trapframe *); +void mem_access_fault(unsigned, int, u_int, int, int, struct trapframe *); +void mem_access_fault4m(unsigned, u_int, u_int, struct trapframe *); +void syscall(register_t, struct trapframe *, register_t); int ignore_bogus_traps = 0; diff --git a/sys/arch/sparc/stand/boot/boot.c b/sys/arch/sparc/stand/boot/boot.c index 91cab33ac59..827e18955a1 100644 --- a/sys/arch/sparc/stand/boot/boot.c +++ b/sys/arch/sparc/stand/boot/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.2 1999/06/21 23:35:41 deraadt Exp $ */ +/* $OpenBSD: boot.c,v 1.3 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: boot.c,v 1.2 1997/09/14 19:27:21 pk Exp $ */ /*- @@ -43,8 +43,8 @@ #include <sparc/stand/common/promdev.h> -void copyunix __P((int, char *)); -void promsyms __P((int, struct exec *)); +void copyunix(int, char *); +void promsyms(int, struct exec *); int debug; int netif_debug; @@ -59,9 +59,9 @@ char *strtab; int strtablen; char fbuf[80], dbuf[128]; -typedef void (*entry_t)__P((caddr_t, int, int, int, long, long)); +typedef void (*entry_t)(caddr_t, int, int, int, long, long); -void loadfile __P((int, caddr_t)); +void loadfile(int, caddr_t); main() { diff --git a/sys/arch/sparc/stand/bootxx/bootxx.c b/sys/arch/sparc/stand/bootxx/bootxx.c index bf7a4bfaaa2..2b9325548fe 100644 --- a/sys/arch/sparc/stand/bootxx/bootxx.c +++ b/sys/arch/sparc/stand/bootxx/bootxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bootxx.c,v 1.1 1997/09/17 10:46:16 downsj Exp $ */ +/* $OpenBSD: bootxx.c,v 1.2 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: bootxx.c,v 1.2 1997/09/14 19:28:17 pk Exp $ */ /* @@ -60,14 +60,14 @@ int32_t block_count = MAXBLOCKNUM; daddr_t block_table[MAXBLOCKNUM] = { 0 }; -void loadboot __P((struct open_file *, caddr_t)); +void loadboot(struct open_file *, caddr_t); int main() { char *dummy; size_t n; - register void (*entry)__P((caddr_t)) = (void (*)__P((caddr_t)))LOADADDR; + register void (*entry)(caddr_t) = (void (*)(caddr_t))LOADADDR; prom_init(); io.f_flags = F_RAW; diff --git a/sys/arch/sparc/stand/common/dvma.c b/sys/arch/sparc/stand/common/dvma.c index 7e6351baf88..9fa1f58ec20 100644 --- a/sys/arch/sparc/stand/common/dvma.c +++ b/sys/arch/sparc/stand/common/dvma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dvma.c,v 1.1 1997/09/17 10:46:18 downsj Exp $ */ +/* $OpenBSD: dvma.c,v 1.2 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: dvma.c,v 1.2 1995/09/17 00:50:56 pk Exp $ */ /* * Copyright (c) 1995 Gordon W. Ross @@ -96,7 +96,7 @@ dvma_mapout(char *addr, size_t len) return ((char *)va); } -extern char *alloc __P((int)); +extern char *alloc(int); char * dvma_alloc(int len) diff --git a/sys/arch/sparc/stand/common/promdev.c b/sys/arch/sparc/stand/common/promdev.c index 15f4c412b61..58735dedb52 100644 --- a/sys/arch/sparc/stand/common/promdev.c +++ b/sys/arch/sparc/stand/common/promdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: promdev.c,v 1.3 2001/01/29 03:59:05 jason Exp $ */ +/* $OpenBSD: promdev.c,v 1.4 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: promdev.c,v 1.16 1995/11/14 15:04:01 pk Exp $ */ /* @@ -49,31 +49,31 @@ /* u_long _randseed = 1; */ -int obp_close __P((struct open_file *)); -int obp_strategy __P((void *, int, daddr_t, size_t, void *, size_t *)); -ssize_t obp_xmit __P((struct promdata *, void *, size_t)); -ssize_t obp_recv __P((struct promdata *, void *, size_t)); -int prom0_close __P((struct open_file *)); -int prom0_strategy __P((void *, int, daddr_t, size_t, void *, size_t *)); -void prom0_iclose __P((struct saioreq *)); -int prom0_iopen __P((struct promdata *)); -ssize_t prom0_xmit __P((struct promdata *, void *, size_t)); -ssize_t prom0_recv __P((struct promdata *, void *, size_t)); +int obp_close(struct open_file *); +int obp_strategy(void *, int, daddr_t, size_t, void *, size_t *); +ssize_t obp_xmit(struct promdata *, void *, size_t); +ssize_t obp_recv(struct promdata *, void *, size_t); +int prom0_close(struct open_file *); +int prom0_strategy(void *, int, daddr_t, size_t, void *, size_t *); +void prom0_iclose(struct saioreq *); +int prom0_iopen(struct promdata *); +ssize_t prom0_xmit(struct promdata *, void *, size_t); +ssize_t prom0_recv(struct promdata *, void *, size_t); -static char *prom_mapin __P((u_long, int, int)); +static char *prom_mapin(u_long, int, int); -int getdevtype __P((int, char *)); -int getprop __P((int, char *, void *, int)); -char *getpropstring __P((int, char *)); +int getdevtype(int, char *); +int getprop(int, char *, void *, int); +char *getpropstring(int, char *); -static void prom0_fake __P((void)); +static void prom0_fake(void); extern struct filesystem file_system_nfs[]; extern struct filesystem file_system_cd9660[]; extern struct filesystem file_system_ufs[]; -int prom_open __P((struct open_file *f, ...)) { return 0; } -int prom_ioctl __P((struct open_file *f, u_long c, void *d)) { return EIO; } +int prom_open(struct open_file *f, ...) { return 0; } +int prom_ioctl(struct open_file *f, u_long c, void *d) { return EIO; } struct devsw devsw[] = { { "prom0", prom0_strategy, prom_open, prom0_close, prom_ioctl }, diff --git a/sys/arch/sparc/stand/common/promdev.h b/sys/arch/sparc/stand/common/promdev.h index 8413cde7d18..4c2e1a0705e 100644 --- a/sys/arch/sparc/stand/common/promdev.h +++ b/sys/arch/sparc/stand/common/promdev.h @@ -1,4 +1,4 @@ -/* $OpenBSD: promdev.h,v 1.1 1997/09/17 10:46:19 downsj Exp $ */ +/* $OpenBSD: promdev.h,v 1.2 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: promdev.h,v 1.3 1995/09/18 21:31:50 pk Exp $ */ /* @@ -41,8 +41,8 @@ struct promdata { #define DT_NET 2 #define DT_BYTE 3 /* Hooks for netif.c */ - int (*xmit) __P((struct promdata *, void *, size_t)); - int (*recv) __P((struct promdata *, void *, size_t)); + int (*xmit)(struct promdata *, void *, size_t); + int (*recv)(struct promdata *, void *, size_t); }; #define LOADADDR ((caddr_t)0x4000) @@ -58,12 +58,12 @@ extern int hz; extern int cputyp, nbpg, pgofset, pgshift; extern int debug; -extern void prom_init __P((void)); +extern void prom_init(void); /* Note: dvma_*() routines are for "oldmon" machines only */ -extern char *dvma_mapin __P((char *, size_t)); -extern char *dvma_mapout __P((char *, size_t)); -extern char *dvma_alloc __P((int)); +extern char *dvma_mapin(char *, size_t); +extern char *dvma_mapout(char *, size_t); +extern char *dvma_alloc(int); /* * duplicates from pmap.c for mapping device on "oldmon" machines. diff --git a/sys/arch/sparc/stand/installboot/installboot.c b/sys/arch/sparc/stand/installboot/installboot.c index ced55b9ad39..c8ff310f55e 100644 --- a/sys/arch/sparc/stand/installboot/installboot.c +++ b/sys/arch/sparc/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.2 1998/04/17 18:18:06 deraadt Exp $ */ +/* $OpenBSD: installboot.c,v 1.3 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: installboot.c,v 1.1 1997/06/01 03:39:45 mrg Exp $ */ /* @@ -71,11 +71,11 @@ char cpumodel[130]; int isofsblk = 0; int isofseblk = 0; -char *loadprotoblocks __P((char *, long *)); -int loadblocknums __P((char *, int)); -static void devread __P((int, void *, daddr_t, size_t, char *)); -static void usage __P((void)); -int main __P((int, char *[])); +char *loadprotoblocks(char *, long *); +int loadblocknums(char *, int); +static void devread(int, void *, daddr_t, size_t, char *); +static void usage(void); +int main(int, char *[]); static void diff --git a/sys/arch/sparc64/dev/auxio.c b/sys/arch/sparc64/dev/auxio.c index d37d0d4dd41..5b23a0b0ad4 100644 --- a/sys/arch/sparc64/dev/auxio.c +++ b/sys/arch/sparc64/dev/auxio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auxio.c,v 1.3 2002/02/01 21:48:23 jason Exp $ */ +/* $OpenBSD: auxio.c,v 1.4 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: auxio.c,v 1.1 2000/04/15 03:08:13 mrg Exp $ */ /* @@ -54,11 +54,11 @@ /* * ebus code. */ -int auxio_ebus_match __P((struct device *, void *, void *)); -void auxio_ebus_attach __P((struct device *, struct device *, void *)); -int auxio_sbus_match __P((struct device *, void *, void *)); -void auxio_sbus_attach __P((struct device *, struct device *, void *)); -void auxio_attach_common __P((struct auxio_softc *)); +int auxio_ebus_match(struct device *, void *, void *); +void auxio_ebus_attach(struct device *, struct device *, void *); +int auxio_sbus_match(struct device *, void *, void *); +void auxio_sbus_attach(struct device *, struct device *, void *); +void auxio_attach_common(struct auxio_softc *); struct cfattach auxio_ebus_ca = { sizeof(struct auxio_softc), auxio_ebus_match, auxio_ebus_attach diff --git a/sys/arch/sparc64/dev/auxiovar.h b/sys/arch/sparc64/dev/auxiovar.h index 58f5ef4ca6d..efb9a42495c 100644 --- a/sys/arch/sparc64/dev/auxiovar.h +++ b/sys/arch/sparc64/dev/auxiovar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: auxiovar.h,v 1.3 2002/02/01 21:48:23 jason Exp $ */ +/* $OpenBSD: auxiovar.h,v 1.4 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: auxiovar.h,v 1.4 2000/04/15 03:08:13 mrg Exp $ */ /* @@ -63,6 +63,6 @@ struct auxio_softc { * as AUXREG_VA depends on NBPG which is not a constant. */ volatile u_char *auxio_reg; -unsigned int auxregbisc __P((int, int)); -void auxio_led_blink __P((void *)); +unsigned int auxregbisc(int, int); +void auxio_led_blink(void *); #endif diff --git a/sys/arch/sparc64/dev/beeper.c b/sys/arch/sparc64/dev/beeper.c index 1ca05816d6b..8c66982e42d 100644 --- a/sys/arch/sparc64/dev/beeper.c +++ b/sys/arch/sparc64/dev/beeper.c @@ -1,4 +1,4 @@ -/* $OpenBSD: beeper.c,v 1.3 2002/02/23 04:42:35 jason Exp $ */ +/* $OpenBSD: beeper.c,v 1.4 2002/03/14 01:26:44 millert Exp $ */ /* * Copyright (c) 2001 Jason L. Wright (jason@thought.net) @@ -66,8 +66,8 @@ struct beeper_softc { #define BEEP_REG 0 -int beeper_match __P((struct device *, void *, void *)); -void beeper_attach __P((struct device *, struct device *, void *)); +int beeper_match(struct device *, void *, void *); +void beeper_attach(struct device *, struct device *, void *); struct cfattach beeper_ca = { sizeof(struct beeper_softc), beeper_match, beeper_attach diff --git a/sys/arch/sparc64/dev/ce4231.c b/sys/arch/sparc64/dev/ce4231.c index 73353959070..92146092b3e 100644 --- a/sys/arch/sparc64/dev/ce4231.c +++ b/sys/arch/sparc64/dev/ce4231.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ce4231.c,v 1.5 2002/01/24 03:06:54 jason Exp $ */ +/* $OpenBSD: ce4231.c,v 1.6 2002/03/14 01:26:44 millert Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -128,39 +128,39 @@ #define C_READ(sc,r) \ bus_space_read_4((sc)->sc_bustag, (sc)->sc_cdmahandle, (r)) -int ce4231_match __P((struct device *, void *, void *)); -void ce4231_attach __P((struct device *, struct device *, void *)); -int ce4231_cintr __P((void *)); -int ce4231_pintr __P((void *)); +int ce4231_match(struct device *, void *, void *); +void ce4231_attach(struct device *, struct device *, void *); +int ce4231_cintr(void *); +int ce4231_pintr(void *); -int ce4231_set_speed __P((struct ce4231_softc *, u_long *)); -void ce4231_setup_output __P((struct ce4231_softc *sc)); +int ce4231_set_speed(struct ce4231_softc *, u_long *); +void ce4231_setup_output(struct ce4231_softc *sc); -void ce4231_write __P((struct ce4231_softc *, u_int8_t, u_int8_t)); -u_int8_t ce4231_read __P((struct ce4231_softc *, u_int8_t)); +void ce4231_write(struct ce4231_softc *, u_int8_t, u_int8_t); +u_int8_t ce4231_read(struct ce4231_softc *, u_int8_t); /* Audio interface */ -int ce4231_open __P((void *, int)); -void ce4231_close __P((void *)); -int ce4231_query_encoding __P((void *, struct audio_encoding *)); -int ce4231_set_params __P((void *, int, int, struct audio_params *, - struct audio_params *)); -int ce4231_round_blocksize __P((void *, int)); -int ce4231_commit_settings __P((void *)); -int ce4231_halt_output __P((void *)); -int ce4231_halt_input __P((void *)); -int ce4231_getdev __P((void *, struct audio_device *)); -int ce4231_set_port __P((void *, mixer_ctrl_t *)); -int ce4231_get_port __P((void *, mixer_ctrl_t *)); -int ce4231_query_devinfo __P((void *addr, mixer_devinfo_t *)); -void * ce4231_alloc __P((void *, int, size_t, int, int)); -void ce4231_free __P((void *, void *, int)); -size_t ce4231_round_buffersize __P((void *, int, size_t)); -int ce4231_get_props __P((void *)); +int ce4231_open(void *, int); +void ce4231_close(void *); +int ce4231_query_encoding(void *, struct audio_encoding *); +int ce4231_set_params(void *, int, int, struct audio_params *, + struct audio_params *); +int ce4231_round_blocksize(void *, int); +int ce4231_commit_settings(void *); +int ce4231_halt_output(void *); +int ce4231_halt_input(void *); +int ce4231_getdev(void *, struct audio_device *); +int ce4231_set_port(void *, mixer_ctrl_t *); +int ce4231_get_port(void *, mixer_ctrl_t *); +int ce4231_query_devinfo(void *addr, mixer_devinfo_t *); +void * ce4231_alloc(void *, int, size_t, int, int); +void ce4231_free(void *, void *, int); +size_t ce4231_round_buffersize(void *, int, size_t); +int ce4231_get_props(void *); int ce4231_trigger_output __P((void *, void *, void *, int, - void (*intr)__P((void *)), void *arg, struct audio_params *)); + void (*intr)(void *), void *arg, struct audio_params *)); int ce4231_trigger_input __P((void *, void *, void *, int, - void (*intr)__P((void *)), void *arg, struct audio_params *)); + void (*intr)(void *), void *arg, struct audio_params *)); struct audio_hw_if ce4231_sa_hw_if = { ce4231_open, @@ -577,8 +577,8 @@ ce4231_set_params(addr, setmode, usemode, p, r) { struct ce4231_softc *sc = (struct ce4231_softc *)addr; int err, bits, enc; - void (*pswcode) __P((void *, u_char *, int cnt)); - void (*rswcode) __P((void *, u_char *, int cnt)); + void (*pswcode)(void *, u_char *, int cnt); + void (*rswcode)(void *, u_char *, int cnt); enc = p->encoding; pswcode = rswcode = 0; @@ -1438,7 +1438,7 @@ int ce4231_trigger_output(addr, start, end, blksize, intr, arg, param) void *addr, *start, *end; int blksize; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; struct audio_params *param; { @@ -1510,7 +1510,7 @@ int ce4231_trigger_input(addr, start, end, blksize, intr, arg, param) void *addr, *start, *end; int blksize; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; struct audio_params *param; { diff --git a/sys/arch/sparc64/dev/com_ebus.c b/sys/arch/sparc64/dev/com_ebus.c index 27f337dc83a..4da384810da 100644 --- a/sys/arch/sparc64/dev/com_ebus.c +++ b/sys/arch/sparc64/dev/com_ebus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_ebus.c,v 1.5 2002/01/25 03:58:39 jason Exp $ */ +/* $OpenBSD: com_ebus.c,v 1.6 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: com_ebus.c,v 1.6 2001/07/24 19:27:10 eeh Exp $ */ /* @@ -52,8 +52,8 @@ cdev_decl(com); /* XXX this belongs elsewhere */ -int com_ebus_match __P((struct device *, void *, void *)); -void com_ebus_attach __P((struct device *, struct device *, void *)); +int com_ebus_match(struct device *, void *, void *); +void com_ebus_attach(struct device *, struct device *, void *); struct cfattach com_ebus_ca = { sizeof(struct com_softc), com_ebus_match, com_ebus_attach diff --git a/sys/arch/sparc64/dev/comkbd_ebus.c b/sys/arch/sparc64/dev/comkbd_ebus.c index de21e56a014..44678859130 100644 --- a/sys/arch/sparc64/dev/comkbd_ebus.c +++ b/sys/arch/sparc64/dev/comkbd_ebus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: comkbd_ebus.c,v 1.4 2002/02/12 16:53:06 jason Exp $ */ +/* $OpenBSD: comkbd_ebus.c,v 1.5 2002/03/14 01:26:44 millert Exp $ */ /* * Copyright (c) 2002 Jason L. Wright (jason@thought.net) @@ -97,27 +97,27 @@ struct comkbd_softc { #define COM_READ(sc,r) \ bus_space_read_1((sc)->sc_iot, (sc)->sc_ioh, (r)) -int comkbd_match __P((struct device *, void *, void *)); -void comkbd_attach __P((struct device *, struct device *, void *)); -int comkbd_iskbd __P((int)); +int comkbd_match(struct device *, void *, void *); +void comkbd_attach(struct device *, struct device *, void *); +int comkbd_iskbd(int); /* wskbd glue */ -void comkbd_cnpollc __P((void *, int)); -void comkbd_cngetc __P((void *, u_int *, int *)); -int comkbd_enable __P((void *, int)); -void comkbd_setleds __P((void *, int)); -int comkbd_getleds __P((struct comkbd_softc *)); -int comkbd_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); +void comkbd_cnpollc(void *, int); +void comkbd_cngetc(void *, u_int *, int *); +int comkbd_enable(void *, int); +void comkbd_setleds(void *, int); +int comkbd_getleds(struct comkbd_softc *); +int comkbd_ioctl(void *, u_long, caddr_t, int, struct proc *); /* internals */ -void comkbd_enqueue __P((struct comkbd_softc *, u_int8_t *, u_int)); -void comkbd_raw __P((struct comkbd_softc *, u_int8_t)); -void comkbd_init __P((struct comkbd_softc *)); -void comkbd_putc __P((struct comkbd_softc *, u_int8_t)); -int comkbd_intr __P((void *)); -void comkbd_soft __P((void *)); -void comkbd_bellstop __P((void *)); -void comkbd_bell __P((struct comkbd_softc *, u_int, u_int, u_int)); +void comkbd_enqueue(struct comkbd_softc *, u_int8_t *, u_int); +void comkbd_raw(struct comkbd_softc *, u_int8_t); +void comkbd_init(struct comkbd_softc *); +void comkbd_putc(struct comkbd_softc *, u_int8_t); +int comkbd_intr(void *); +void comkbd_soft(void *); +void comkbd_bellstop(void *); +void comkbd_bell(struct comkbd_softc *, u_int, u_int, u_int); struct cfattach comkbd_ca = { sizeof(struct comkbd_softc), comkbd_match, comkbd_attach diff --git a/sys/arch/sparc64/dev/cons.h b/sys/arch/sparc64/dev/cons.h index 6dd5fd15136..0234189e786 100644 --- a/sys/arch/sparc64/dev/cons.h +++ b/sys/arch/sparc64/dev/cons.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cons.h,v 1.1 2001/08/19 05:21:37 jason Exp $ */ +/* $OpenBSD: cons.h,v 1.2 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: cons.h,v 1.3 2000/05/19 05:26:17 eeh Exp $ */ /*- @@ -48,22 +48,22 @@ struct pconssoftc { /* These are shared with the consinit OBP console */ extern int stdin, stdout; -void pcons_cnpollc __P((dev_t dev, int on)); +void pcons_cnpollc(dev_t dev, int on); struct consdev; struct zs_chanstate; extern void *zs_conschan; -extern void nullcnprobe __P((struct consdev *)); +extern void nullcnprobe(struct consdev *); -extern int zs_getc __P((void *arg)); -extern void zs_putc __P((void *arg, int c)); +extern int zs_getc(void *arg); +extern void zs_putc(void *arg, int c); struct zschan * -zs_get_chan_addr __P((int zsc_unit, int channel)); +zs_get_chan_addr(int zsc_unit, int channel); #ifdef KGDB -void zs_kgdb_init __P((void)); -void zskgdb __P((struct zs_chanstate *)); +void zs_kgdb_init(void); +void zskgdb(struct zs_chanstate *); #endif diff --git a/sys/arch/sparc64/dev/consinit.c b/sys/arch/sparc64/dev/consinit.c index f84fa609ff5..df1dbac2f52 100644 --- a/sys/arch/sparc64/dev/consinit.c +++ b/sys/arch/sparc64/dev/consinit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: consinit.c,v 1.6 2002/01/25 03:36:25 jason Exp $ */ +/* $OpenBSD: consinit.c,v 1.7 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: consinit.c,v 1.9 2000/10/20 05:32:35 mrg Exp $ */ /*- @@ -60,12 +60,12 @@ #include <dev/usb/ukbdvar.h> -static void prom_cnprobe __P((struct consdev *)); -static void prom_cninit __P((struct consdev *)); -int prom_cngetc __P((dev_t)); -static void prom_cnputc __P((dev_t, int)); -static void prom_cnpollc __P((dev_t, int)); -static void prom_cnputc __P((dev_t, int)); +static void prom_cnprobe(struct consdev *); +static void prom_cninit(struct consdev *); +int prom_cngetc(dev_t); +static void prom_cnputc(dev_t, int); +static void prom_cnpollc(dev_t, int); +static void prom_cnputc(dev_t, int); int stdin = NULL, stdout = NULL; diff --git a/sys/arch/sparc64/dev/ebus.c b/sys/arch/sparc64/dev/ebus.c index 76e01f7816c..af8635e6bb7 100644 --- a/sys/arch/sparc64/dev/ebus.c +++ b/sys/arch/sparc64/dev/ebus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ebus.c,v 1.7 2002/02/05 18:34:39 jason Exp $ */ +/* $OpenBSD: ebus.c,v 1.8 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: ebus.c,v 1.24 2001/07/25 03:49:54 eeh Exp $ */ /* @@ -77,8 +77,8 @@ int ebus_debug = 0x0; #include <sparc64/dev/ebusvar.h> #include <sparc64/sparc64/cache.h> -int ebus_match __P((struct device *, void *, void *)); -void ebus_attach __P((struct device *, struct device *, void *)); +int ebus_match(struct device *, void *, void *); +void ebus_attach(struct device *, struct device *, void *); struct cfattach ebus_ca = { sizeof(struct ebus_softc), ebus_match, ebus_attach @@ -89,34 +89,34 @@ struct cfdriver ebus_cd = { }; -int ebus_setup_attach_args __P((struct ebus_softc *, int, - struct ebus_attach_args *)); -void ebus_destroy_attach_args __P((struct ebus_attach_args *)); -int ebus_print __P((void *, const char *)); -void ebus_find_ino __P((struct ebus_softc *, struct ebus_attach_args *)); -int ebus_find_node __P((struct pci_attach_args *)); +int ebus_setup_attach_args(struct ebus_softc *, int, + struct ebus_attach_args *); +void ebus_destroy_attach_args(struct ebus_attach_args *); +int ebus_print(void *, const char *); +void ebus_find_ino(struct ebus_softc *, struct ebus_attach_args *); +int ebus_find_node(struct pci_attach_args *); /* * here are our bus space and bus dma routines. */ -static paddr_t ebus_bus_mmap __P((bus_space_tag_t, bus_addr_t, off_t, int, int)); -static int _ebus_bus_map __P((bus_space_tag_t, bus_type_t, bus_addr_t, +static paddr_t ebus_bus_mmap(bus_space_tag_t, bus_addr_t, off_t, int, int); +static int _ebus_bus_map(bus_space_tag_t, bus_type_t, bus_addr_t, bus_size_t, int, vaddr_t, - bus_space_handle_t *)); + bus_space_handle_t *); static void *ebus_intr_establish __P((bus_space_tag_t, int, int, int, - int (*) __P((void *)), void *)); - -static int ebus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); -static void ebus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t)); -static void ebus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t, bus_addr_t, - bus_size_t, int)); -int ebus_dmamem_alloc __P((bus_dma_tag_t, bus_size_t, bus_size_t, bus_size_t, - bus_dma_segment_t *, int, int *, int)); -void ebus_dmamem_free __P((bus_dma_tag_t, bus_dma_segment_t *, int)); -int ebus_dmamem_map __P((bus_dma_tag_t, bus_dma_segment_t *, int, size_t, - caddr_t *, int)); -void ebus_dmamem_unmap __P((bus_dma_tag_t, caddr_t, size_t)); + int (*)(void *), void *)); + +static int ebus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int); +static void ebus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t); +static void ebus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t, + bus_size_t, int); +int ebus_dmamem_alloc(bus_dma_tag_t, bus_size_t, bus_size_t, bus_size_t, + bus_dma_segment_t *, int, int *, int); +void ebus_dmamem_free(bus_dma_tag_t, bus_dma_segment_t *, int); +int ebus_dmamem_map(bus_dma_tag_t, bus_dma_segment_t *, int, size_t, + caddr_t *, int); +void ebus_dmamem_unmap(bus_dma_tag_t, caddr_t, size_t); int ebus_match(parent, match, aux) @@ -537,7 +537,7 @@ ebus_intr_establish(t, pri, level, flags, handler, arg) int pri; int level; int flags; - int (*handler) __P((void *)); + int (*handler)(void *); void *arg; { return (bus_intr_establish(t->parent, pri, level, flags, diff --git a/sys/arch/sparc64/dev/ebusvar.h b/sys/arch/sparc64/dev/ebusvar.h index c5008189ef1..a2203c69dd9 100644 --- a/sys/arch/sparc64/dev/ebusvar.h +++ b/sys/arch/sparc64/dev/ebusvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ebusvar.h,v 1.3 2001/10/07 15:27:12 jason Exp $ */ +/* $OpenBSD: ebusvar.h,v 1.4 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: ebusvar.h,v 1.5 2001/07/20 00:07:13 eeh Exp $ */ /* @@ -71,8 +71,8 @@ struct ebus_softc { int sc_nintmap; }; -bus_dma_tag_t ebus_alloc_dma_tag __P((struct ebus_softc *, bus_dma_tag_t)); -bus_space_tag_t ebus_alloc_bus_tag __P((struct ebus_softc *, int)); +bus_dma_tag_t ebus_alloc_dma_tag(struct ebus_softc *, bus_dma_tag_t); +bus_space_tag_t ebus_alloc_bus_tag(struct ebus_softc *, int); #define ebus_bus_map(t, bt, a, s, f, v, hp) \ bus_space_map2(t, bt, a, s, f, v, hp) diff --git a/sys/arch/sparc64/dev/iommu.c b/sys/arch/sparc64/dev/iommu.c index 97366a664b0..f8fd2cb801e 100644 --- a/sys/arch/sparc64/dev/iommu.c +++ b/sys/arch/sparc64/dev/iommu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iommu.c,v 1.14 2002/03/12 19:41:05 jason Exp $ */ +/* $OpenBSD: iommu.c,v 1.15 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: iommu.c,v 1.47 2002/02/08 20:03:45 eeh Exp $ */ /* @@ -82,8 +82,8 @@ int iommu_dvmamap_sync_seg(bus_dma_tag_t, struct iommu_state *, 0, (v)); \ } while (0) -static int iommu_strbuf_flush_done __P((struct iommu_state *)); -int64_t iommu_tsb_entry __P((struct iommu_state *, vaddr_t)); +static int iommu_strbuf_flush_done(struct iommu_state *); +int64_t iommu_tsb_entry(struct iommu_state *, vaddr_t); static int iommu_tv_comp(struct timeval *, struct timeval *); /* diff --git a/sys/arch/sparc64/dev/iommuvar.h b/sys/arch/sparc64/dev/iommuvar.h index 8a0fee9e08c..22933f7dccf 100644 --- a/sys/arch/sparc64/dev/iommuvar.h +++ b/sys/arch/sparc64/dev/iommuvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: iommuvar.h,v 1.5 2002/02/22 16:11:59 jason Exp $ */ +/* $OpenBSD: iommuvar.h,v 1.6 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: iommuvar.h,v 1.9 2001/10/07 20:30:41 eeh Exp $ */ /* @@ -55,28 +55,28 @@ struct iommu_state { }; /* interfaces for PCI/SBUS code */ -void iommu_init __P((char *, struct iommu_state *, int, u_int32_t)); -void iommu_reset __P((struct iommu_state *)); -void iommu_enter __P((struct iommu_state *, vaddr_t, int64_t, int)); -void iommu_remove __P((struct iommu_state *, vaddr_t, size_t)); -paddr_t iommu_extract __P((struct iommu_state *, vaddr_t)); +void iommu_init(char *, struct iommu_state *, int, u_int32_t); +void iommu_reset(struct iommu_state *); +void iommu_enter(struct iommu_state *, vaddr_t, int64_t, int); +void iommu_remove(struct iommu_state *, vaddr_t, size_t); +paddr_t iommu_extract(struct iommu_state *, vaddr_t); -int iommu_dvmamap_load __P((bus_dma_tag_t, struct iommu_state *, - bus_dmamap_t, void *, bus_size_t, struct proc *, int)); -void iommu_dvmamap_unload __P((bus_dma_tag_t, struct iommu_state *, - bus_dmamap_t)); -int iommu_dvmamap_load_raw __P((bus_dma_tag_t, struct iommu_state *, - bus_dmamap_t, bus_dma_segment_t *, int, int, bus_size_t)); -void iommu_dvmamap_sync __P((bus_dma_tag_t, struct iommu_state *, - bus_dmamap_t, bus_addr_t, bus_size_t, int)); -int iommu_dvmamem_alloc __P((bus_dma_tag_t, struct iommu_state *, +int iommu_dvmamap_load(bus_dma_tag_t, struct iommu_state *, + bus_dmamap_t, void *, bus_size_t, struct proc *, int); +void iommu_dvmamap_unload(bus_dma_tag_t, struct iommu_state *, + bus_dmamap_t); +int iommu_dvmamap_load_raw(bus_dma_tag_t, struct iommu_state *, + bus_dmamap_t, bus_dma_segment_t *, int, int, bus_size_t); +void iommu_dvmamap_sync(bus_dma_tag_t, struct iommu_state *, + bus_dmamap_t, bus_addr_t, bus_size_t, int); +int iommu_dvmamem_alloc(bus_dma_tag_t, struct iommu_state *, bus_size_t, bus_size_t, bus_size_t, bus_dma_segment_t *, - int, int *, int)); -void iommu_dvmamem_free __P((bus_dma_tag_t, struct iommu_state *, - bus_dma_segment_t *, int)); -int iommu_dvmamem_map __P((bus_dma_tag_t, struct iommu_state *, - bus_dma_segment_t *, int, size_t, caddr_t *, int)); -void iommu_dvmamem_unmap __P((bus_dma_tag_t, struct iommu_state *, - caddr_t, size_t)); + int, int *, int); +void iommu_dvmamem_free(bus_dma_tag_t, struct iommu_state *, + bus_dma_segment_t *, int); +int iommu_dvmamem_map(bus_dma_tag_t, struct iommu_state *, + bus_dma_segment_t *, int, size_t, caddr_t *, int); +void iommu_dvmamem_unmap(bus_dma_tag_t, struct iommu_state *, + caddr_t, size_t); #endif /* _SPARC64_DEV_IOMMUVAR_H_ */ diff --git a/sys/arch/sparc64/dev/pci_machdep.c b/sys/arch/sparc64/dev/pci_machdep.c index e7883a956d0..c18c02c5e3f 100644 --- a/sys/arch/sparc64/dev/pci_machdep.c +++ b/sys/arch/sparc64/dev/pci_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.c,v 1.6 2001/10/12 14:57:04 jason Exp $ */ +/* $OpenBSD: pci_machdep.c,v 1.7 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: pci_machdep.c,v 1.22 2001/07/20 00:07:13 eeh Exp $ */ /* @@ -469,7 +469,7 @@ pci_intr_establish(pc, ih, level, func, arg, what) pci_chipset_tag_t pc; pci_intr_handle_t ih; int level; - int (*func) __P((void *)); + int (*func)(void *); void *arg; char *what; { diff --git a/sys/arch/sparc64/dev/pcons.c b/sys/arch/sparc64/dev/pcons.c index 5f560c77779..0a808fe4f06 100644 --- a/sys/arch/sparc64/dev/pcons.c +++ b/sys/arch/sparc64/dev/pcons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcons.c,v 1.3 2001/12/08 17:11:55 miod Exp $ */ +/* $OpenBSD: pcons.c,v 1.4 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: pcons.c,v 1.7 2001/05/02 10:32:20 scw Exp $ */ /*- @@ -76,10 +76,10 @@ typedef struct cnm_state { #define cn_trap() #endif #define cn_isconsole(d) ((d) == cn_tab->cn_dev) -void cn_init_magic __P((cnm_state_t *cnm)); -void cn_destroy_magic __P((cnm_state_t *cnm)); -int cn_set_magic __P((char *magic)); -int cn_get_magic __P((char *magic, int len)); +void cn_init_magic(cnm_state_t *cnm); +void cn_destroy_magic(cnm_state_t *cnm); +int cn_set_magic(char *magic); +int cn_get_magic(char *magic, int len); /* This should be called for each byte read */ #ifndef cn_check_magic #define cn_check_magic(d, k, s) \ @@ -106,8 +106,8 @@ int cn_get_magic __P((char *magic, int len)); #include <sparc64/dev/cons.h> -static int pconsmatch __P((struct device *, void *, void *)); -static void pconsattach __P((struct device *, struct device *, void *)); +static int pconsmatch(struct device *, void *, void *); +static void pconsattach(struct device *, struct device *, void *); struct cfattach pcons_ca = { sizeof(struct pconssoftc), pconsmatch, pconsattach @@ -120,7 +120,7 @@ struct cfdriver pcons_cd = { extern struct cfdriver pcons_cd; static struct cnm_state pcons_cnm_state; -static int pconsprobe __P((void)); +static int pconsprobe(void); extern struct consdev *cn_tab; static int @@ -130,7 +130,7 @@ pconsmatch(parent, match, aux) void *aux; { struct mainbus_attach_args *ma = aux; - extern int prom_cngetc __P((dev_t)); + extern int prom_cngetc(dev_t); /* Only attach if no other console has attached. */ return ((strcmp("pcons", ma->ma_name) == 0) && @@ -138,7 +138,7 @@ pconsmatch(parent, match, aux) } -static void pcons_poll __P((void *)); +static void pcons_poll(void *); static void pconsattach(parent, self, aux) @@ -156,8 +156,8 @@ pconsattach(parent, self, aux) timeout_set(&sc->sc_poll_to, pcons_poll, sc); } -static void pconsstart __P((struct tty *)); -static int pconsparam __P((struct tty *, struct termios *)); +static void pconsstart(struct tty *); +static int pconsparam(struct tty *, struct termios *); int pconsopen(dev, flag, mode, p) @@ -373,7 +373,7 @@ pcons_cnpollc(dev, on) } } -void pcons_dopoll __P((void)); +void pcons_dopoll(void); void pcons_dopoll() { pcons_poll((void*)pcons_cd.cd_devs[0]); diff --git a/sys/arch/sparc64/dev/psycho.c b/sys/arch/sparc64/dev/psycho.c index e5f53ca081d..cebe0169b01 100644 --- a/sys/arch/sparc64/dev/psycho.c +++ b/sys/arch/sparc64/dev/psycho.c @@ -1,4 +1,4 @@ -/* $OpenBSD: psycho.c,v 1.14 2002/02/05 18:34:39 jason Exp $ */ +/* $OpenBSD: psycho.c,v 1.15 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp $ */ /* @@ -70,48 +70,48 @@ int psycho_debug = 0x0; #define DPRINTF(l, s) #endif -static pci_chipset_tag_t psycho_alloc_chipset __P((struct psycho_pbm *, int, - pci_chipset_tag_t)); -void psycho_get_bus_range __P((int, int *)); -void psycho_get_ranges __P((int, struct psycho_ranges **, int *)); -void psycho_set_intr __P((struct psycho_softc *, int, void *, - u_int64_t *, u_int64_t *)); +static pci_chipset_tag_t psycho_alloc_chipset(struct psycho_pbm *, int, + pci_chipset_tag_t); +void psycho_get_bus_range(int, int *); +void psycho_get_ranges(int, struct psycho_ranges **, int *); +void psycho_set_intr(struct psycho_softc *, int, void *, + u_int64_t *, u_int64_t *); /* Interrupt handlers */ -int psycho_ue __P((void *)); -int psycho_ce __P((void *)); -int psycho_bus_a __P((void *)); -int psycho_bus_b __P((void *)); -int psycho_bus_error __P((struct psycho_softc *, int)); -int psycho_powerfail __P((void *)); -int psycho_wakeup __P((void *)); +int psycho_ue(void *); +int psycho_ce(void *); +int psycho_bus_a(void *); +int psycho_bus_b(void *); +int psycho_bus_error(struct psycho_softc *, int); +int psycho_powerfail(void *); +int psycho_wakeup(void *); /* IOMMU support */ -void psycho_iommu_init __P((struct psycho_softc *, int)); +void psycho_iommu_init(struct psycho_softc *, int); /* * bus space and bus dma support for UltraSPARC `psycho'. note that most * of the bus dma support is provided by the iommu dvma controller. */ -paddr_t psycho_bus_mmap __P((bus_space_tag_t, bus_addr_t, off_t, int, int)); -int _psycho_bus_map __P((bus_space_tag_t, bus_type_t, bus_addr_t, - bus_size_t, int, vaddr_t, bus_space_handle_t *)); +paddr_t psycho_bus_mmap(bus_space_tag_t, bus_addr_t, off_t, int, int); +int _psycho_bus_map(bus_space_tag_t, bus_type_t, bus_addr_t, + bus_size_t, int, vaddr_t, bus_space_handle_t *); void *psycho_intr_establish __P((bus_space_tag_t, int, int, int, - int (*) __P((void *)), void *)); - -int psycho_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); -void psycho_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t)); -int psycho_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int)); -void psycho_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t, bus_addr_t, - bus_size_t, int)); -int psycho_dmamem_alloc __P((bus_dma_tag_t, bus_size_t, bus_size_t, bus_size_t, - bus_dma_segment_t *, int, int *, int)); -void psycho_dmamem_free __P((bus_dma_tag_t, bus_dma_segment_t *, int)); -int psycho_dmamem_map __P((bus_dma_tag_t, bus_dma_segment_t *, int, size_t, - caddr_t *, int)); -void psycho_dmamem_unmap __P((bus_dma_tag_t, caddr_t, size_t)); + int (*)(void *), void *)); + +int psycho_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int); +void psycho_dmamap_unload(bus_dma_tag_t, bus_dmamap_t); +int psycho_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int); +void psycho_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t, + bus_size_t, int); +int psycho_dmamem_alloc(bus_dma_tag_t, bus_size_t, bus_size_t, bus_size_t, + bus_dma_segment_t *, int, int *, int); +void psycho_dmamem_free(bus_dma_tag_t, bus_dma_segment_t *, int); +int psycho_dmamem_map(bus_dma_tag_t, bus_dma_segment_t *, int, size_t, + caddr_t *, int); +void psycho_dmamem_unmap(bus_dma_tag_t, caddr_t, size_t); /* base pci_chipset */ extern struct sparc_pci_chipset _sparc_pci_chipset; @@ -119,10 +119,10 @@ extern struct sparc_pci_chipset _sparc_pci_chipset; /* * autoconfiguration */ -int psycho_match __P((struct device *, void *, void *)); -void psycho_attach __P((struct device *, struct device *, void *)); -int psycho_print __P((void *aux, const char *p)); -int psycho_get_childspace __P((int)); +int psycho_match(struct device *, void *, void *); +void psycho_attach(struct device *, struct device *, void *); +int psycho_print(void *aux, const char *p); +int psycho_get_childspace(int); struct cfattach psycho_ca = { @@ -950,7 +950,7 @@ psycho_intr_establish(t, ihandle, level, flags, handler, arg) int ihandle; int level; int flags; - int (*handler) __P((void *)); + int (*handler)(void *); void *arg; { struct psycho_pbm *pp = t->cookie; diff --git a/sys/arch/sparc64/dev/psychovar.h b/sys/arch/sparc64/dev/psychovar.h index b9af8ec6346..174ab307fea 100644 --- a/sys/arch/sparc64/dev/psychovar.h +++ b/sys/arch/sparc64/dev/psychovar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psychovar.h,v 1.3 2002/01/31 18:27:26 jason Exp $ */ +/* $OpenBSD: psychovar.h,v 1.4 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: psychovar.h,v 1.6 2001/07/20 00:07:13 eeh Exp $ */ /* @@ -110,8 +110,8 @@ struct psycho_softc { }; /* config space is per-psycho. mem/io/dma are per-pci bus */ -bus_dma_tag_t psycho_alloc_dma_tag __P((struct psycho_pbm *)); -bus_space_tag_t psycho_alloc_bus_tag __P((struct psycho_pbm *, int)); +bus_dma_tag_t psycho_alloc_dma_tag(struct psycho_pbm *); +bus_space_tag_t psycho_alloc_bus_tag(struct psycho_pbm *, int); #define psycho_alloc_config_tag(pp) psycho_alloc_bus_tag((pp), PCI_CONFIG_BUS_SPACE) #define psycho_alloc_mem_tag(pp) psycho_alloc_bus_tag((pp), PCI_MEMORY_BUS_SPACE) diff --git a/sys/arch/sparc64/dev/sab.c b/sys/arch/sparc64/dev/sab.c index 0e34e94b176..e476eee5714 100644 --- a/sys/arch/sparc64/dev/sab.c +++ b/sys/arch/sparc64/dev/sab.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sab.c,v 1.5 2002/01/18 21:15:56 jason Exp $ */ +/* $OpenBSD: sab.c,v 1.6 2002/03/14 01:26:44 millert Exp $ */ /* * Copyright (c) 2001 Jason L. Wright (jason@thought.net) @@ -118,42 +118,42 @@ struct sabtty_softc *sabtty_cons_output; #define SAB_WRITE(sc,r,v) \ bus_space_write_1((sc)->sc_bt, (sc)->sc_bh, (r), (v)) -int sab_match __P((struct device *, void *, void *)); -void sab_attach __P((struct device *, struct device *, void *)); -int sab_print __P((void *, const char *)); -int sab_intr __P((void *)); -void sab_softintr __P((void *)); -void sab_cnputc __P((dev_t, int)); -int sab_cngetc __P((dev_t)); -void sab_cnpollc __P((dev_t, int)); - -int sabtty_match __P((struct device *, void *, void *)); -void sabtty_attach __P((struct device *, struct device *, void *)); -void sabtty_start __P((struct tty *)); -int sabtty_param __P((struct tty *, struct termios *)); -int sabtty_intr __P((struct sabtty_softc *, int *)); -void sabtty_softintr __P((struct sabtty_softc *)); -int sabtty_mdmctrl __P((struct sabtty_softc *, int, int)); -void sabtty_cec_wait __P((struct sabtty_softc *)); -void sabtty_tec_wait __P((struct sabtty_softc *)); -void sabtty_reset __P((struct sabtty_softc *)); -void sabtty_flush __P((struct sabtty_softc *)); -int sabtty_speed __P((int)); -void sabtty_console_flags __P((struct sabtty_softc *)); -void sabtty_cnpollc __P((struct sabtty_softc *, int)); -void sabtty_shutdown __P((void *)); -int sabttyparam __P((struct sabtty_softc *, struct tty *, struct termios *)); - -int sabttyopen __P((dev_t, int, int, struct proc *)); -int sabttyclose __P((dev_t, int, int, struct proc *)); -int sabttyread __P((dev_t, struct uio *, int)); -int sabttywrite __P((dev_t, struct uio *, int)); -int sabttyioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); -int sabttystop __P((struct tty *, int)); -struct tty *sabttytty __P((dev_t)); -void sabtty_cnputc __P((struct sabtty_softc *, int)); -int sabtty_cngetc __P((struct sabtty_softc *)); -void sabtty_abort __P((struct sabtty_softc *)); +int sab_match(struct device *, void *, void *); +void sab_attach(struct device *, struct device *, void *); +int sab_print(void *, const char *); +int sab_intr(void *); +void sab_softintr(void *); +void sab_cnputc(dev_t, int); +int sab_cngetc(dev_t); +void sab_cnpollc(dev_t, int); + +int sabtty_match(struct device *, void *, void *); +void sabtty_attach(struct device *, struct device *, void *); +void sabtty_start(struct tty *); +int sabtty_param(struct tty *, struct termios *); +int sabtty_intr(struct sabtty_softc *, int *); +void sabtty_softintr(struct sabtty_softc *); +int sabtty_mdmctrl(struct sabtty_softc *, int, int); +void sabtty_cec_wait(struct sabtty_softc *); +void sabtty_tec_wait(struct sabtty_softc *); +void sabtty_reset(struct sabtty_softc *); +void sabtty_flush(struct sabtty_softc *); +int sabtty_speed(int); +void sabtty_console_flags(struct sabtty_softc *); +void sabtty_cnpollc(struct sabtty_softc *, int); +void sabtty_shutdown(void *); +int sabttyparam(struct sabtty_softc *, struct tty *, struct termios *); + +int sabttyopen(dev_t, int, int, struct proc *); +int sabttyclose(dev_t, int, int, struct proc *); +int sabttyread(dev_t, struct uio *, int); +int sabttywrite(dev_t, struct uio *, int); +int sabttyioctl(dev_t, u_long, caddr_t, int, struct proc *); +int sabttystop(struct tty *, int); +struct tty *sabttytty(dev_t); +void sabtty_cnputc(struct sabtty_softc *, int); +int sabtty_cngetc(struct sabtty_softc *); +void sabtty_abort(struct sabtty_softc *); struct cfattach sab_ca = { sizeof(struct sab_softc), sab_match, sab_attach diff --git a/sys/arch/sparc64/dev/sbus.c b/sys/arch/sparc64/dev/sbus.c index 14d730b27ea..3f8c463110c 100644 --- a/sys/arch/sparc64/dev/sbus.c +++ b/sys/arch/sparc64/dev/sbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbus.c,v 1.11 2002/03/12 19:46:25 jason Exp $ */ +/* $OpenBSD: sbus.c,v 1.12 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: sbus.c,v 1.46 2001/10/07 20:30:41 eeh Exp $ */ /*- @@ -138,35 +138,35 @@ int sbus_debug = 0; #define DPRINTF(l, s) #endif -void sbusreset __P((int)); +void sbusreset(int); -static bus_space_tag_t sbus_alloc_bustag __P((struct sbus_softc *)); -static bus_dma_tag_t sbus_alloc_dmatag __P((struct sbus_softc *)); -static int sbus_get_intr __P((struct sbus_softc *, int, - struct sbus_intr **, int *, int)); -int sbus_bus_mmap __P((bus_space_tag_t, bus_type_t, bus_addr_t, - int, bus_space_handle_t *)); -static int sbus_overtemp __P((void *)); -static int _sbus_bus_map __P(( +static bus_space_tag_t sbus_alloc_bustag(struct sbus_softc *); +static bus_dma_tag_t sbus_alloc_dmatag(struct sbus_softc *); +static int sbus_get_intr(struct sbus_softc *, int, + struct sbus_intr **, int *, int); +int sbus_bus_mmap(bus_space_tag_t, bus_type_t, bus_addr_t, + int, bus_space_handle_t *); +static int sbus_overtemp(void *); +static int _sbus_bus_map( bus_space_tag_t, bus_type_t, bus_addr_t, /*offset*/ bus_size_t, /*size*/ int, /*flags*/ vaddr_t, /*preferred virtual address */ - bus_space_handle_t *)); + bus_space_handle_t *); static void *sbus_intr_establish __P(( bus_space_tag_t, int, /*Sbus interrupt level*/ int, /*`device class' priority*/ int, /*flags*/ - int (*) __P((void *)), /*handler*/ + int (*)(void *), /*handler*/ void *)); /*handler arg*/ /* autoconfiguration driver */ -int sbus_match __P((struct device *, void *, void *)); -void sbus_attach __P((struct device *, struct device *, void *)); +int sbus_match(struct device *, void *, void *); +void sbus_attach(struct device *, struct device *, void *); struct cfattach sbus_ca = { @@ -182,23 +182,23 @@ extern struct cfdriver sbus_cd; /* * DVMA routines */ -int sbus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); -void sbus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t)); -int sbus_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int)); -void sbus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t, bus_addr_t, - bus_size_t, int)); -int sbus_dmamem_alloc __P((bus_dma_tag_t tag, bus_size_t size, +int sbus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int); +void sbus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t); +int sbus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int); +void sbus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t, + bus_size_t, int); +int sbus_dmamem_alloc(bus_dma_tag_t tag, bus_size_t size, bus_size_t alignment, bus_size_t boundary, bus_dma_segment_t *segs, int nsegs, int *rsegs, - int flags)); -void sbus_dmamem_free __P((bus_dma_tag_t tag, bus_dma_segment_t *segs, - int nsegs)); -int sbus_dmamem_map __P((bus_dma_tag_t tag, bus_dma_segment_t *segs, - int nsegs, size_t size, caddr_t *kvap, int flags)); -void sbus_dmamem_unmap __P((bus_dma_tag_t tag, caddr_t kva, - size_t size)); + int flags); +void sbus_dmamem_free(bus_dma_tag_t tag, bus_dma_segment_t *segs, + int nsegs); +int sbus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs, + int nsegs, size_t size, caddr_t *kvap, int flags); +void sbus_dmamem_unmap(bus_dma_tag_t tag, caddr_t kva, + size_t size); /* * Child devices receive the Sbus interrupt level in their attach @@ -701,7 +701,7 @@ sbus_intr_establish(t, pri, level, flags, handler, arg) int pri; int level; int flags; - int (*handler) __P((void *)); + int (*handler)(void *); void *arg; { struct sbus_softc *sc = t->cookie; diff --git a/sys/arch/sparc64/dev/sbusvar.h b/sys/arch/sparc64/dev/sbusvar.h index f00e6b1d03a..1794644d80e 100644 --- a/sys/arch/sparc64/dev/sbusvar.h +++ b/sys/arch/sparc64/dev/sbusvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sbusvar.h,v 1.3 2002/01/04 05:19:26 jason Exp $ */ +/* $OpenBSD: sbusvar.h,v 1.4 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: sbusvar.h,v 1.7 1999/06/05 05:30:43 mrg Exp $ */ /*- @@ -115,6 +115,6 @@ struct sbus_softc { struct iommu_state sc_is; /* IOMMU state, see iommureg.h */ }; -bus_addr_t sbus_bus_addr __P((bus_space_tag_t, u_int, u_int)); +bus_addr_t sbus_bus_addr(bus_space_tag_t, u_int, u_int); #endif /* _SBUS_VAR_SPARC64_H_ */ diff --git a/sys/arch/sparc64/dev/upavar.h b/sys/arch/sparc64/dev/upavar.h index 054cc2a2de7..697c57b48b8 100644 --- a/sys/arch/sparc64/dev/upavar.h +++ b/sys/arch/sparc64/dev/upavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: upavar.h,v 1.2 2001/08/18 21:30:00 jason Exp $ */ +/* $OpenBSD: upavar.h,v 1.3 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: upavar.h,v 1.2 2000/01/14 14:33:31 pk Exp $ */ /*- @@ -96,7 +96,7 @@ struct upa_reg { struct upadev { struct device *ud_dev; /* backpointer to generic */ struct upadev *ud_bchain; /* forward link in bus chain */ - void (*ud_reset) __P((struct device *)); + void (*ud_reset)(struct device *); }; /* variables per Upa */ @@ -126,19 +126,19 @@ struct upa_attach_args { }; /* upa_attach() is also used from obio.c */ -void upa_attach __P((struct upa_softc *, char *, int, - const char * const *)); -int upa_print __P((void *, const char *)); +void upa_attach(struct upa_softc *, char *, int, + const char * const *); +int upa_print(void *, const char *); -int upadev_match __P((struct cfdata *, void *)); -void upa_establish __P((struct upadev *, struct device *)); +int upadev_match(struct cfdata *, void *); +void upa_establish(struct upadev *, struct device *); -int upa_setup_attach_args __P(( +int upa_setup_attach_args( struct upa_softc *, bus_space_tag_t, bus_dma_tag_t, int, /*node*/ - struct upa_attach_args *)); + struct upa_attach_args *); #define upa_bus_map(t, bt, a, s, f, v, hp) \ bus_space_map2(t, bt, a, s, f, v, hp) diff --git a/sys/arch/sparc64/dev/uperf.c b/sys/arch/sparc64/dev/uperf.c index fcb24f4f737..71a2944cc5e 100644 --- a/sys/arch/sparc64/dev/uperf.c +++ b/sys/arch/sparc64/dev/uperf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uperf.c,v 1.2 2002/01/31 18:35:19 jason Exp $ */ +/* $OpenBSD: uperf.c,v 1.3 2002/03/14 01:26:44 millert Exp $ */ /* * Copyright (c) 2002 Jason L. Wright (jason@thought.net) @@ -50,10 +50,10 @@ struct cfdriver uperf_cd = { NULL, "uperf", DV_DULL }; -int uperf_getcntsrc __P((struct uperf_softc *, struct uperf_io *)); -int uperf_findbyval __P((struct uperf_softc *, int, u_int, int *)); -int uperf_findbysrc __P((struct uperf_softc *, int, int, u_int32_t *)); -int uperf_setcntsrc __P((struct uperf_softc *, struct uperf_io *)); +int uperf_getcntsrc(struct uperf_softc *, struct uperf_io *); +int uperf_findbyval(struct uperf_softc *, int, u_int, int *); +int uperf_findbysrc(struct uperf_softc *, int, int, u_int32_t *); +int uperf_setcntsrc(struct uperf_softc *, struct uperf_io *); int uperfopen(dev, flags, mode, p) diff --git a/sys/arch/sparc64/dev/uperf_psycho.c b/sys/arch/sparc64/dev/uperf_psycho.c index c815d0a5938..5bfc8a5aa84 100644 --- a/sys/arch/sparc64/dev/uperf_psycho.c +++ b/sys/arch/sparc64/dev/uperf_psycho.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uperf_psycho.c,v 1.3 2002/01/31 18:35:19 jason Exp $ */ +/* $OpenBSD: uperf_psycho.c,v 1.4 2002/03/14 01:26:44 millert Exp $ */ /* * Copyright (c) 2002 Jason L. Wright (jason@thought.net) @@ -51,8 +51,8 @@ #include <arch/sparc64/dev/psychovar.h> #include <arch/sparc64/dev/uperfvar.h> -int uperf_psycho_match __P((struct device *, void *, void *)); -void uperf_psycho_attach __P((struct device *, struct device *, void *)); +int uperf_psycho_match(struct device *, void *, void *); +void uperf_psycho_attach(struct device *, struct device *, void *); struct uperf_psycho_softc { struct uperf_softc sc_usc; @@ -63,10 +63,10 @@ struct cfattach uperf_psycho_ca = { sizeof(struct uperf_psycho_softc), uperf_psycho_match, uperf_psycho_attach }; -int uperf_psycho_getcnt __P((void *, int, u_int32_t *, u_int32_t *)); -int uperf_psycho_clrcnt __P((void *, int)); -int uperf_psycho_getcntsrc __P((void *, int, u_int *, u_int *)); -int uperf_psycho_setcntsrc __P((void *, int, u_int, u_int)); +int uperf_psycho_getcnt(void *, int, u_int32_t *, u_int32_t *); +int uperf_psycho_clrcnt(void *, int); +int uperf_psycho_getcntsrc(void *, int, u_int *, u_int *); +int uperf_psycho_setcntsrc(void *, int, u_int, u_int); struct uperf_src uperf_psycho_srcs[] = { { UPERFSRC_SDVRA, UPERF_CNT0|UPERF_CNT1, PSY_PMCRSEL_SDVRA }, diff --git a/sys/arch/sparc64/dev/vgafb.c b/sys/arch/sparc64/dev/vgafb.c index fed90afb065..3a6e84321b0 100644 --- a/sys/arch/sparc64/dev/vgafb.c +++ b/sys/arch/sparc64/dev/vgafb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vgafb.c,v 1.5 2002/02/08 16:46:26 jason Exp $ */ +/* $OpenBSD: vgafb.c,v 1.6 2002/03/14 01:26:44 millert Exp $ */ /* * Copyright (c) 2001 Jason L. Wright (jason@thought.net) @@ -98,20 +98,20 @@ struct wsscreen_list vgafb_screenlist = { sizeof(vgafb_scrlist) / sizeof(struct wsscreen_descr *), vgafb_scrlist }; -int vgafb_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); -int vgafb_alloc_screen __P((void *, const struct wsscreen_descr *, void **, - int *, int *, long *)); -void vgafb_free_screen __P((void *, void *)); +int vgafb_ioctl(void *, u_long, caddr_t, int, struct proc *); +int vgafb_alloc_screen(void *, const struct wsscreen_descr *, void **, + int *, int *, long *); +void vgafb_free_screen(void *, void *); int vgafb_show_screen __P((void *, void *, int, - void (*cb) __P((void *, int, int)), void *)); -paddr_t vgafb_mmap __P((void *, off_t, int)); -int vgafb_is_console __P((int)); -int vgafb_getcmap __P((struct vgafb_softc *, struct wsdisplay_cmap *)); -int vgafb_putcmap __P((struct vgafb_softc *, struct wsdisplay_cmap *)); -void vgafb_setcolor __P((struct vgafb_softc *, unsigned int, - u_int8_t, u_int8_t, u_int8_t)); + void (*cb)(void *, int, int), void *)); +paddr_t vgafb_mmap(void *, off_t, int); +int vgafb_is_console(int); +int vgafb_getcmap(struct vgafb_softc *, struct wsdisplay_cmap *); +int vgafb_putcmap(struct vgafb_softc *, struct wsdisplay_cmap *); +void vgafb_setcolor(struct vgafb_softc *, unsigned int, + u_int8_t, u_int8_t, u_int8_t); -static int a2int __P((char *, int)); +static int a2int(char *, int); struct wsdisplay_accessops vgafb_accessops = { vgafb_ioctl, @@ -122,8 +122,8 @@ struct wsdisplay_accessops vgafb_accessops = { 0 /* load_font */ }; -int vgafbmatch __P((struct device *, void *, void *)); -void vgafbattach __P((struct device *, struct device *, void *)); +int vgafbmatch(struct device *, void *, void *); +void vgafbattach(struct device *, struct device *, void *); struct cfattach vgafb_ca = { sizeof (struct vgafb_softc), vgafbmatch, vgafbattach @@ -402,7 +402,7 @@ vgafb_show_screen(v, cookie, waitok, cb, cbarg) void *v; void *cookie; int waitok; - void (*cb) __P((void *, int, int)); + void (*cb)(void *, int, int); void *cbarg; { return (0); diff --git a/sys/arch/sparc64/dev/z8530kbd.c b/sys/arch/sparc64/dev/z8530kbd.c index 9c5fbb51deb..412500ff1e5 100644 --- a/sys/arch/sparc64/dev/z8530kbd.c +++ b/sys/arch/sparc64/dev/z8530kbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530kbd.c,v 1.9 2002/03/05 20:10:51 jason Exp $ */ +/* $OpenBSD: z8530kbd.c,v 1.10 2002/03/14 01:26:44 millert Exp $ */ /* $NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $ */ /*- @@ -217,35 +217,35 @@ struct cfattach zskbd_ca = { struct zsops zsops_kbd; -static void zs_modem __P((struct zskbd_softc *, int)); -static void zs_hwiflow __P((struct zskbd_softc *)); -static void zs_maskintr __P((struct zskbd_softc *)); +static void zs_modem(struct zskbd_softc *, int); +static void zs_hwiflow(struct zskbd_softc *); +static void zs_maskintr(struct zskbd_softc *); -struct zskbd_softc *zskbd_device_lookup __P((struct cfdriver *, int)); +struct zskbd_softc *zskbd_device_lookup(struct cfdriver *, int); /* Low-level routines. */ -static void zskbd_rxint __P((struct zs_chanstate *)); -static void zskbd_stint __P((struct zs_chanstate *, int)); -static void zskbd_txint __P((struct zs_chanstate *)); -static void zskbd_softint __P((struct zs_chanstate *)); -static void zskbd_diag __P((void *)); +static void zskbd_rxint(struct zs_chanstate *); +static void zskbd_stint(struct zs_chanstate *, int); +static void zskbd_txint(struct zs_chanstate *); +static void zskbd_softint(struct zs_chanstate *); +static void zskbd_diag(void *); -void zskbd_init __P((struct zskbd_softc *)); -void zskbd_putc __P((struct zskbd_softc *, u_int8_t)); -void zskbd_raw __P((struct zskbd_softc *, u_int8_t)); +void zskbd_init(struct zskbd_softc *); +void zskbd_putc(struct zskbd_softc *, u_int8_t); +void zskbd_raw(struct zskbd_softc *, u_int8_t); /* wskbd glue */ -int zskbd_enable __P((void *, int)); -void zskbd_set_leds __P((void *, int)); -int zskbd_get_leds __P((struct zskbd_softc *)); -int zskbd_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); -void zskbd_cngetc __P((void *, u_int *, int *)); -void zskbd_cnpollc __P((void *, int)); - -void zsstart_tx __P((struct zskbd_softc *)); -int zsenqueue_tx __P((struct zskbd_softc *, u_char *, int)); -void zskbd_bell __P((struct zskbd_softc *, u_int, u_int, u_int)); -void zskbd_bellstop __P((void *)); +int zskbd_enable(void *, int); +void zskbd_set_leds(void *, int); +int zskbd_get_leds(struct zskbd_softc *); +int zskbd_ioctl(void *, u_long, caddr_t, int, struct proc *); +void zskbd_cngetc(void *, u_int *, int *); +void zskbd_cnpollc(void *, int); + +void zsstart_tx(struct zskbd_softc *); +int zsenqueue_tx(struct zskbd_softc *, u_char *, int); +void zskbd_bell(struct zskbd_softc *, u_int, u_int, u_int); +void zskbd_bellstop(void *); struct wskbd_accessops zskbd_accessops = { zskbd_enable, @@ -764,9 +764,9 @@ zs_hwiflow(zst) ****************************************************************/ #define integrate -integrate void zskbd_rxsoft __P((struct zskbd_softc *)); -integrate void zskbd_txsoft __P((struct zskbd_softc *)); -integrate void zskbd_stsoft __P((struct zskbd_softc *)); +integrate void zskbd_rxsoft(struct zskbd_softc *); +integrate void zskbd_txsoft(struct zskbd_softc *); +integrate void zskbd_stsoft(struct zskbd_softc *); /* * receiver ready interrupt. * called at splzs diff --git a/sys/arch/sparc64/dev/z8530sc.c b/sys/arch/sparc64/dev/z8530sc.c index fa631060e13..df0a27bd052 100644 --- a/sys/arch/sparc64/dev/z8530sc.c +++ b/sys/arch/sparc64/dev/z8530sc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530sc.c,v 1.1 2001/08/21 21:42:30 jason Exp $ */ +/* $OpenBSD: z8530sc.c,v 1.2 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: z8530sc.c,v 1.15 2001/07/07 15:53:22 thorpej Exp $ */ /* @@ -311,10 +311,10 @@ zsc_intr_soft(arg) * Provide a null zs "ops" vector. */ -static void zsnull_rxint __P((struct zs_chanstate *)); -static void zsnull_stint __P((struct zs_chanstate *, int)); -static void zsnull_txint __P((struct zs_chanstate *)); -static void zsnull_softint __P((struct zs_chanstate *)); +static void zsnull_rxint(struct zs_chanstate *); +static void zsnull_stint(struct zs_chanstate *, int); +static void zsnull_txint(struct zs_chanstate *); +static void zsnull_softint(struct zs_chanstate *); static void zsnull_rxint(cs) diff --git a/sys/arch/sparc64/dev/z8530sc.h b/sys/arch/sparc64/dev/z8530sc.h index 73986ba7707..6cde4b1329f 100644 --- a/sys/arch/sparc64/dev/z8530sc.h +++ b/sys/arch/sparc64/dev/z8530sc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530sc.h,v 1.2 2002/01/15 22:00:12 jason Exp $ */ +/* $OpenBSD: z8530sc.h,v 1.3 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: z8530sc.h,v 1.15 2001/05/11 01:40:48 thorpej Exp $ */ /* @@ -52,13 +52,13 @@ */ struct zs_chanstate; struct zsops { - void (*zsop_rxint) __P((struct zs_chanstate *)); + void (*zsop_rxint)(struct zs_chanstate *); /* receive char available */ - void (*zsop_stint) __P((struct zs_chanstate *, int)); + void (*zsop_stint)(struct zs_chanstate *, int); /* external/status */ - void (*zsop_txint) __P((struct zs_chanstate *)); + void (*zsop_txint)(struct zs_chanstate *); /* xmit buffer empty */ - void (*zsop_softint) __P((struct zs_chanstate *)); + void (*zsop_softint)(struct zs_chanstate *); /* process software interrupt */ }; @@ -116,8 +116,8 @@ struct zs_chanstate { char cs_spare1; /* (for skippy :) */ /* power management hooks */ - int (*enable) __P((struct zs_chanstate *)); - void (*disable) __P((struct zs_chanstate *)); + int (*enable)(struct zs_chanstate *); + void (*disable)(struct zs_chanstate *); int enabled; /* MD code might define a larger variant of this. */ @@ -142,17 +142,17 @@ struct zsc_attach_args { #define ZS_HWFLAG_USE_CONSDEV 32 /* Use console ops from `consdev' */ #define ZS_HWFLAG_NORESET 64 /* Don't reset at attach time */ -int zsc_intr_soft __P((void *)); -int zsc_intr_hard __P((void *)); +int zsc_intr_soft(void *); +int zsc_intr_hard(void *); -void zs_abort __P((struct zs_chanstate *)); -void zs_break __P((struct zs_chanstate *, int)); -void zs_iflush __P((struct zs_chanstate *)); -void zs_loadchannelregs __P((struct zs_chanstate *)); -int zs_set_speed __P((struct zs_chanstate *, int)); -int zs_set_modes __P((struct zs_chanstate *, int)); +void zs_abort(struct zs_chanstate *); +void zs_break(struct zs_chanstate *, int); +void zs_iflush(struct zs_chanstate *); +void zs_loadchannelregs(struct zs_chanstate *); +int zs_set_speed(struct zs_chanstate *, int); +int zs_set_modes(struct zs_chanstate *, int); extern int zs_major; -int zs_check_kgdb __P((struct zs_chanstate *, int)); +int zs_check_kgdb(struct zs_chanstate *, int); diff --git a/sys/arch/sparc64/dev/z8530tty.c b/sys/arch/sparc64/dev/z8530tty.c index 09976d724aa..be813e80cef 100644 --- a/sys/arch/sparc64/dev/z8530tty.c +++ b/sys/arch/sparc64/dev/z8530tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530tty.c,v 1.3 2002/01/30 20:45:34 nordin Exp $ */ +/* $OpenBSD: z8530tty.c,v 1.4 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $ */ /*- @@ -206,24 +206,24 @@ struct zsops zsops_tty; /* Routines called from other code. */ cdev_decl(zs); /* open, close, read, write, ioctl, stop, ... */ -static void zs_shutdown __P((struct zstty_softc *)); -static void zsstart __P((struct tty *)); -static int zsparam __P((struct tty *, struct termios *)); -static void zs_modem __P((struct zstty_softc *, int)); -static void tiocm_to_zs __P((struct zstty_softc *, u_long, int)); -static int zs_to_tiocm __P((struct zstty_softc *)); -static int zshwiflow __P((struct tty *, int)); -static void zs_hwiflow __P((struct zstty_softc *)); -static void zs_maskintr __P((struct zstty_softc *)); +static void zs_shutdown(struct zstty_softc *); +static void zsstart(struct tty *); +static int zsparam(struct tty *, struct termios *); +static void zs_modem(struct zstty_softc *, int); +static void tiocm_to_zs(struct zstty_softc *, u_long, int); +static int zs_to_tiocm(struct zstty_softc *); +static int zshwiflow(struct tty *, int); +static void zs_hwiflow(struct zstty_softc *); +static void zs_maskintr(struct zstty_softc *); -struct zstty_softc *zs_device_lookup __P((struct cfdriver *, int)); +struct zstty_softc *zs_device_lookup(struct cfdriver *, int); /* Low-level routines. */ -static void zstty_rxint __P((struct zs_chanstate *)); -static void zstty_stint __P((struct zs_chanstate *, int)); -static void zstty_txint __P((struct zs_chanstate *)); -static void zstty_softint __P((struct zs_chanstate *)); -static void zstty_diag __P((void *)); +static void zstty_rxint(struct zs_chanstate *); +static void zstty_stint(struct zs_chanstate *, int); +static void zstty_txint(struct zs_chanstate *); +static void zstty_softint(struct zs_chanstate *); +static void zstty_diag(void *); #define ZSUNIT(x) (minor(x) & 0x7ffff) @@ -1205,9 +1205,9 @@ zs_hwiflow(zst) ****************************************************************/ #define integrate static inline -integrate void zstty_rxsoft __P((struct zstty_softc *, struct tty *)); -integrate void zstty_txsoft __P((struct zstty_softc *, struct tty *)); -integrate void zstty_stsoft __P((struct zstty_softc *, struct tty *)); +integrate void zstty_rxsoft(struct zstty_softc *, struct tty *); +integrate void zstty_txsoft(struct zstty_softc *, struct tty *); +integrate void zstty_stsoft(struct zstty_softc *, struct tty *); /* * receiver ready interrupt. * called at splzs @@ -1394,7 +1394,7 @@ zstty_rxsoft(zst, tp) struct tty *tp; { struct zs_chanstate *cs = zst->zst_cs; - int (*rint) __P((int c, struct tty *tp)) = linesw[tp->t_line].l_rint; + int (*rint)(int c, struct tty *tp) = linesw[tp->t_line].l_rint; u_char *get, *end; u_int cc, scc; u_char rr1; diff --git a/sys/arch/sparc64/dev/zs.c b/sys/arch/sparc64/dev/zs.c index 74a392aedd1..4a26da86fc6 100644 --- a/sys/arch/sparc64/dev/zs.c +++ b/sys/arch/sparc64/dev/zs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zs.c,v 1.8 2002/01/25 03:58:39 jason Exp $ */ +/* $OpenBSD: zs.c,v 1.9 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: zs.c,v 1.29 2001/05/30 15:24:24 lukem Exp $ */ /*- @@ -138,9 +138,9 @@ static u_char zs_init_reg[16] = { }; /* Console ops */ -static int zscngetc __P((dev_t)); -static void zscnputc __P((dev_t, int)); -static void zscnpollc __P((dev_t, int)); +static int zscngetc(dev_t); +static void zscnputc(dev_t, int); +static void zscnpollc(dev_t, int); struct consdev zs_consdev = { NULL, @@ -157,11 +157,11 @@ struct consdev zs_consdev = { ****************************************************************/ /* Definition of the driver for autoconfig. */ -static int zs_match_mainbus __P((struct device *, void *, void *)); -static void zs_attach_mainbus __P((struct device *, struct device *, void *)); +static int zs_match_mainbus(struct device *, void *, void *); +static void zs_attach_mainbus(struct device *, struct device *, void *); -static void zs_attach __P((struct zsc_softc *, struct zsdevice *, int)); -static int zs_print __P((void *, const char *name)); +static void zs_attach(struct zsc_softc *, struct zsdevice *, int); +static int zs_print(void *, const char *name); /* Do we really need this ? */ struct cfattach zs_ca = { @@ -177,18 +177,18 @@ extern int stdinnode; extern int fbnode; /* Interrupt handlers. */ -int zscheckintr __P((void *)); -static int zshard __P((void *)); -static void zssoft __P((void *)); +int zscheckintr(void *); +static int zshard(void *); +static void zssoft(void *); -static int zs_get_speed __P((struct zs_chanstate *)); +static int zs_get_speed(struct zs_chanstate *); /* Console device support */ -static int zs_console_flags __P((int, int, int)); +static int zs_console_flags(int, int, int); /* Power management hooks */ -int zs_enable __P((struct zs_chanstate *)); -void zs_disable __P((struct zs_chanstate *)); +int zs_enable(struct zs_chanstate *); +void zs_disable(struct zs_chanstate *); /* * Is the zs chip present? @@ -657,7 +657,7 @@ void zs_write_data(cs, val) * XXX - I think I like the mvme167 code better. -gwr ****************************************************************/ -extern void Debugger __P((void)); +extern void Debugger(void); /* * Handle user request to enter kernel debugger. diff --git a/sys/arch/sparc64/fpu/fpu.c b/sys/arch/sparc64/fpu/fpu.c index e12465598de..10e80a57c7d 100644 --- a/sys/arch/sparc64/fpu/fpu.c +++ b/sys/arch/sparc64/fpu/fpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu.c,v 1.4 2001/09/15 23:42:36 jason Exp $ */ +/* $OpenBSD: fpu.c,v 1.5 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: fpu.c,v 1.11 2000/12/06 01:47:50 mrg Exp $ */ /* @@ -89,24 +89,24 @@ #include <sparc64/fpu/fpu_emu.h> #include <sparc64/fpu/fpu_extern.h> -int fpu_regoffset __P((int, int)); -int fpu_insn_fmov __P((struct fpstate64 *, struct fpemu *, union instr)); -int fpu_insn_fabs __P((struct fpstate64 *, struct fpemu *, union instr)); -int fpu_insn_fneg __P((struct fpstate64 *, struct fpemu *, union instr)); -int fpu_insn_itof __P((struct fpemu *, union instr, int, int *, - int *, u_int *)); -int fpu_insn_ftoi __P((struct fpemu *, union instr, int *, int, u_int *)); -int fpu_insn_ftof __P((struct fpemu *, union instr, int *, int *, u_int *)); -int fpu_insn_fsqrt __P((struct fpemu *, union instr, int *, int *, u_int *)); -int fpu_insn_fcmp __P((struct fpstate64 *, struct fpemu *, union instr, int)); -int fpu_insn_fmul __P((struct fpemu *, union instr, int *, int *, u_int *)); -int fpu_insn_fmulx __P((struct fpemu *, union instr, int *, int *, u_int *)); -int fpu_insn_fdiv __P((struct fpemu *, union instr, int *, int *, u_int *)); -int fpu_insn_fadd __P((struct fpemu *, union instr, int *, int *, u_int *)); -int fpu_insn_fsub __P((struct fpemu *, union instr, int *, int *, u_int *)); -int fpu_insn_fmovcc __P((struct fpstate64 *, union instr)); -int fpu_insn_fmovr __P((struct fpstate64 *, union instr)); -void fpu_fcopy __P((u_int *, u_int *, int)); +int fpu_regoffset(int, int); +int fpu_insn_fmov(struct fpstate64 *, struct fpemu *, union instr); +int fpu_insn_fabs(struct fpstate64 *, struct fpemu *, union instr); +int fpu_insn_fneg(struct fpstate64 *, struct fpemu *, union instr); +int fpu_insn_itof(struct fpemu *, union instr, int, int *, + int *, u_int *); +int fpu_insn_ftoi(struct fpemu *, union instr, int *, int, u_int *); +int fpu_insn_ftof(struct fpemu *, union instr, int *, int *, u_int *); +int fpu_insn_fsqrt(struct fpemu *, union instr, int *, int *, u_int *); +int fpu_insn_fcmp(struct fpstate64 *, struct fpemu *, union instr, int); +int fpu_insn_fmul(struct fpemu *, union instr, int *, int *, u_int *); +int fpu_insn_fmulx(struct fpemu *, union instr, int *, int *, u_int *); +int fpu_insn_fdiv(struct fpemu *, union instr, int *, int *, u_int *); +int fpu_insn_fadd(struct fpemu *, union instr, int *, int *, u_int *); +int fpu_insn_fsub(struct fpemu *, union instr, int *, int *, u_int *); +int fpu_insn_fmovcc(struct fpstate64 *, union instr); +int fpu_insn_fmovr(struct fpstate64 *, union instr); +void fpu_fcopy(u_int *, u_int *, int); #ifdef DEBUG int fpe_debug = 0; diff --git a/sys/arch/sparc64/fpu/fpu_extern.h b/sys/arch/sparc64/fpu/fpu_extern.h index ca3ffa375fd..5df6c8c0d6b 100644 --- a/sys/arch/sparc64/fpu/fpu_extern.h +++ b/sys/arch/sparc64/fpu/fpu_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu_extern.h,v 1.2 2001/09/09 22:44:44 jason Exp $ */ +/* $OpenBSD: fpu_extern.h,v 1.3 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: fpu_extern.h,v 1.4 2000/08/03 18:32:08 eeh Exp $ */ /*- @@ -51,49 +51,49 @@ struct fpn; /* fpu.c */ #ifndef SUN4U -void fpu_cleanup __P((struct proc *, struct fpstate *)); -int fpu_emulate __P((struct proc *, struct trapframe *, struct fpstate *)); +void fpu_cleanup(struct proc *, struct fpstate *); +int fpu_emulate(struct proc *, struct trapframe *, struct fpstate *); #else /* SUN4U */ -void fpu_cleanup __P((struct proc *, struct fpstate64 *)); -int fpu_emulate __P((struct proc *, struct trapframe64 *, struct fpstate64 *)); +void fpu_cleanup(struct proc *, struct fpstate64 *); +int fpu_emulate(struct proc *, struct trapframe64 *, struct fpstate64 *); #endif /* SUN4U */ -int fpu_execute __P((struct fpemu *, union instr)); +int fpu_execute(struct fpemu *, union instr); /* fpu_add.c */ -struct fpn *fpu_add __P((struct fpemu *)); +struct fpn *fpu_add(struct fpemu *); /* fpu_compare.c */ -void fpu_compare __P((struct fpemu *, int)); +void fpu_compare(struct fpemu *, int); /* fpu_div.c */ -struct fpn *fpu_div __P((struct fpemu *)); +struct fpn *fpu_div(struct fpemu *); /* fpu_explode.c */ -int fpu_itof __P((struct fpn *, u_int)); +int fpu_itof(struct fpn *, u_int); #ifdef SUN4U -int fpu_xtof __P((struct fpn *, u_int64_t)); +int fpu_xtof(struct fpn *, u_int64_t); #endif /* SUN4U */ -int fpu_stof __P((struct fpn *, u_int)); -int fpu_dtof __P((struct fpn *, u_int, u_int )); -int fpu_qtof __P((struct fpn *, u_int, u_int , u_int , u_int )); -void fpu_explode __P((struct fpemu *, struct fpn *, int, int )); +int fpu_stof(struct fpn *, u_int); +int fpu_dtof(struct fpn *, u_int, u_int ); +int fpu_qtof(struct fpn *, u_int, u_int , u_int , u_int ); +void fpu_explode(struct fpemu *, struct fpn *, int, int ); /* fpu_implode.c */ -u_int fpu_ftoi __P((struct fpemu *, struct fpn *)); +u_int fpu_ftoi(struct fpemu *, struct fpn *); #ifdef SUN4U -u_int fpu_ftox __P((struct fpemu *, struct fpn *, u_int *)); +u_int fpu_ftox(struct fpemu *, struct fpn *, u_int *); #endif /* SUN4U */ -u_int fpu_ftos __P((struct fpemu *, struct fpn *)); -u_int fpu_ftod __P((struct fpemu *, struct fpn *, u_int *)); -u_int fpu_ftoq __P((struct fpemu *, struct fpn *, u_int *)); +u_int fpu_ftos(struct fpemu *, struct fpn *); +u_int fpu_ftod(struct fpemu *, struct fpn *, u_int *); +u_int fpu_ftoq(struct fpemu *, struct fpn *, u_int *); /* fpu_mul.c */ -struct fpn *fpu_mul __P((struct fpemu *)); +struct fpn *fpu_mul(struct fpemu *); /* fpu_sqrt.c */ -struct fpn *fpu_sqrt __P((struct fpemu *)); +struct fpn *fpu_sqrt(struct fpemu *); /* fpu_subr.c */ -int fpu_shr __P((register struct fpn *, register int)); -void fpu_norm __P((register struct fpn *)); -struct fpn *fpu_newnan __P((register struct fpemu *)); +int fpu_shr(register struct fpn *, register int); +void fpu_norm(register struct fpn *); +struct fpn *fpu_newnan(register struct fpemu *); diff --git a/sys/arch/sparc64/fpu/fpu_implode.c b/sys/arch/sparc64/fpu/fpu_implode.c index 4ca1187b361..d81ffbd688b 100644 --- a/sys/arch/sparc64/fpu/fpu_implode.c +++ b/sys/arch/sparc64/fpu/fpu_implode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu_implode.c,v 1.3 2001/09/10 16:05:17 jason Exp $ */ +/* $OpenBSD: fpu_implode.c,v 1.4 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: fpu_implode.c,v 1.7 2000/08/03 18:32:08 eeh Exp $ */ /* @@ -61,8 +61,8 @@ #include <sparc64/fpu/fpu_emu.h> #include <sparc64/fpu/fpu_extern.h> -static int round __P((register struct fpemu *, register struct fpn *)); -static int toinf __P((struct fpemu *, int)); +static int round(register struct fpemu *, register struct fpn *); +static int toinf(struct fpemu *, int); /* * Round a number (algorithm from Motorola MC68882 manual, modified for diff --git a/sys/arch/sparc64/include/autoconf.h b/sys/arch/sparc64/include/autoconf.h index b9166043b06..cdf099f0dfc 100644 --- a/sys/arch/sparc64/include/autoconf.h +++ b/sys/arch/sparc64/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.5 2001/09/26 20:21:04 jason Exp $ */ +/* $OpenBSD: autoconf.h,v 1.6 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: autoconf.h,v 1.10 2001/07/24 19:32:11 eeh Exp $ */ /*- @@ -127,16 +127,16 @@ struct mainbus_attach_args { /* * length; the others convert or make some other guarantee. */ -long getproplen __P((int node, char *name)); -int getprop __P((int, char *, size_t, int *, void **)); -char *getpropstring __P((int node, char *name)); -int getpropint __P((int node, char *name, int deflt)); +long getproplen(int node, char *name); +int getprop(int, char *, size_t, int *, void **); +char *getpropstring(int node, char *name); +int getpropint(int node, char *name, int deflt); /* Frequently used options node */ extern int optionsnode; /* new interfaces: */ -char *getpropstringA __P((int, char *, char *)); +char *getpropstringA(int, char *, char *); /* * The matchbyname function is useful in drivers that are matched @@ -146,13 +146,13 @@ char *getpropstringA __P((int, char *, char *)); */ struct device; struct cfdata; -int matchbyname __P((struct device *, struct cfdata *cf, void *aux)); +int matchbyname(struct device *, struct cfdata *cf, void *aux); /* * `clockfreq' produces a printable representation of a clock frequency * (this is just a frill). */ -char *clockfreq __P((long freq)); +char *clockfreq(long freq); /* Openprom V2 style boot path */ struct bootpath { @@ -161,24 +161,24 @@ struct bootpath { int val[3]; /* up to three optional values */ struct device *dev; /* device that recognised this component */ }; -struct bootpath *bootpath_store __P((int, struct bootpath *)); -int sd_crazymap __P((int)); +struct bootpath *bootpath_store(int, struct bootpath *); +int sd_crazymap(int); /* Parse a disk string into a dev_t, return device struct pointer */ -struct device *parsedisk __P((char *, int, int, dev_t *)); +struct device *parsedisk(char *, int, int, dev_t *); /* Establish a mountroot_hook, for benefit of floppy drive, mostly. */ -void mountroot_hook_establish __P((void (*) __P((struct device *)), +void mountroot_hook_establish __P((void (*)(struct device *), struct device *)); -void bootstrap __P((int)); -int firstchild __P((int)); -int nextsibling __P((int)); -void callrom __P((void)); -struct device *getdevunit __P((char *, int)); -void *findzs __P((int)); -int romgetcursoraddr __P((int **, int **)); -int findroot __P((void)); -int findnode __P((int, const char *)); -int node_has_property __P((int, const char *)); -void device_register __P((struct device *, void *)); +void bootstrap(int); +int firstchild(int); +int nextsibling(int); +void callrom(void); +struct device *getdevunit(char *, int); +void *findzs(int); +int romgetcursoraddr(int **, int **); +int findroot(void); +int findnode(int, const char *); +int node_has_property(int, const char *); +void device_register(struct device *, void *); diff --git a/sys/arch/sparc64/include/bsd_openprom.h b/sys/arch/sparc64/include/bsd_openprom.h index efa04c81661..19ee5997afc 100644 --- a/sys/arch/sparc64/include/bsd_openprom.h +++ b/sys/arch/sparc64/include/bsd_openprom.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bsd_openprom.h,v 1.2 2001/08/20 20:23:52 jason Exp $ */ +/* $OpenBSD: bsd_openprom.h,v 1.3 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: bsd_openprom.h,v 1.2 2000/03/13 23:52:34 soren Exp $ */ /* @@ -75,15 +75,15 @@ * and so forth). */ struct v0devops { - int (*v0_open) __P((char *dev)); - int (*v0_close) __P((int d)); - int (*v0_rbdev) __P((int d, int nblks, int blkno, void *addr)); - int (*v0_wbdev) __P((int d, int nblks, int blkno, void *addr)); - int (*v0_wnet) __P((int d, int nbytes, void *addr)); - int (*v0_rnet) __P((int d, int nbytes, void *addr)); - int (*v0_rcdev) __P((int d, int nbytes, int, void *addr)); - int (*v0_wcdev) __P((int d, int nbytes, int, void *addr)); - int (*v0_seek) __P((int d, long offset, int whence)); + int (*v0_open)(char *dev); + int (*v0_close)(int d); + int (*v0_rbdev)(int d, int nblks, int blkno, void *addr); + int (*v0_wbdev)(int d, int nblks, int blkno, void *addr); + int (*v0_wnet)(int d, int nbytes, void *addr); + int (*v0_rnet)(int d, int nbytes, void *addr); + int (*v0_rcdev)(int d, int nbytes, int, void *addr); + int (*v0_wcdev)(int d, int nbytes, int, void *addr); + int (*v0_seek)(int d, long offset, int whence); }; /* @@ -101,25 +101,25 @@ struct v2devops { * Convert an `instance handle' (acquired through v2_open()) to * a `package handle', a.k.a. a `node'. */ - int (*v2_fd_phandle) __P((int d)); + int (*v2_fd_phandle)(int d); /* Memory allocation and release. */ - void *(*v2_malloc) __P((caddr_t va, u_int sz)); - void (*v2_free) __P((caddr_t va, u_int sz)); + void *(*v2_malloc)(caddr_t va, u_int sz); + void (*v2_free)(caddr_t va, u_int sz); /* Device memory mapper. */ - caddr_t (*v2_mmap) __P((caddr_t va, int asi, u_int pa, u_int sz)); - void (*v2_munmap) __P((caddr_t va, u_int sz)); + caddr_t (*v2_mmap)(caddr_t va, int asi, u_int pa, u_int sz); + void (*v2_munmap)(caddr_t va, u_int sz); /* Device open, close, etc. */ - int (*v2_open) __P((char *devpath)); - void (*v2_close) __P((int d)); - int (*v2_read) __P((int d, void *buf, int nbytes)); - int (*v2_write) __P((int d, void *buf, int nbytes)); - void (*v2_seek) __P((int d, int hi, int lo)); - - void (*v2_chain) __P((void)); /* ??? */ - void (*v2_release) __P((void)); /* ??? */ + int (*v2_open)(char *devpath); + void (*v2_close)(int d); + int (*v2_read)(int d, void *buf, int nbytes); + int (*v2_write)(int d, void *buf, int nbytes); + void (*v2_seek)(int d, int hi, int lo); + + void (*v2_chain)(void); /* ??? */ + void (*v2_release)(void); /* ??? */ }; /* @@ -209,37 +209,37 @@ struct promvec { #define PROMDEV_TTYB 2 /* in/out to ttyb */ /* Blocking getchar/putchar. NOT REENTRANT! (grr) */ - int (*pv_getchar) __P((void)); - void (*pv_putchar) __P((int ch)); + int (*pv_getchar)(void); + void (*pv_putchar)(int ch); /* Non-blocking variants that return -1 on error. */ - int (*pv_nbgetchar) __P((void)); - int (*pv_nbputchar) __P((int ch)); + int (*pv_nbgetchar)(void); + int (*pv_nbputchar)(int ch); /* Put counted string (can be very slow). */ - void (*pv_putstr) __P((char *str, int len)); + void (*pv_putstr)(char *str, int len); /* Miscellany. */ - void (*pv_reboot) __P((char *bootstr)); - void (*pv_printf) __P((const char *fmt, ...)); - void (*pv_abort) __P((void)); /* L1-A abort */ + void (*pv_reboot)(char *bootstr); + void (*pv_printf)(const char *fmt, ...); + void (*pv_abort)(void); /* L1-A abort */ int *pv_ticks; /* Ticks since last reset */ - void (*pv_halt) __P((void)) __attribute__((noreturn));/* Halt! */ - void (**pv_synchook) __P((void)); /* "sync" command hook */ + void (*pv_halt)(void) __attribute__((noreturn));/* Halt! */ + void (**pv_synchook)(void); /* "sync" command hook */ /* * This eval's a FORTH string. Unfortunately, its interface * changed between V0 and V2, which gave us much pain. */ union { - void (*v0_eval) __P((int len, char *str)); - void (*v2_eval) __P((char *str)); + void (*v0_eval)(int len, char *str); + void (*v2_eval)(char *str); } pv_fortheval; struct v0bootargs **pv_v0bootargs; /* V0: Boot args */ /* Extract Ethernet address from network device. */ - u_int (*pv_enaddr) __P((int d, char *enaddr)); + u_int (*pv_enaddr)(int d, char *enaddr); struct v2bootargs pv_v2bootargs; /* V2: Boot args + std in/out */ struct v2devops pv_v2devops; /* V2: device operations */ @@ -257,17 +257,17 @@ struct promvec { * all memory references go to the PROM, so the PROM can do it * easily. */ - void (*pv_setctxt) __P((int ctxt, caddr_t va, int pmeg)); + void (*pv_setctxt)(int ctxt, caddr_t va, int pmeg); #if defined(SUN4M) && defined(notyet) /* * The following are V3 ROM functions to handle MP machines in the * Sun4m series. They have undefined results when run on a uniprocessor! */ - int (*pv_v3cpustart) __P((u_int module, u_int ctxtbl, - int context, caddr_t pc)); - int (*pv_v3cpustop) __P((u_int module)); - int (*pv_v3cpuidle) __P((u_int module)); - int (*pv_v3cpuresume) __P((u_int module)); + int (*pv_v3cpustart)(u_int module, u_int ctxtbl, + int context, caddr_t pc); + int (*pv_v3cpustop)(u_int module); + int (*pv_v3cpuidle)(u_int module); + int (*pv_v3cpuresume)(u_int module); #endif }; @@ -305,24 +305,24 @@ struct nodeops { /* * Tree traversal. */ - int (*no_nextnode) __P((int node)); /* next(node) */ - int (*no_child) __P((int node)); /* first child */ + int (*no_nextnode)(int node); /* next(node) */ + int (*no_child)(int node); /* first child */ /* * Property functions. Proper use of getprop requires calling * proplen first to make sure it fits. Kind of a pain, but no * doubt more convenient for the PROM coder. */ - int (*no_proplen) __P((int node, caddr_t name)); - int (*no_getprop) __P((int node, caddr_t name, caddr_t val)); - int (*no_setprop) __P((int node, caddr_t name, caddr_t val, - int len)); - caddr_t (*no_nextprop) __P((int node, caddr_t name)); + int (*no_proplen)(int node, caddr_t name); + int (*no_getprop)(int node, caddr_t name, caddr_t val); + int (*no_setprop)(int node, caddr_t name, caddr_t val, + int len); + caddr_t (*no_nextprop)(int node, caddr_t name); }; -void romhalt __P((void)) +void romhalt(void) __attribute__((__noreturn__)); -void romboot __P((char *)) +void romboot(char *) __attribute__((__noreturn__)); extern struct promvec *promvec; diff --git a/sys/arch/sparc64/include/bus.h b/sys/arch/sparc64/include/bus.h index 52ff2080760..692c7a43217 100644 --- a/sys/arch/sparc64/include/bus.h +++ b/sys/arch/sparc64/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.10 2002/03/07 18:08:08 jason Exp $ */ +/* $OpenBSD: bus.h,v 1.11 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: bus.h,v 1.31 2001/09/21 15:30:41 wiz Exp $ */ /*- @@ -131,35 +131,35 @@ struct sparc_bus_space_tag { bus_space_tag_t parent; int type; - int (*sparc_bus_alloc) __P((bus_space_tag_t, + int (*sparc_bus_alloc)(bus_space_tag_t, bus_addr_t, bus_addr_t, bus_size_t, bus_size_t, bus_size_t, - int, bus_addr_t *, bus_space_handle_t *)); + int, bus_addr_t *, bus_space_handle_t *); - void (*sparc_bus_free) __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t)); + void (*sparc_bus_free)(bus_space_tag_t, + bus_space_handle_t, bus_size_t); - int (*sparc_bus_map) __P((bus_space_tag_t, + int (*sparc_bus_map)(bus_space_tag_t, bus_type_t, bus_addr_t, bus_size_t, - int, vaddr_t, bus_space_handle_t *)); + int, vaddr_t, bus_space_handle_t *); - int (*sparc_bus_unmap) __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t)); + int (*sparc_bus_unmap)(bus_space_tag_t, + bus_space_handle_t, bus_size_t); - int (*sparc_bus_subregion) __P((bus_space_tag_t, + int (*sparc_bus_subregion)(bus_space_tag_t, bus_space_handle_t, bus_size_t, - bus_size_t, bus_space_handle_t *)); + bus_size_t, bus_space_handle_t *); - void (*sparc_bus_barrier) __P((bus_space_tag_t, + void (*sparc_bus_barrier)(bus_space_tag_t, bus_space_handle_t, bus_size_t, - bus_size_t, int)); + bus_size_t, int); - paddr_t (*sparc_bus_mmap) __P((bus_space_tag_t, - bus_addr_t, off_t, int, int)); + paddr_t (*sparc_bus_mmap)(bus_space_tag_t, + bus_addr_t, off_t, int, int); void *(*sparc_intr_establish) __P((bus_space_tag_t, int, int, int, - int (*) __P((void *)), void *)); + int (*)(void *), void *)); }; @@ -167,7 +167,7 @@ struct sparc_bus_space_tag { /* * The following macro could be used to generate the bus_space*() functions * but it uses a gcc extension and is ANSI-only. -#define PROTO_bus_space_xxx __P((bus_space_tag_t t, ...)) +#define PROTO_bus_space_xxx(bus_space_tag_t t, ...) #define RETURNTYPE_bus_space_xxx void * #define BUSFUN(name, returntype, t, args...) \ __inline__ RETURNTYPE_##name \ @@ -183,7 +183,7 @@ struct sparc_bus_space_tag { /* * Bus space function prototypes. */ -static int bus_space_alloc __P(( +static int bus_space_alloc( bus_space_tag_t, bus_addr_t, /* reg start */ bus_addr_t, /* reg end */ @@ -192,54 +192,54 @@ static int bus_space_alloc __P(( bus_size_t, /* boundary */ int, /* flags */ bus_addr_t *, - bus_space_handle_t *)); -static void bus_space_free __P(( + bus_space_handle_t *); +static void bus_space_free( bus_space_tag_t, bus_space_handle_t, - bus_size_t)); -static int bus_space_map __P(( + bus_size_t); +static int bus_space_map( bus_space_tag_t, bus_addr_t, bus_size_t, int, /*flags*/ - bus_space_handle_t *)); -static int bus_space_map2 __P(( + bus_space_handle_t *); +static int bus_space_map2( bus_space_tag_t, bus_type_t, bus_addr_t, bus_size_t, int, /*flags*/ vaddr_t, /*preferred vaddr*/ - bus_space_handle_t *)); -static int bus_space_unmap __P(( + bus_space_handle_t *); +static int bus_space_unmap( bus_space_tag_t, bus_space_handle_t, - bus_size_t)); -static int bus_space_subregion __P(( + bus_size_t); +static int bus_space_subregion( bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_size_t, - bus_space_handle_t *)); -static void bus_space_barrier __P(( + bus_space_handle_t *); +static void bus_space_barrier( bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_size_t, - int)); -static paddr_t bus_space_mmap __P(( + int); +static paddr_t bus_space_mmap( bus_space_tag_t, bus_addr_t, /*addr*/ off_t, /*offset*/ int, /*prot*/ - int)); /*flags*/ + int); /*flags*/ static void *bus_intr_establish __P(( bus_space_tag_t, int, /*bus-specific intr*/ int, /*device class level, see machine/intr.h*/ int, /*flags*/ - int (*) __P((void *)), /*handler*/ + int (*)(void *), /*handler*/ void *)); /*handler arg*/ @@ -334,7 +334,7 @@ bus_intr_establish(t, p, l, f, h, a) int p; int l; int f; - int (*h)__P((void *)); + int (*h)(void *); void *a; { _BS_CALL(t, sparc_intr_establish)(t, p, l, f, h, a); @@ -355,7 +355,7 @@ bus_space_barrier(t, h, o, s, f) /* XXXX Things get complicated if we use unmapped register accesses. */ #define bus_space_vaddr(t, h) (vaddr_t)(h) #else -void * bus_space_vaddr __P((bus_space_tag_t space, bus_space_handle_t handle)); +void * bus_space_vaddr(bus_space_tag_t space, bus_space_handle_t handle); #endif /* flags for bus space map functions */ @@ -390,13 +390,13 @@ int bus_space_probe __P(( bus_size_t, /* probe size */ size_t, /* offset */ int, /* flags */ - int (*) __P((void *, void *)), /* callback function */ + int (*)(void *, void *), /* callback function */ void *)); /* callback arg */ /* - * u_intN_t bus_space_read_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset)); + * u_intN_t bus_space_read_N(bus_space_tag_t tag, + * bus_space_handle_t bsh, bus_size_t offset); * * Read a 1, 2, 4, or 8 byte quantity from bus space * described by tag/handle/offset. @@ -451,9 +451,9 @@ int bus_space_probe __P(( __bv; }) #endif /* - * void bus_space_read_multi_N __P((bus_space_tag_t tag, + * void bus_space_read_multi_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t *addr, size_t count)); + * u_intN_t *addr, size_t count); * * Read `count' 1, 2, 4, or 8 byte quantities from bus space * described by tag/handle/offset and copy into buffer provided. @@ -488,9 +488,9 @@ int bus_space_probe __P(( } while (0) /* - * void bus_space_write_N __P((bus_space_tag_t tag, + * void bus_space_write_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t value)); + * u_intN_t value); * * Write the 1, 2, 4, or 8 byte value `value' to bus space * described by tag/handle/offset. @@ -537,9 +537,9 @@ int bus_space_probe __P(( ((void)(stxa((h) + (o), bus_type_asi[(t)->type], (v)))); }) #endif /* - * void bus_space_write_multi_N __P((bus_space_tag_t tag, + * void bus_space_write_multi_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * const u_intN_t *addr, size_t count)); + * const u_intN_t *addr, size_t count); * * Write `count' 1, 2, 4, or 8 byte quantities from the buffer * provided to bus space described by tag/handle/offset. @@ -574,9 +574,9 @@ int bus_space_probe __P(( } while (0) /* - * void bus_space_set_multi_N __P((bus_space_tag_t tag, + * void bus_space_set_multi_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, u_intN_t val, - * size_t count)); + * size_t count); * * Write the 1, 2, 4, or 8 byte value `val' to bus space described * by tag/handle/offset `count' times. @@ -607,31 +607,31 @@ int bus_space_probe __P(( } while (0) /* - * void bus_space_read_region_N __P((bus_space_tag_t tag, + * void bus_space_read_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t off, - * u_intN_t *addr, bus_size_t count)); + * u_intN_t *addr, bus_size_t count); * */ -static void bus_space_read_region_1 __P((bus_space_tag_t, +static void bus_space_read_region_1(bus_space_tag_t, bus_space_handle_t, bus_size_t, u_int8_t *, - bus_size_t)); -static void bus_space_read_region_2 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_read_region_2(bus_space_tag_t, bus_space_handle_t, bus_size_t, u_int16_t *, - bus_size_t)); -static void bus_space_read_region_4 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_read_region_4(bus_space_tag_t, bus_space_handle_t, bus_size_t, u_int32_t *, - bus_size_t)); -static void bus_space_read_region_8 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_read_region_8(bus_space_tag_t, bus_space_handle_t, bus_size_t, u_int64_t *, - bus_size_t)); + bus_size_t); static __inline__ void bus_space_read_region_1(t, h, o, a, c) @@ -675,31 +675,31 @@ bus_space_read_region_8(t, h, o, a, c) } /* - * void bus_space_write_region_N __P((bus_space_tag_t tag, + * void bus_space_write_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t off, - * u_intN_t *addr, bus_size_t count)); + * u_intN_t *addr, bus_size_t count); * */ -static void bus_space_write_region_1 __P((bus_space_tag_t, +static void bus_space_write_region_1(bus_space_tag_t, bus_space_handle_t, bus_size_t, const u_int8_t *, - bus_size_t)); -static void bus_space_write_region_2 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_write_region_2(bus_space_tag_t, bus_space_handle_t, bus_size_t, const u_int16_t *, - bus_size_t)); -static void bus_space_write_region_4 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_write_region_4(bus_space_tag_t, bus_space_handle_t, bus_size_t, const u_int32_t *, - bus_size_t)); -static void bus_space_write_region_8 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_write_region_8(bus_space_tag_t, bus_space_handle_t, bus_size_t, const u_int64_t *, - bus_size_t)); + bus_size_t); static __inline__ void bus_space_write_region_1(t, h, o, a, c) bus_space_tag_t t; @@ -746,31 +746,31 @@ bus_space_write_region_8(t, h, o, a, c) /* - * void bus_space_set_region_N __P((bus_space_tag_t tag, + * void bus_space_set_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t off, - * u_intN_t *addr, bus_size_t count)); + * u_intN_t *addr, bus_size_t count); * */ -static void bus_space_set_region_1 __P((bus_space_tag_t, +static void bus_space_set_region_1(bus_space_tag_t, bus_space_handle_t, bus_size_t, const u_int8_t, - bus_size_t)); -static void bus_space_set_region_2 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_set_region_2(bus_space_tag_t, bus_space_handle_t, bus_size_t, const u_int16_t, - bus_size_t)); -static void bus_space_set_region_4 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_set_region_4(bus_space_tag_t, bus_space_handle_t, bus_size_t, const u_int32_t, - bus_size_t)); -static void bus_space_set_region_8 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_set_region_8(bus_space_tag_t, bus_space_handle_t, bus_size_t, const u_int64_t, - bus_size_t)); + bus_size_t); static __inline__ void bus_space_set_region_1(t, h, o, v, c) @@ -818,38 +818,38 @@ bus_space_set_region_8(t, h, o, v, c) /* - * void bus_space_copy_region_N __P((bus_space_tag_t tag, + * void bus_space_copy_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh1, bus_size_t off1, * bus_space_handle_t bsh2, bus_size_t off2, - * bus_size_t count)); + * bus_size_t count); * * Copy `count' 1, 2, 4, or 8 byte values from bus space starting * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2. */ -static void bus_space_copy_region_1 __P((bus_space_tag_t, +static void bus_space_copy_region_1(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_space_handle_t, bus_size_t, - bus_size_t)); -static void bus_space_copy_region_2 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_copy_region_2(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_space_handle_t, bus_size_t, - bus_size_t)); -static void bus_space_copy_region_4 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_copy_region_4(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_space_handle_t, bus_size_t, - bus_size_t)); -static void bus_space_copy_region_8 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_copy_region_8(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_space_handle_t, bus_size_t, - bus_size_t)); + bus_size_t); static __inline__ void @@ -897,8 +897,8 @@ bus_space_copy_region_8(t, h1, o1, h2, o2, c) } /* - * u_intN_t bus_space_read_stream_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset)); + * u_intN_t bus_space_read_stream_N(bus_space_tag_t tag, + * bus_space_handle_t bsh, bus_size_t offset); * * Read a 1, 2, 4, or 8 byte quantity from bus space * described by tag/handle/offset. @@ -953,9 +953,9 @@ bus_space_copy_region_8(t, h1, o1, h2, o2, c) __bv; }) #endif /* - * void bus_space_read_multi_stream_N __P((bus_space_tag_t tag, + * void bus_space_read_multi_stream_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t *addr, size_t count)); + * u_intN_t *addr, size_t count); * * Read `count' 1, 2, 4, or 8 byte quantities from bus space * described by tag/handle/offset and copy into buffer provided. @@ -990,9 +990,9 @@ bus_space_copy_region_8(t, h1, o1, h2, o2, c) } while (0) /* - * void bus_space_write_stream_N __P((bus_space_tag_t tag, + * void bus_space_write_stream_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t value)); + * u_intN_t value); * * Write the 1, 2, 4, or 8 byte value `value' to bus space * described by tag/handle/offset. @@ -1039,9 +1039,9 @@ bus_space_copy_region_8(t, h1, o1, h2, o2, c) ((void)(stxa((h) + (o), bus_stream_asi[(t)->type], (v)))); }) #endif /* - * void bus_space_write_multi_stream_N __P((bus_space_tag_t tag, + * void bus_space_write_multi_stream_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * const u_intN_t *addr, size_t count)); + * const u_intN_t *addr, size_t count); * * Write `count' 1, 2, 4, or 8 byte quantities from the buffer * provided to bus space described by tag/handle/offset. @@ -1076,9 +1076,9 @@ bus_space_copy_region_8(t, h1, o1, h2, o2, c) } while (0) /* - * void bus_space_set_multi_stream_N __P((bus_space_tag_t tag, + * void bus_space_set_multi_stream_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, u_intN_t val, - * size_t count)); + * size_t count); * * Write the 1, 2, 4, or 8 byte value `val' to bus space described * by tag/handle/offset `count' times. @@ -1109,31 +1109,31 @@ bus_space_copy_region_8(t, h1, o1, h2, o2, c) } while (0) /* - * void bus_space_read_region_stream_N __P((bus_space_tag_t tag, + * void bus_space_read_region_stream_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t off, - * u_intN_t *addr, bus_size_t count)); + * u_intN_t *addr, bus_size_t count); * */ -static void bus_space_read_region_stream_1 __P((bus_space_tag_t, +static void bus_space_read_region_stream_1(bus_space_tag_t, bus_space_handle_t, bus_size_t, u_int8_t *, - bus_size_t)); -static void bus_space_read_region_stream_2 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_read_region_stream_2(bus_space_tag_t, bus_space_handle_t, bus_size_t, u_int16_t *, - bus_size_t)); -static void bus_space_read_region_stream_4 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_read_region_stream_4(bus_space_tag_t, bus_space_handle_t, bus_size_t, u_int32_t *, - bus_size_t)); -static void bus_space_read_region_stream_8 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_read_region_stream_8(bus_space_tag_t, bus_space_handle_t, bus_size_t, u_int64_t *, - bus_size_t)); + bus_size_t); static __inline__ void bus_space_read_region_stream_1(t, h, o, a, c) @@ -1177,31 +1177,31 @@ bus_space_read_region_stream_8(t, h, o, a, c) } /* - * void bus_space_write_region_stream_N __P((bus_space_tag_t tag, + * void bus_space_write_region_stream_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t off, - * u_intN_t *addr, bus_size_t count)); + * u_intN_t *addr, bus_size_t count); * */ -static void bus_space_write_region_stream_1 __P((bus_space_tag_t, +static void bus_space_write_region_stream_1(bus_space_tag_t, bus_space_handle_t, bus_size_t, const u_int8_t *, - bus_size_t)); -static void bus_space_write_region_stream_2 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_write_region_stream_2(bus_space_tag_t, bus_space_handle_t, bus_size_t, const u_int16_t *, - bus_size_t)); -static void bus_space_write_region_stream_4 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_write_region_stream_4(bus_space_tag_t, bus_space_handle_t, bus_size_t, const u_int32_t *, - bus_size_t)); -static void bus_space_write_region_stream_8 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_write_region_stream_8(bus_space_tag_t, bus_space_handle_t, bus_size_t, const u_int64_t *, - bus_size_t)); + bus_size_t); static __inline__ void bus_space_write_region_stream_1(t, h, o, a, c) bus_space_tag_t t; @@ -1248,31 +1248,31 @@ bus_space_write_region_stream_8(t, h, o, a, c) /* - * void bus_space_set_region_stream_N __P((bus_space_tag_t tag, + * void bus_space_set_region_stream_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t off, - * u_intN_t *addr, bus_size_t count)); + * u_intN_t *addr, bus_size_t count); * */ -static void bus_space_set_region_stream_1 __P((bus_space_tag_t, +static void bus_space_set_region_stream_1(bus_space_tag_t, bus_space_handle_t, bus_size_t, const u_int8_t, - bus_size_t)); -static void bus_space_set_region_stream_2 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_set_region_stream_2(bus_space_tag_t, bus_space_handle_t, bus_size_t, const u_int16_t, - bus_size_t)); -static void bus_space_set_region_stream_4 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_set_region_stream_4(bus_space_tag_t, bus_space_handle_t, bus_size_t, const u_int32_t, - bus_size_t)); -static void bus_space_set_region_stream_8 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_set_region_stream_8(bus_space_tag_t, bus_space_handle_t, bus_size_t, const u_int64_t, - bus_size_t)); + bus_size_t); static __inline__ void bus_space_set_region_stream_1(t, h, o, v, c) @@ -1320,38 +1320,38 @@ bus_space_set_region_stream_8(t, h, o, v, c) /* - * void bus_space_copy_region_stream_N __P((bus_space_tag_t tag, + * void bus_space_copy_region_stream_N(bus_space_tag_t tag, * bus_space_handle_t bsh1, bus_size_t off1, * bus_space_handle_t bsh2, bus_size_t off2, - * bus_size_t count)); + * bus_size_t count); * * Copy `count' 1, 2, 4, or 8 byte values from bus space starting * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2. */ -static void bus_space_copy_region_stream_1 __P((bus_space_tag_t, +static void bus_space_copy_region_stream_1(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_space_handle_t, bus_size_t, - bus_size_t)); -static void bus_space_copy_region_stream_2 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_copy_region_stream_2(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_space_handle_t, bus_size_t, - bus_size_t)); -static void bus_space_copy_region_stream_4 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_copy_region_stream_4(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_space_handle_t, bus_size_t, - bus_size_t)); -static void bus_space_copy_region_stream_8 __P((bus_space_tag_t, + bus_size_t); +static void bus_space_copy_region_stream_8(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_space_handle_t, bus_size_t, - bus_size_t)); + bus_size_t); static __inline__ void @@ -1477,33 +1477,33 @@ struct sparc_bus_dma_tag { /* * DMA mapping methods. */ - int (*_dmamap_create) __P((bus_dma_tag_t, bus_size_t, int, - bus_size_t, bus_size_t, int, bus_dmamap_t *)); - void (*_dmamap_destroy) __P((bus_dma_tag_t, bus_dmamap_t)); - int (*_dmamap_load) __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); - int (*_dmamap_load_mbuf) __P((bus_dma_tag_t, bus_dmamap_t, - struct mbuf *, int)); - int (*_dmamap_load_uio) __P((bus_dma_tag_t, bus_dmamap_t, - struct uio *, int)); - int (*_dmamap_load_raw) __P((bus_dma_tag_t, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int)); - void (*_dmamap_unload) __P((bus_dma_tag_t, bus_dmamap_t)); - void (*_dmamap_sync) __P((bus_dma_tag_t, bus_dmamap_t, - bus_addr_t, bus_size_t, int)); + int (*_dmamap_create)(bus_dma_tag_t, bus_size_t, int, + bus_size_t, bus_size_t, int, bus_dmamap_t *); + void (*_dmamap_destroy)(bus_dma_tag_t, bus_dmamap_t); + int (*_dmamap_load)(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int); + int (*_dmamap_load_mbuf)(bus_dma_tag_t, bus_dmamap_t, + struct mbuf *, int); + int (*_dmamap_load_uio)(bus_dma_tag_t, bus_dmamap_t, + struct uio *, int); + int (*_dmamap_load_raw)(bus_dma_tag_t, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int); + void (*_dmamap_unload)(bus_dma_tag_t, bus_dmamap_t); + void (*_dmamap_sync)(bus_dma_tag_t, bus_dmamap_t, + bus_addr_t, bus_size_t, int); /* * DMA memory utility functions. */ - int (*_dmamem_alloc) __P((bus_dma_tag_t, bus_size_t, bus_size_t, - bus_size_t, bus_dma_segment_t *, int, int *, int)); - void (*_dmamem_free) __P((bus_dma_tag_t, - bus_dma_segment_t *, int)); - int (*_dmamem_map) __P((bus_dma_tag_t, bus_dma_segment_t *, - int, size_t, caddr_t *, int)); - void (*_dmamem_unmap) __P((bus_dma_tag_t, caddr_t, size_t)); - paddr_t (*_dmamem_mmap) __P((bus_dma_tag_t, bus_dma_segment_t *, - int, off_t, int, int)); + int (*_dmamem_alloc)(bus_dma_tag_t, bus_size_t, bus_size_t, + bus_size_t, bus_dma_segment_t *, int, int *, int); + void (*_dmamem_free)(bus_dma_tag_t, + bus_dma_segment_t *, int); + int (*_dmamem_map)(bus_dma_tag_t, bus_dma_segment_t *, + int, size_t, caddr_t *, int); + void (*_dmamem_unmap)(bus_dma_tag_t, caddr_t, size_t); + paddr_t (*_dmamem_mmap)(bus_dma_tag_t, bus_dma_segment_t *, + int, off_t, int, int); }; #define bus_dmamap_create(t, s, n, m, b, f, p) \ @@ -1570,37 +1570,37 @@ struct sparc_bus_dmamap { }; #ifdef _SPARC_BUS_DMA_PRIVATE -int _bus_dmamap_create __P((bus_dma_tag_t, bus_size_t, int, bus_size_t, - bus_size_t, int, bus_dmamap_t *)); -void _bus_dmamap_destroy __P((bus_dma_tag_t, bus_dmamap_t)); -int _bus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); -int _bus_dmamap_load_mbuf __P((bus_dma_tag_t, bus_dmamap_t, - struct mbuf *, int)); -int _bus_dmamap_load_uio __P((bus_dma_tag_t, bus_dmamap_t, - struct uio *, int)); -int _bus_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int)); -void _bus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t)); -void _bus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t, bus_addr_t, - bus_size_t, int)); - -int _bus_dmamem_alloc __P((bus_dma_tag_t tag, bus_size_t size, +int _bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t, + bus_size_t, int, bus_dmamap_t *); +void _bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t); +int _bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int); +int _bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t, + struct mbuf *, int); +int _bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t, + struct uio *, int); +int _bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int); +void _bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t); +void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t, + bus_size_t, int); + +int _bus_dmamem_alloc(bus_dma_tag_t tag, bus_size_t size, bus_size_t alignment, bus_size_t boundary, - bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags)); -void _bus_dmamem_free __P((bus_dma_tag_t tag, bus_dma_segment_t *segs, - int nsegs)); -int _bus_dmamem_map __P((bus_dma_tag_t tag, bus_dma_segment_t *segs, - int nsegs, size_t size, caddr_t *kvap, int flags)); -void _bus_dmamem_unmap __P((bus_dma_tag_t tag, caddr_t kva, - size_t size)); -paddr_t _bus_dmamem_mmap __P((bus_dma_tag_t tag, bus_dma_segment_t *segs, - int nsegs, off_t off, int prot, int flags)); - -int _bus_dmamem_alloc_range __P((bus_dma_tag_t tag, bus_size_t size, + bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags); +void _bus_dmamem_free(bus_dma_tag_t tag, bus_dma_segment_t *segs, + int nsegs); +int _bus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs, + int nsegs, size_t size, caddr_t *kvap, int flags); +void _bus_dmamem_unmap(bus_dma_tag_t tag, caddr_t kva, + size_t size); +paddr_t _bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs, + int nsegs, off_t off, int prot, int flags); + +int _bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size, bus_size_t alignment, bus_size_t boundary, bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags, - vaddr_t low, vaddr_t high)); + vaddr_t low, vaddr_t high); #endif /* _SPARC_BUS_DMA_PRIVATE */ #endif /* _SPARC_BUS_H_ */ diff --git a/sys/arch/sparc64/include/cpu.h b/sys/arch/sparc64/include/cpu.h index 9f346a0c390..5f4d634f812 100644 --- a/sys/arch/sparc64/include/cpu.h +++ b/sys/arch/sparc64/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.7 2002/02/01 21:48:23 jason Exp $ */ +/* $OpenBSD: cpu.h,v 1.8 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: cpu.h,v 1.28 2001/06/14 22:56:58 thorpej Exp $ */ /* @@ -131,7 +131,7 @@ struct cpu_info { u_long ci_simple_locks;/* # of simple locks held */ /* Spinning up the CPU */ - void (*ci_spinup) __P((void)); /* spinup routine */ + void (*ci_spinup)(void); /* spinup routine */ void *ci_initstack; paddr_t ci_paddr; /* Phys addr of this structure. */ }; @@ -196,8 +196,8 @@ extern struct intrhand soft01intr, soft01net, soft01clock; #define setsoftint() send_softint(-1, IPL_SOFTINT, &soft01intr) #define setsoftnet() send_softint(-1, IPL_SOFTNET, &soft01net) #else -void setsoftint __P((void)); -void setsoftnet __P((void)); +void setsoftint(void); +void setsoftnet(void); #endif int want_ast; @@ -237,7 +237,7 @@ int foundfpu; /* true => we have an FPU */ * argument, or with a pointer to a clockframe if ih_arg is NULL. */ struct intrhand { - int (*ih_fun) __P((void *)); + int (*ih_fun)(void *); void *ih_arg; short ih_number; /* interrupt number */ /* the H/W provides */ @@ -250,70 +250,70 @@ struct intrhand { extern struct intrhand *intrhand[]; extern struct intrhand *intrlev[MAXINTNUM]; -void intr_establish __P((int level, struct intrhand *)); +void intr_establish(int level, struct intrhand *); /* cpu.c */ -paddr_t cpu_alloc __P((void)); -u_int64_t cpu_init __P((paddr_t, int)); +paddr_t cpu_alloc(void); +u_int64_t cpu_init(paddr_t, int); /* disksubr.c */ struct dkbad; -int isbad __P((struct dkbad *bt, int, int, int)); +int isbad(struct dkbad *bt, int, int, int); /* machdep.c */ -int ldcontrolb __P((caddr_t)); -void dumpconf __P((void)); -caddr_t reserve_dumppages __P((caddr_t)); +int ldcontrolb(caddr_t); +void dumpconf(void); +caddr_t reserve_dumppages(caddr_t); /* clock.c */ struct timeval; -int tickintr __P((void *)); /* level 10 (tick) interrupt code */ -int clockintr __P((void *));/* level 10 (clock) interrupt code */ -int statintr __P((void *)); /* level 14 (statclock) interrupt code */ +int tickintr(void *); /* level 10 (tick) interrupt code */ +int clockintr(void *);/* level 10 (clock) interrupt code */ +int statintr(void *); /* level 14 (statclock) interrupt code */ /* locore.s */ struct fpstate64; -void savefpstate __P((struct fpstate64 *)); -void loadfpstate __P((struct fpstate64 *)); -u_int64_t probeget __P((paddr_t, int, int)); -int probeset __P((paddr_t, int, int, u_int64_t)); +void savefpstate(struct fpstate64 *); +void loadfpstate(struct fpstate64 *); +u_int64_t probeget(paddr_t, int, int); +int probeset(paddr_t, int, int, u_int64_t); #if 0 -void write_all_windows __P((void)); -void write_user_windows __P((void)); +void write_all_windows(void); +void write_user_windows(void); #else #define write_all_windows() __asm __volatile("flushw" : : ) #define write_user_windows() __asm __volatile("flushw" : : ) #endif -void proc_trampoline __P((void)); +void proc_trampoline(void); struct pcb; -void snapshot __P((struct pcb *)); -struct frame *getfp __P((void)); -int xldcontrolb __P((caddr_t, struct pcb *)); -void copywords __P((const void *, void *, size_t)); -void qcopy __P((const void *, void *, size_t)); -void qzero __P((void *, size_t)); -void switchtoctx __P((int)); +void snapshot(struct pcb *); +struct frame *getfp(void); +int xldcontrolb(caddr_t, struct pcb *); +void copywords(const void *, void *, size_t); +void qcopy(const void *, void *, size_t); +void qzero(void *, size_t); +void switchtoctx(int); /* locore2.c */ -void remrq __P((struct proc *)); +void remrq(struct proc *); /* trap.c */ -void kill_user_windows __P((struct proc *)); -int rwindow_save __P((struct proc *)); +void kill_user_windows(struct proc *); +int rwindow_save(struct proc *); /* amd7930intr.s */ -void amd7930_trap __P((void)); +void amd7930_trap(void); /* cons.c */ -int cnrom __P((void)); +int cnrom(void); /* zs.c */ void zsconsole __P((struct tty *, int, int, void (**)(struct tty *, int))); #ifdef KGDB -void zs_kgdb_init __P((void)); +void zs_kgdb_init(void); #endif /* fb.c */ -void fb_unblank __P((void)); +void fb_unblank(void); /* kgdb_stub.c */ #ifdef KGDB void kgdb_attach __P((int (*)(void *), void (*)(void *, int), void *)); -void kgdb_connect __P((int)); -void kgdb_panic __P((void)); +void kgdb_connect(int); +void kgdb_panic(void); #endif /* emul.c */ -int fixalign __P((struct proc *, struct trapframe64 *)); -int emulinstr __P((vaddr_t, struct trapframe64 *)); +int fixalign(struct proc *, struct trapframe64 *); +int emulinstr(vaddr_t, struct trapframe64 *); /* * @@ -334,8 +334,8 @@ struct trapvec { }; extern struct trapvec *trapbase; /* the 256 vectors */ -extern void wzero __P((void *, u_int)); -extern void wcopy __P((const void *, void *, u_int)); +extern void wzero(void *, u_int); +extern void wcopy(const void *, void *, u_int); #endif /* _KERNEL */ #endif /* _CPU_H_ */ diff --git a/sys/arch/sparc64/include/ctlreg.h b/sys/arch/sparc64/include/ctlreg.h index fcc82e12124..c743d2ae71d 100644 --- a/sys/arch/sparc64/include/ctlreg.h +++ b/sys/arch/sparc64/include/ctlreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ctlreg.h,v 1.3 2001/09/20 21:08:50 jason Exp $ */ +/* $OpenBSD: ctlreg.h,v 1.4 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: ctlreg.h,v 1.28 2001/08/06 23:55:34 eeh Exp $ */ /* @@ -443,24 +443,24 @@ * D$ so we need to flush the D$ to make sure we don't get data pollution. */ -static __inline__ u_char lduba __P((paddr_t loc, int asi)); -static __inline__ u_short lduha __P((paddr_t loc, int asi)); -static __inline__ u_int lda __P((paddr_t loc, int asi)); -static __inline__ int ldswa __P((paddr_t loc, int asi)); -static __inline__ u_int64_t ldxa __P((paddr_t loc, int asi)); -static __inline__ u_int64_t ldda __P((paddr_t loc, int asi)); +static __inline__ u_char lduba(paddr_t loc, int asi); +static __inline__ u_short lduha(paddr_t loc, int asi); +static __inline__ u_int lda(paddr_t loc, int asi); +static __inline__ int ldswa(paddr_t loc, int asi); +static __inline__ u_int64_t ldxa(paddr_t loc, int asi); +static __inline__ u_int64_t ldda(paddr_t loc, int asi); -static __inline__ void stba __P((paddr_t loc, int asi, u_char value)); -static __inline__ void stha __P((paddr_t loc, int asi, u_short value)); -static __inline__ void sta __P((paddr_t loc, int asi, u_int value)); -static __inline__ void stxa __P((paddr_t loc, int asi, u_int64_t value)); -static __inline__ void stda __P((paddr_t loc, int asi, u_int64_t value)); +static __inline__ void stba(paddr_t loc, int asi, u_char value); +static __inline__ void stha(paddr_t loc, int asi, u_short value); +static __inline__ void sta(paddr_t loc, int asi, u_int value); +static __inline__ void stxa(paddr_t loc, int asi, u_int64_t value); +static __inline__ void stda(paddr_t loc, int asi, u_int64_t value); #if 0 -static __inline__ unsigned int casa __P((paddr_t loc, int asi, - unsigned int value, unsigned int oldvalue)); -static __inline__ u_int64_t casxa __P((paddr_t loc, int asi, - u_int64_t value, u_int64_t oldvalue)); +static __inline__ unsigned int casa(paddr_t loc, int asi, + unsigned int value, unsigned int oldvalue); +static __inline__ u_int64_t casxa(paddr_t loc, int asi, + u_int64_t value, u_int64_t oldvalue); #endif #ifdef __arch64__ @@ -1120,5 +1120,5 @@ casxa(paddr_t loc, int asi, u_int64_t value, u_int64_t oldvalue) }) #endif -extern void next_tick __P((long)); +extern void next_tick(long); #endif diff --git a/sys/arch/sparc64/include/db_machdep.h b/sys/arch/sparc64/include/db_machdep.h index 6bbbf6af44d..80c00ed7571 100644 --- a/sys/arch/sparc64/include/db_machdep.h +++ b/sys/arch/sparc64/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.5 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.6 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: db_machdep.h,v 1.12 2001/07/07 15:16:13 eeh Exp $ */ /* @@ -111,15 +111,15 @@ db_regs_t ddb_regs; /* register state */ */ #define SOFTWARE_SSTEP -boolean_t db_inst_trap_return __P((int inst)); -boolean_t db_inst_return __P((int inst)); -boolean_t db_inst_call __P((int inst)); -boolean_t db_inst_branch __P((int inst)); -int db_inst_load __P((int inst)); -int db_inst_store __P((int inst)); -boolean_t db_inst_unconditional_flow_transfer __P((int inst)); -db_addr_t db_branch_taken __P((int inst, db_addr_t pc, db_regs_t *regs)); -void db_machine_init __P((void)); +boolean_t db_inst_trap_return(int inst); +boolean_t db_inst_return(int inst); +boolean_t db_inst_call(int inst); +boolean_t db_inst_branch(int inst); +int db_inst_load(int inst); +int db_inst_store(int inst); +boolean_t db_inst_unconditional_flow_transfer(int inst); +db_addr_t db_branch_taken(int inst, db_addr_t pc, db_regs_t *regs); +void db_machine_init(void); #define inst_trap_return(ins) db_inst_trap_return(ins) #define inst_return(ins) db_inst_return(ins) @@ -138,8 +138,8 @@ void db_machine_init __P((void)); #define DB_MACHINE_COMMANDS -void db_machine_init __P((void)); -int kdb_trap __P((int, struct trapframe64 *)); +void db_machine_init(void); +int kdb_trap(int, struct trapframe64 *); /* * We will use elf symbols in DDB when they work. diff --git a/sys/arch/sparc64/include/eeprom.h b/sys/arch/sparc64/include/eeprom.h index c921013370e..ae4bcf1d4a6 100644 --- a/sys/arch/sparc64/include/eeprom.h +++ b/sys/arch/sparc64/include/eeprom.h @@ -1,4 +1,4 @@ -/* $OpenBSD: eeprom.h,v 1.2 2001/08/20 20:23:52 jason Exp $ */ +/* $OpenBSD: eeprom.h,v 1.3 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: eeprom.h,v 1.2 1999/12/30 16:25:17 eeh Exp $ */ /* @@ -179,6 +179,6 @@ struct eeprom { #ifdef _KERNEL extern char *eeprom_va; -int eeprom_uio __P((struct uio *)); +int eeprom_uio(struct uio *); #endif /* _KERNEL */ diff --git a/sys/arch/sparc64/include/float.h b/sys/arch/sparc64/include/float.h index 47c5db6209e..ba7396ae0ad 100644 --- a/sys/arch/sparc64/include/float.h +++ b/sys/arch/sparc64/include/float.h @@ -1,4 +1,4 @@ -/* $OpenBSD: float.h,v 1.2 2001/09/28 15:18:52 jason Exp $ */ +/* $OpenBSD: float.h,v 1.3 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: float.h,v 1.3 2001/09/21 20:48:02 eeh Exp $ */ /* @@ -51,7 +51,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/sparc64/include/intr.h b/sys/arch/sparc64/include/intr.h index bfc6617b869..4ea39b564b4 100644 --- a/sys/arch/sparc64/include/intr.h +++ b/sys/arch/sparc64/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.1 2001/08/18 04:16:40 jason Exp $ */ +/* $OpenBSD: intr.h,v 1.2 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: intr.h,v 1.8 2001/01/14 23:50:30 thorpej Exp $ */ /*- @@ -58,7 +58,7 @@ void * softintr_establish __P((int level, void (*fun)(void *), void *arg)); void -softintr_disestablish __P((void *cookie)); +softintr_disestablish(void *cookie); void -softintr_schedule __P((void *cookie)); +softintr_schedule(void *cookie); diff --git a/sys/arch/sparc64/include/netbsd_machdep.h b/sys/arch/sparc64/include/netbsd_machdep.h index 1081611f25b..234d2521062 100644 --- a/sys/arch/sparc64/include/netbsd_machdep.h +++ b/sys/arch/sparc64/include/netbsd_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: netbsd_machdep.h,v 1.1 2001/09/06 10:45:41 art Exp $ */ +/* $OpenBSD: netbsd_machdep.h,v 1.2 2002/03/14 01:26:45 millert Exp $ */ #ifndef _NETBSD_MACHDEP_H #define _NETBSD_MACHDEP_H @@ -16,7 +16,7 @@ struct netbsd_sigcontext { }; #ifdef _KERNEL -void netbsd_sendsig __P((sig_t, int, int, u_long, int, union sigval)); +void netbsd_sendsig(sig_t, int, int, u_long, int, union sigval); #endif #endif /* _NETBSD_MACHDEP_H */ diff --git a/sys/arch/sparc64/include/param.h b/sys/arch/sparc64/include/param.h index 492c7b33bac..6f516d5d467 100644 --- a/sys/arch/sparc64/include/param.h +++ b/sys/arch/sparc64/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.7 2002/02/19 05:22:57 jason Exp $ */ +/* $OpenBSD: param.h,v 1.8 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: param.h,v 1.25 2001/05/30 12:28:51 mrg Exp $ */ /* @@ -263,12 +263,12 @@ extern struct map *dvmamap; #define rctov(n) (ctob(((n)-1))+dvma_base) #define vtorc(v) ((btoc((v)-dvma_base))+1) -extern caddr_t kdvma_mapin __P((caddr_t, int, int)); -extern caddr_t dvma_malloc __P((size_t, void *, int)); -extern void dvma_free __P((caddr_t, size_t, void *)); +extern caddr_t kdvma_mapin(caddr_t, int, int); +extern caddr_t dvma_malloc(size_t, void *, int); +extern void dvma_free(caddr_t, size_t, void *); #endif -extern void delay __P((unsigned int)); +extern void delay(unsigned int); #define DELAY(n) delay(n) extern int cputyp; diff --git a/sys/arch/sparc64/include/pmap.h b/sys/arch/sparc64/include/pmap.h index 81e368c8e8c..250d5ffe4ea 100644 --- a/sys/arch/sparc64/include/pmap.h +++ b/sys/arch/sparc64/include/pmap.h @@ -156,31 +156,31 @@ typedef struct pmap *pmap_t; extern struct pmap kernel_pmap_; #define pmap_kernel() (&kernel_pmap_) -int pmap_count_res __P((pmap_t pmap)); -/* int pmap_change_wiring __P((pmap_t pm, vaddr_t va, boolean_t wired)); */ +int pmap_count_res(pmap_t pmap); +/* int pmap_change_wiring(pmap_t pm, vaddr_t va, boolean_t wired); */ #define pmap_resident_count(pm) pmap_count_res((pm)) #define pmap_from_phys_address(x,f) ((x)&~PGOFSET) #define pmap_phys_address(x) (x) #define pmap_update(pm) /* nothing (yet) */ -void pmap_bootstrap __P((u_long kernelstart, u_long kernelend, u_int numctx)); +void pmap_bootstrap(u_long kernelstart, u_long kernelend, u_int numctx); /* make sure all page mappings are modulo 16K to prevent d$ aliasing */ #define PMAP_PREFER(pa, va) (*(va)+=(((*(va))^(pa))&(1<<(PGSHIFT+1)))) #define PMAP_GROWKERNEL /* turn on pmap_growkernel interface */ /* SPARC specific? */ -void pmap_redzone __P((void)); -int pmap_dumpsize __P((void)); -int pmap_dumpmmu __P((int (*)__P((dev_t, daddr_t, caddr_t, size_t)), +void pmap_redzone(void); +int pmap_dumpsize(void); +int pmap_dumpmmu __P((int (*)(dev_t, daddr_t, caddr_t, size_t), daddr_t)); -int pmap_pa_exists __P((paddr_t)); +int pmap_pa_exists(paddr_t); struct proc; -void switchexit __P((struct proc *)); +void switchexit(struct proc *); /* SPARC64 specific */ -int ctx_alloc __P((struct pmap*)); -void ctx_free __P((struct pmap*)); +int ctx_alloc(struct pmap*); +void ctx_free(struct pmap*); #endif /* _KERNEL */ diff --git a/sys/arch/sparc64/include/psl.h b/sys/arch/sparc64/include/psl.h index 0bad01843ec..392e4d4a738 100644 --- a/sys/arch/sparc64/include/psl.h +++ b/sys/arch/sparc64/include/psl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psl.h,v 1.2 2001/08/18 19:46:04 art Exp $ */ +/* $OpenBSD: psl.h,v 1.3 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: psl.h,v 1.20 2001/04/13 23:30:05 thorpej Exp $ */ /* @@ -253,14 +253,14 @@ #if defined(_KERNEL) && !defined(_LOCORE) extern u_int64_t ver; /* Copy of v9 version register. We need to read this only once, in locore.s. */ -static __inline int getpstate __P((void)); -static __inline void setpstate __P((int)); -static __inline int getcwp __P((void)); -static __inline void setcwp __P((int)); +static __inline int getpstate(void); +static __inline void setpstate(int); +static __inline int getcwp(void); +static __inline void setcwp(int); #ifndef SPLDEBUG -static __inline void splx __P((int)); +static __inline void splx(int); #endif -static __inline u_int64_t getver __P((void)); +static __inline u_int64_t getver(void); /* * GCC pseudo-functions for manipulating privileged registers @@ -306,11 +306,11 @@ static __inline u_int64_t getver() */ #ifdef SPLDEBUG -void prom_printf __P((const char *fmt, ...)); +void prom_printf(const char *fmt, ...); extern int printspl; #define SPLPRINT(x) if(printspl) { int i=10000000; prom_printf x ; while(i--); } #define SPL(name, newpil) \ -static __inline int name##X __P((const char*, int)); \ +static __inline int name##X(const char*, int); \ static __inline int name##X(const char* file, int line) \ { \ int oldpil; \ @@ -321,7 +321,7 @@ static __inline int name##X(const char* file, int line) \ } /* A non-priority-decreasing version of SPL */ #define SPLHOLD(name, newpil) \ -static __inline int name##X __P((const char*, int)); \ +static __inline int name##X(const char*, int); \ static __inline int name##X(const char* file, int line) \ { \ int oldpil; \ @@ -336,7 +336,7 @@ static __inline int name##X(const char* file, int line) \ #else #define SPLPRINT(x) #define SPL(name, newpil) \ -static __inline int name __P((void)); \ +static __inline int name(void); \ static __inline int name() \ { \ int oldpil; \ @@ -346,7 +346,7 @@ static __inline int name() \ } /* A non-priority-decreasing version of SPL */ #define SPLHOLD(name, newpil) \ -static __inline int name __P((void)); \ +static __inline int name(void); \ static __inline int name() \ { \ int oldpil; \ @@ -446,7 +446,7 @@ static __inline void splx(newpil) #define splhigh() splhighX(__FILE__, __LINE__) #define splx(x) splxX((x),__FILE__, __LINE__) -static __inline void splxX __P((int, const char*, int)); +static __inline void splxX(int, const char*, int); static __inline void splxX(newpil, file, line) int newpil, line; const char* file; diff --git a/sys/arch/sparc64/include/pte.h b/sys/arch/sparc64/include/pte.h index 99215cc82d0..a85a5fd35cb 100644 --- a/sys/arch/sparc64/include/pte.h +++ b/sys/arch/sparc64/include/pte.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pte.h,v 1.2 2001/08/20 20:23:52 jason Exp $ */ +/* $OpenBSD: pte.h,v 1.3 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: pte.h,v 1.7 2001/07/31 06:55:46 eeh Exp $ */ /* @@ -121,8 +121,8 @@ struct sun4u_tte { typedef struct sun4u_tte pte_t; /* Assembly routine to flush a mapping */ -extern void tlb_flush_pte __P((vaddr_t addr, int ctx)); -extern void tlb_flush_ctx __P((int ctx)); +extern void tlb_flush_pte(vaddr_t addr, int ctx); +extern void tlb_flush_ctx(int ctx); #endif /* _LOCORE */ diff --git a/sys/arch/sparc64/include/sparc64.h b/sys/arch/sparc64/include/sparc64.h index 8d09eebce45..d5169df257a 100644 --- a/sys/arch/sparc64/include/sparc64.h +++ b/sys/arch/sparc64/include/sparc64.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sparc64.h,v 1.3 2001/09/26 17:32:19 deraadt Exp $ */ +/* $OpenBSD: sparc64.h,v 1.4 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: sparc64.h,v 1.3 2000/10/20 05:47:03 mrg Exp $ */ /* @@ -39,17 +39,17 @@ struct mem_region { u_int64_t size; }; -int prom_set_trap_table __P((vaddr_t tba)); -paddr_t prom_vtop __P((vaddr_t vaddr)); -vaddr_t prom_claim_virt __P((vaddr_t vaddr, int len)); -vaddr_t prom_alloc_virt __P((int len, int align)); -int prom_free_virt __P((vaddr_t vaddr, int len)); -int prom_unmap_virt __P((vaddr_t vaddr, int len)); -int prom_map_phys __P((paddr_t paddr, off_t size, vaddr_t vaddr, int mode)); -paddr_t prom_alloc_phys __P((int len, int align)); -paddr_t prom_claim_phys __P((paddr_t phys, int len)); -int prom_free_phys __P((paddr_t paddr, int len)); -paddr_t prom_get_msgbuf __P((int len, int align)); +int prom_set_trap_table(vaddr_t tba); +paddr_t prom_vtop(vaddr_t vaddr); +vaddr_t prom_claim_virt(vaddr_t vaddr, int len); +vaddr_t prom_alloc_virt(int len, int align); +int prom_free_virt(vaddr_t vaddr, int len); +int prom_unmap_virt(vaddr_t vaddr, int len); +int prom_map_phys(paddr_t paddr, off_t size, vaddr_t vaddr, int mode); +paddr_t prom_alloc_phys(int len, int align); +paddr_t prom_claim_phys(paddr_t phys, int len); +int prom_free_phys(paddr_t paddr, int len); +paddr_t prom_get_msgbuf(int len, int align); /* * Compatibility stuff. @@ -62,15 +62,15 @@ paddr_t prom_get_msgbuf __P((int len, int align)); * * Not sure whether boot itself should be implementation dependent instead. XXX */ -void ppc_exit __P((void)) __attribute__((__noreturn__)); -void ppc_boot __P((char *bootspec)) __attribute__((__noreturn__)); +void ppc_exit(void) __attribute__((__noreturn__)); +void ppc_boot(char *bootspec) __attribute__((__noreturn__)); -int dk_match __P((char *name)); +int dk_match(char *name); -void ofrootfound __P((void)); +void ofrootfound(void); /* * Debug */ -void prom_printf __P((const char *, ...)); +void prom_printf(const char *, ...); #endif /* _MACHINE_SPARC64_H_ */ diff --git a/sys/arch/sparc64/include/vmparam.h b/sys/arch/sparc64/include/vmparam.h index 8889e84b2ce..3a940230deb 100644 --- a/sys/arch/sparc64/include/vmparam.h +++ b/sys/arch/sparc64/include/vmparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmparam.h,v 1.7 2002/02/17 22:59:53 maja Exp $ */ +/* $OpenBSD: vmparam.h,v 1.8 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: vmparam.h,v 1.18 2001/05/01 02:19:19 thorpej Exp $ */ /* @@ -172,7 +172,7 @@ struct pmap_physseg { #if defined (_KERNEL) && !defined(_LOCORE) struct vm_map; -vaddr_t dvma_mapin __P((struct vm_map *, vaddr_t, int, int)); -void dvma_mapout __P((vaddr_t, vaddr_t, int)); +vaddr_t dvma_mapin(struct vm_map *, vaddr_t, int, int); +void dvma_mapout(vaddr_t, vaddr_t, int); #endif #endif diff --git a/sys/arch/sparc64/include/z8530var.h b/sys/arch/sparc64/include/z8530var.h index 402212b0eb5..3f2a2672d26 100644 --- a/sys/arch/sparc64/include/z8530var.h +++ b/sys/arch/sparc64/include/z8530var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530var.h,v 1.3 2001/08/21 21:42:30 jason Exp $ */ +/* $OpenBSD: z8530var.h,v 1.4 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: z8530var.h,v 1.4 2000/11/08 23:41:42 eeh Exp $ */ /* @@ -86,13 +86,13 @@ struct zsc_softc { * about the function call overhead where ZS_DELAY does nothing. */ -u_char zs_read_reg __P((struct zs_chanstate *cs, u_char reg)); -u_char zs_read_csr __P((struct zs_chanstate *cs)); -u_char zs_read_data __P((struct zs_chanstate *cs)); +u_char zs_read_reg(struct zs_chanstate *cs, u_char reg); +u_char zs_read_csr(struct zs_chanstate *cs); +u_char zs_read_data(struct zs_chanstate *cs); -void zs_write_reg __P((struct zs_chanstate *cs, u_char reg, u_char val)); -void zs_write_csr __P((struct zs_chanstate *cs, u_char val)); -void zs_write_data __P((struct zs_chanstate *cs, u_char val)); +void zs_write_reg(struct zs_chanstate *cs, u_char reg, u_char val); +void zs_write_csr(struct zs_chanstate *cs, u_char val); +void zs_write_data(struct zs_chanstate *cs, u_char val); /* The sparc has splzs() in psl.h */ diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c index 1fc9e110783..bc13591ce01 100644 --- a/sys/arch/sparc64/sparc64/autoconf.c +++ b/sys/arch/sparc64/sparc64/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.19 2002/01/25 23:54:40 jason Exp $ */ +/* $OpenBSD: autoconf.c,v 1.20 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */ /* @@ -108,32 +108,32 @@ extern int kgdb_debug_panic; static int rootnode; char platform_type[32]; -static char *str2hex __P((char *, int *)); -static int mbprint __P((void *, const char *)); -static void crazymap __P((char *, int *)); -int st_crazymap __P((int)); -void sync_crash __P((void)); -int mainbus_match __P((struct device *, void *, void *)); -static void mainbus_attach __P((struct device *, struct device *, void *)); -static int getstr __P((char *, int)); -void setroot __P((void)); -void swapconf __P((void)); -void diskconf __P((void)); -static struct device *getdisk __P((char *, int, int, dev_t *)); -int findblkmajor __P((struct device *)); -char *findblkname __P((int)); +static char *str2hex(char *, int *); +static int mbprint(void *, const char *); +static void crazymap(char *, int *); +int st_crazymap(int); +void sync_crash(void); +int mainbus_match(struct device *, void *, void *); +static void mainbus_attach(struct device *, struct device *, void *); +static int getstr(char *, int); +void setroot(void); +void swapconf(void); +void diskconf(void); +static struct device *getdisk(char *, int, int, dev_t *); +int findblkmajor(struct device *); +char *findblkname(int); struct device *booted_device; struct bootpath bootpath[8]; int nbootpath; -static void bootpath_build __P((void)); -static void bootpath_print __P((struct bootpath *)); -void bootpath_compat __P((struct bootpath *, int)); +static void bootpath_build(void); +static void bootpath_print(struct bootpath *); +void bootpath_compat(struct bootpath *, int); -char *bus_compatible __P((struct bootpath *, struct device *)); -int bus_class __P((struct device *)); -int instance_match __P((struct device *, void *, struct bootpath *bp)); -void nail_bootdev __P((struct device *, struct bootpath *)); +char *bus_compatible(struct bootpath *, struct device *); +int bus_class(struct device *); +int instance_match(struct device *, void *, struct bootpath *bp); +void nail_bootdev(struct device *, struct bootpath *); /* Global interrupt mappings for all device types. Match against the OBP * 'device_type' property. @@ -229,8 +229,8 @@ bootstrap(nctx) extern int end; /* End of kernel */ #ifndef __arch64__ /* Assembly glue for the PROM */ - extern void OF_sym2val32 __P((void *)); - extern void OF_val2sym32 __P((void *)); + extern void OF_sym2val32(void *); + extern void OF_val2sym32(void *); #endif /* diff --git a/sys/arch/sparc64/sparc64/cache.h b/sys/arch/sparc64/sparc64/cache.h index 5e7405fd4a9..708b7d3a36c 100644 --- a/sys/arch/sparc64/sparc64/cache.h +++ b/sys/arch/sparc64/sparc64/cache.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cache.h,v 1.2 2001/08/20 20:23:53 jason Exp $ */ +/* $OpenBSD: cache.h,v 1.3 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: cache.h,v 1.3 2000/08/01 00:28:02 eeh Exp $ */ /* @@ -135,17 +135,17 @@ extern enum vactype vactype; /* XXX move into cacheinfo struct */ /* * Routines for dealing with the cache. */ -void cache_enable __P((void)); /* turn it on */ -int cache_flush_page __P((paddr_t)); /* flush page from E$ */ -int cache_flush __P((vaddr_t, vsize_t)); /* flush region */ +void cache_enable(void); /* turn it on */ +int cache_flush_page(paddr_t); /* flush page from E$ */ +int cache_flush(vaddr_t, vsize_t); /* flush region */ /* The following two are for I$ and D$ flushes and are in locore.s */ -void dcache_flush_page __P((paddr_t)); /* flush page from D$ */ -void blast_vcache __P((void)); /* Clear entire contents of I$ and D$ */ +void dcache_flush_page(paddr_t); /* flush page from D$ */ +void blast_vcache(void); /* Clear entire contents of I$ and D$ */ /* The following flush a range from the D$ and I$ but not E$. */ -void cache_flush_virt __P((vaddr_t, vsize_t)); -void cache_flush_phys __P((paddr_t, psize_t, int)); +void cache_flush_virt(vaddr_t, vsize_t); +void cache_flush_phys(paddr_t, psize_t, int); /* * Cache control information. diff --git a/sys/arch/sparc64/sparc64/clock.c b/sys/arch/sparc64/sparc64/clock.c index 85cbb960214..846a14798ff 100644 --- a/sys/arch/sparc64/sparc64/clock.c +++ b/sys/arch/sparc64/sparc64/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.8 2002/01/25 03:36:25 jason Exp $ */ +/* $OpenBSD: clock.c,v 1.9 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: clock.c,v 1.41 2001/07/24 19:29:25 eeh Exp $ */ /* @@ -120,7 +120,7 @@ int statmin; /* statclock interval - 1/2*variance */ int timerok; static long tick_increment; -int schedintr __P((void *)); +int schedintr(void *); static struct intrhand level10 = { clockintr }; static struct intrhand level0 = { tickintr }; @@ -130,13 +130,13 @@ static struct intrhand schedint = { schedintr }; /* * clock (eeprom) attaches at the sbus or the ebus (PCI) */ -static int clockmatch_sbus __P((struct device *, void *, void *)); -static void clockattach_sbus __P((struct device *, struct device *, void *)); -static int clockmatch_ebus __P((struct device *, void *, void *)); -static void clockattach_ebus __P((struct device *, struct device *, void *)); -static int clockmatch_rtc __P((struct device *, void *, void *)); -static void clockattach_rtc __P((struct device *, struct device *, void *)); -static void clockattach __P((int, bus_space_tag_t, bus_space_handle_t)); +static int clockmatch_sbus(struct device *, void *, void *); +static void clockattach_sbus(struct device *, struct device *, void *); +static int clockmatch_ebus(struct device *, void *, void *); +static void clockattach_ebus(struct device *, struct device *, void *); +static int clockmatch_rtc(struct device *, void *, void *); +static void clockattach_rtc(struct device *, struct device *, void *); +static void clockattach(int, bus_space_tag_t, bus_space_handle_t); struct cfattach clock_sbus_ca = { sizeof(struct device), clockmatch_sbus, clockattach_sbus @@ -158,8 +158,8 @@ struct cfdriver rtc_cd = { static todr_chip_handle_t todr_handle = NULL; static struct idprom *idprom; -static int timermatch __P((struct device *, void *, void *)); -static void timerattach __P((struct device *, struct device *, void *)); +static int timermatch(struct device *, void *, void *); +static void timerattach(struct device *, struct device *, void *); struct timerreg_4u timerreg_4u; /* XXX - need more cleanup */ @@ -171,13 +171,13 @@ struct cfdriver timer_cd = { NULL, "timer", DV_DULL }; -int sbus_wenable __P((struct todr_chip_handle *, int)); -int ebus_wenable __P((struct todr_chip_handle *, int)); +int sbus_wenable(struct todr_chip_handle *, int); +int ebus_wenable(struct todr_chip_handle *, int); struct chiptime; -void myetheraddr __P((u_char *)); -int chiptotime __P((int, int, int, int, int, int)); -void timetochip __P((struct chiptime *)); -void stopcounter __P((struct timer_4u *)); +void myetheraddr(u_char *); +int chiptotime(int, int, int, int, int, int); +void timetochip(struct chiptime *); +void stopcounter(struct timer_4u *); int timerblurb = 10; /* Guess a value; used before clock is attached */ diff --git a/sys/arch/sparc64/sparc64/cpu.c b/sys/arch/sparc64/sparc64/cpu.c index 4c5f553427e..eb558d6535a 100644 --- a/sys/arch/sparc64/sparc64/cpu.c +++ b/sys/arch/sparc64/sparc64/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.6 2002/01/04 22:07:44 jason Exp $ */ +/* $OpenBSD: cpu.c,v 1.7 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: cpu.c,v 1.13 2001/05/26 21:27:15 chs Exp $ */ /* @@ -81,8 +81,8 @@ char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */ char cpu_model[100]; /* The CPU configuration driver. */ -static void cpu_attach __P((struct device *, struct device *, void *)); -int cpu_match __P((struct device *, void *, void *)); +static void cpu_attach(struct device *, struct device *, void *); +int cpu_match(struct device *, void *, void *); struct cfattach cpu_ca = { sizeof(struct device), cpu_match, cpu_attach @@ -91,9 +91,9 @@ struct cfattach cpu_ca = { extern struct cfdriver cpu_cd; #if defined(SUN4C) || defined(SUN4M) -static char *psrtoname __P((int, int, int, char *)); +static char *psrtoname(int, int, int, char *); #endif -static char *fsrtoname __P((int, int, int, char *)); +static char *fsrtoname(int, int, int, char *); #define IU_IMPL(v) ((((u_int64_t)(v))&VER_IMPL) >> VER_IMPL_SHIFT) #define IU_VERS(v) ((((u_int64_t)(v))&VER_MASK) >> VER_MASK_SHIFT) diff --git a/sys/arch/sparc64/sparc64/cpuvar.h b/sys/arch/sparc64/sparc64/cpuvar.h index f9326d36e3a..64995988923 100644 --- a/sys/arch/sparc64/sparc64/cpuvar.h +++ b/sys/arch/sparc64/sparc64/cpuvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpuvar.h,v 1.2 2001/08/20 20:23:53 jason Exp $ */ +/* $OpenBSD: cpuvar.h,v 1.3 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: cpuvar.h,v 1.2 1999/11/06 20:18:13 eeh Exp $ */ /* @@ -56,20 +56,20 @@ struct cpu_softc; struct module_info { int cpu_type; enum vactype vactype; - void (*cpu_match)__P((struct cpu_softc *, struct module_info *, int)); - void (*getcacheinfo)__P((struct cpu_softc *sc, int node)); - void (*hotfix) __P((struct cpu_softc *)); - void (*mmu_enable)__P((void)); - void (*cache_enable)__P((void)); + void (*cpu_match)(struct cpu_softc *, struct module_info *, int); + void (*getcacheinfo)(struct cpu_softc *sc, int node); + void (*hotfix)(struct cpu_softc *); + void (*mmu_enable)(void); + void (*cache_enable)(void); int ncontext; /* max. # of contexts (we use) */ - void (*get_faultstatus)__P((void)); - void (*cache_flush)__P((caddr_t, u_int)); - void (*vcache_flush_page)__P((int)); - void (*vcache_flush_segment)__P((int, int)); - void (*vcache_flush_region)__P((int)); - void (*vcache_flush_context)__P((void)); - void (*pcache_flush_line)__P((int, int)); + void (*get_faultstatus)(void); + void (*cache_flush)(caddr_t, u_int); + void (*vcache_flush_page)(int); + void (*vcache_flush_segment)(int, int); + void (*vcache_flush_region)(int); + void (*vcache_flush_context)(void); + void (*pcache_flush_line)(int, int); }; @@ -159,32 +159,31 @@ struct cpu_softc { */ /* bootup things: access to physical memory */ - u_int (*read_physmem) __P((u_int addr, int space)); - void (*write_physmem) __P((u_int addr, u_int data)); - void (*cache_tablewalks) __P((void)); - void (*mmu_enable) __P((void)); - void (*hotfix) __P((struct cpu_softc *)); + u_int (*read_physmem)(u_int addr, int space); + void (*write_physmem)(u_int addr, u_int data); + void (*cache_tablewalks)(void); + void (*mmu_enable)(void); + void (*hotfix)(struct cpu_softc *); /* locore defined: */ - void (*get_faultstatus) __P((void)); + void (*get_faultstatus)(void); /* Cache handling functions */ - void (*cache_enable) __P((void)); - void (*cache_flush)__P((caddr_t, u_int)); - void (*vcache_flush_page)__P((int)); - void (*vcache_flush_segment)__P((int, int)); - void (*vcache_flush_region)__P((int)); - void (*vcache_flush_context)__P((void)); - void (*pcache_flush_line)__P((int, int)); + void (*cache_enable)(void); + void (*cache_flush)(caddr_t, u_int); + void (*vcache_flush_page)(int); + void (*vcache_flush_segment)(int, int); + void (*vcache_flush_region)(int); + void (*vcache_flush_context)(void); + void (*pcache_flush_line)(int, int); #ifdef SUN4M /* hardware-assisted block operation routines */ - void (*hwbcopy) - __P((const void *from, void *to, size_t len)); - void (*hwbzero) __P((void *buf, size_t len)); + void (*hwbcopy)(const void *from, void *to, size_t len); + void (*hwbzero)(void *buf, size_t len); /* routine to clear mbus-sbus buffers */ - void (*mbusflush) __P((void)); + void (*mbusflush)(void); #endif /* XXX: Add more here! */ @@ -274,9 +273,9 @@ struct cpu_softc { /* * Related function prototypes */ -void getcpuinfo __P((struct cpu_softc *sc, int node)); -void mmu_install_tables __P((struct cpu_softc *)); -void pmap_alloc_cpu __P((struct cpu_softc *)); +void getcpuinfo(struct cpu_softc *sc, int node); +void mmu_install_tables(struct cpu_softc *); +void pmap_alloc_cpu(struct cpu_softc *); #define cpuinfo (*(struct cpu_softc *)CPUINFO_VA) diff --git a/sys/arch/sparc64/sparc64/db_interface.c b/sys/arch/sparc64/sparc64/db_interface.c index ceff32caf73..70fbefc27b8 100644 --- a/sys/arch/sparc64/sparc64/db_interface.c +++ b/sys/arch/sparc64/sparc64/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.4 2001/08/22 05:08:11 jason Exp $ */ +/* $OpenBSD: db_interface.c,v 1.5 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: db_interface.c,v 1.61 2001/07/31 06:55:47 eeh Exp $ */ /* @@ -59,7 +59,7 @@ #include "esp_sbus.h" #endif -extern void OF_enter __P((void)); +extern void OF_enter(void); extern struct traptrace { unsigned short tl:3, /* Trap level */ @@ -221,31 +221,31 @@ int db_active = 0; extern char *trap_type[]; -void kdb_kbd_trap __P((struct trapframe64 *)); -void db_prom_cmd __P((db_expr_t, int, db_expr_t, char *)); -void db_proc_cmd __P((db_expr_t, int, db_expr_t, char *)); -void db_ctx_cmd __P((db_expr_t, int, db_expr_t, char *)); -void db_dump_window __P((db_expr_t, int, db_expr_t, char *)); -void db_dump_stack __P((db_expr_t, int, db_expr_t, char *)); -void db_dump_trap __P((db_expr_t, int, db_expr_t, char *)); -void db_dump_fpstate __P((db_expr_t, int, db_expr_t, char *)); -void db_dump_ts __P((db_expr_t, int, db_expr_t, char *)); -void db_dump_pcb __P((db_expr_t, int, db_expr_t, char *)); -void db_dump_pv __P((db_expr_t, int, db_expr_t, char *)); -void db_setpcb __P((db_expr_t, int, db_expr_t, char *)); -void db_dump_dtlb __P((db_expr_t, int, db_expr_t, char *)); -void db_dump_dtsb __P((db_expr_t, int, db_expr_t, char *)); -void db_pmap_kernel __P((db_expr_t, int, db_expr_t, char *)); -void db_pload_cmd __P((db_expr_t, int, db_expr_t, char *)); -void db_pmap_cmd __P((db_expr_t, int, db_expr_t, char *)); -void db_lock __P((db_expr_t, int, db_expr_t, char *)); -void db_traptrace __P((db_expr_t, int, db_expr_t, char *)); -void db_dump_buf __P((db_expr_t, int, db_expr_t, char *)); -void db_dump_espcmd __P((db_expr_t, int, db_expr_t, char *)); -void db_watch __P((db_expr_t, int, db_expr_t, char *)); - -static void db_dump_pmap __P((struct pmap*)); -static void db_print_trace_entry __P((struct traptrace *, int)); +void kdb_kbd_trap(struct trapframe64 *); +void db_prom_cmd(db_expr_t, int, db_expr_t, char *); +void db_proc_cmd(db_expr_t, int, db_expr_t, char *); +void db_ctx_cmd(db_expr_t, int, db_expr_t, char *); +void db_dump_window(db_expr_t, int, db_expr_t, char *); +void db_dump_stack(db_expr_t, int, db_expr_t, char *); +void db_dump_trap(db_expr_t, int, db_expr_t, char *); +void db_dump_fpstate(db_expr_t, int, db_expr_t, char *); +void db_dump_ts(db_expr_t, int, db_expr_t, char *); +void db_dump_pcb(db_expr_t, int, db_expr_t, char *); +void db_dump_pv(db_expr_t, int, db_expr_t, char *); +void db_setpcb(db_expr_t, int, db_expr_t, char *); +void db_dump_dtlb(db_expr_t, int, db_expr_t, char *); +void db_dump_dtsb(db_expr_t, int, db_expr_t, char *); +void db_pmap_kernel(db_expr_t, int, db_expr_t, char *); +void db_pload_cmd(db_expr_t, int, db_expr_t, char *); +void db_pmap_cmd(db_expr_t, int, db_expr_t, char *); +void db_lock(db_expr_t, int, db_expr_t, char *); +void db_traptrace(db_expr_t, int, db_expr_t, char *); +void db_dump_buf(db_expr_t, int, db_expr_t, char *); +void db_dump_espcmd(db_expr_t, int, db_expr_t, char *); +void db_watch(db_expr_t, int, db_expr_t, char *); + +static void db_dump_pmap(struct pmap*); +static void db_print_trace_entry(struct traptrace *, int); /* @@ -434,7 +434,7 @@ db_dump_dtlb(addr, have_addr, count, modif) db_expr_t count; char *modif; { - extern void print_dtlb __P((void)); + extern void print_dtlb(void); if (have_addr) { int i; @@ -501,7 +501,7 @@ db_pload_cmd(addr, have_addr, count, modif) } } -int64_t pseg_get __P((struct pmap *, vaddr_t)); +int64_t pseg_get(struct pmap *, vaddr_t); void db_dump_pmap(pm) @@ -676,7 +676,7 @@ db_dump_dtsb(addr, have_addr, count, modif) } } -void db_page_cmd __P((db_expr_t, int, db_expr_t, char *)); +void db_page_cmd(db_expr_t, int, db_expr_t, char *); void db_page_cmd(addr, have_addr, count, modif) db_expr_t addr; @@ -954,8 +954,8 @@ db_watch(addr, have_addr, count, modif) #include <uvm/uvm.h> -void db_uvmhistdump __P((db_expr_t, int, db_expr_t, char *)); -extern void uvmhist_dump __P((struct uvm_history *)); +void db_uvmhistdump(db_expr_t, int, db_expr_t, char *); +extern void uvmhist_dump(struct uvm_history *); extern struct uvm_history_head uvm_histories; void diff --git a/sys/arch/sparc64/sparc64/db_trace.c b/sys/arch/sparc64/sparc64/db_trace.c index 19d9d139c0c..44843390163 100644 --- a/sys/arch/sparc64/sparc64/db_trace.c +++ b/sys/arch/sparc64/sparc64/db_trace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_trace.c,v 1.2 2001/08/20 20:23:53 jason Exp $ */ +/* $OpenBSD: db_trace.c,v 1.3 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: db_trace.c,v 1.23 2001/07/10 06:06:16 eeh Exp $ */ /* @@ -39,12 +39,12 @@ #include <ddb/db_interface.h> #include <ddb/db_output.h> -void db_dump_fpstate __P((db_expr_t, int, db_expr_t, char *)); -void db_dump_window __P((db_expr_t, int, db_expr_t, char *)); -void db_dump_stack __P((db_expr_t, int, db_expr_t, char *)); -void db_dump_trap __P((db_expr_t, int, db_expr_t, char *)); -void db_dump_ts __P((db_expr_t, int, db_expr_t, char *)); -void db_print_window __P((u_int64_t)); +void db_dump_fpstate(db_expr_t, int, db_expr_t, char *); +void db_dump_window(db_expr_t, int, db_expr_t, char *); +void db_dump_stack(db_expr_t, int, db_expr_t, char *); +void db_dump_trap(db_expr_t, int, db_expr_t, char *); +void db_dump_ts(db_expr_t, int, db_expr_t, char *); +void db_print_window(u_int64_t); #if 0 #define INKERNEL(va) (((vaddr_t)(va)) >= USRSTACK) /* Not really true, y'know */ @@ -66,7 +66,7 @@ db_stack_trace_cmd(addr, have_addr, count, modif) boolean_t kernel_only = TRUE; boolean_t trace_thread = FALSE; char c, *cp = modif; - int (*pr) __P((const char *, ...)); + int (*pr)(const char *, ...); pr = db_printf; diff --git a/sys/arch/sparc64/sparc64/disksubr.c b/sys/arch/sparc64/sparc64/disksubr.c index 1c6ce4fe3cd..75d9d478363 100644 --- a/sys/arch/sparc64/sparc64/disksubr.c +++ b/sys/arch/sparc64/sparc64/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.7 2002/02/19 02:50:59 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.8 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: disksubr.c,v 1.13 2000/12/17 22:39:18 pk Exp $ */ /* @@ -55,9 +55,9 @@ #include <dev/sbus/sbusvar.h> #include "cd.h" -static char *disklabel_sun_to_bsd __P((char *, struct disklabel *)); -static int disklabel_bsd_to_sun __P((struct disklabel *, char *)); -static __inline u_int sun_extended_sum __P((struct sun_disklabel *)); +static char *disklabel_sun_to_bsd(char *, struct disklabel *); +static int disklabel_bsd_to_sun(struct disklabel *, char *); +static __inline u_int sun_extended_sum(struct sun_disklabel *); extern struct device *bootdv; @@ -68,7 +68,7 @@ dk_establish(struct disk *dk, struct device *dev) } #if NCD > 0 -extern void cdstrategy __P((struct buf *)); +extern void cdstrategy(struct buf *); #endif /* @@ -86,7 +86,7 @@ extern void cdstrategy __P((struct buf *)); char * readdisklabel(dev, strat, lp, clp, spoofonly) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *clp; int spoofonly; @@ -213,7 +213,7 @@ setdisklabel(olp, nlp, openmask, clp) int writedisklabel(dev, strat, lp, clp) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *clp; { diff --git a/sys/arch/sparc64/sparc64/emul.c b/sys/arch/sparc64/sparc64/emul.c index af3642861e4..566885d0171 100644 --- a/sys/arch/sparc64/sparc64/emul.c +++ b/sys/arch/sparc64/sparc64/emul.c @@ -1,4 +1,4 @@ -/* $OpenBSD: emul.c,v 1.2 2001/08/20 20:23:53 jason Exp $ */ +/* $OpenBSD: emul.c,v 1.3 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: emul.c,v 1.8 2001/06/29 23:58:40 eeh Exp $ */ /*- @@ -57,13 +57,13 @@ #define IPR(tf, i) ((int32_t *)(u_long)tf->tf_out[6])[i - 16] #define FPR(p, i) ((int32_t) p->p_md.md_fpstate->fs_regs[i]) -static __inline int readgpreg __P((struct trapframe64 *, int, void *)); -static __inline int readfpreg __P((struct proc *, int, void *)); -static __inline int writegpreg __P((struct trapframe64 *, int, const void *)); -static __inline int writefpreg __P((struct proc *, int, const void *)); -static __inline int decodeaddr __P((struct trapframe64 *, union instr *, void *)); -static int muldiv __P((struct trapframe64 *, union instr *, int32_t *, int32_t *, - int32_t *)); +static __inline int readgpreg(struct trapframe64 *, int, void *); +static __inline int readfpreg(struct proc *, int, void *); +static __inline int writegpreg(struct trapframe64 *, int, const void *); +static __inline int writefpreg(struct proc *, int, const void *); +static __inline int decodeaddr(struct trapframe64 *, union instr *, void *); +static int muldiv(struct trapframe64 *, union instr *, int32_t *, int32_t *, + int32_t *); #define REGNAME(i) "goli"[i >> 3], i & 7 diff --git a/sys/arch/sparc64/sparc64/intr.c b/sys/arch/sparc64/sparc64/intr.c index b245ec08c12..df0256a27e4 100644 --- a/sys/arch/sparc64/sparc64/intr.c +++ b/sys/arch/sparc64/sparc64/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.7 2002/01/10 00:06:17 nordin Exp $ */ +/* $OpenBSD: intr.c,v 1.8 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: intr.c,v 1.39 2001/07/19 23:38:11 eeh Exp $ */ /* @@ -69,10 +69,10 @@ */ struct intrhand *intrlev[MAXINTNUM]; -void strayintr __P((const struct trapframe64 *, int)); -int softintr __P((void *)); -int softnet __P((void *)); -int intr_list_handler __P((void *)); +void strayintr(const struct trapframe64 *, int); +int softintr(void *); +int softnet(void *); +int intr_list_handler(void *); /* * Stray interrupt handler. Clear it if possible. @@ -130,7 +130,7 @@ softintr(fp) void *fp; { #if NPCONS >0 - extern void pcons_dopoll __P((void)); + extern void pcons_dopoll(void); pcons_dopoll(); #endif @@ -314,14 +314,14 @@ intr_establish(level, ih) void * softintr_establish(level, fun, arg) int level; - void (*fun) __P((void *)); + void (*fun)(void *); void *arg; { struct intrhand *ih; ih = malloc(sizeof(*ih), M_DEVBUF, 0); bzero(ih, sizeof(*ih)); - ih->ih_fun = (int (*) __P((void *)))fun; /* XXX */ + ih->ih_fun = (int (*)(void *))fun; /* XXX */ ih->ih_arg = arg; ih->ih_pil = level; ih->ih_pending = 0; diff --git a/sys/arch/sparc64/sparc64/intreg.h b/sys/arch/sparc64/sparc64/intreg.h index 461e7dadf04..e0c98037af3 100644 --- a/sys/arch/sparc64/sparc64/intreg.h +++ b/sys/arch/sparc64/sparc64/intreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intreg.h,v 1.1 2001/08/18 04:16:40 jason Exp $ */ +/* $OpenBSD: intreg.h,v 1.2 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: intreg.h,v 1.4 2000/06/24 04:21:05 eeh Exp $ */ /* @@ -59,5 +59,5 @@ #ifndef _LOCORE struct intrhand; /* This is in cpu.h if you need it. */ -void send_softint __P((int cpu, int level, struct intrhand *ih)); +void send_softint(int cpu, int level, struct intrhand *ih); #endif diff --git a/sys/arch/sparc64/sparc64/locore.s b/sys/arch/sparc64/sparc64/locore.s index a64904a9c3c..d3f6ae48ea9 100644 --- a/sys/arch/sparc64/sparc64/locore.s +++ b/sys/arch/sparc64/sparc64/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.11 2002/02/19 03:15:27 jason Exp $ */ +/* $OpenBSD: locore.s,v 1.12 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: locore.s,v 1.137 2001/08/13 06:10:10 jdolecek Exp $ */ /* @@ -6185,7 +6185,7 @@ _C_LABEL(cache_flush_virt): mov %o2, %o0 ! Start of clear /* - * cache_flush_phys __P((paddr_t, psize_t, int)); + * cache_flush_phys(paddr_t, psize_t, int); * * Clear a set of paddrs from the D$, I$ and if param3 is * non-zero, E$. (E$ is not supported yet). diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c index c5130b06aab..9dac1573b39 100644 --- a/sys/arch/sparc64/sparc64/machdep.c +++ b/sys/arch/sparc64/sparc64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.37 2002/02/21 20:30:15 art Exp $ */ +/* $OpenBSD: machdep.c,v 1.38 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */ /*- @@ -185,9 +185,9 @@ int sparc_led_blink; */ int safepri = 0; -caddr_t allocsys __P((caddr_t)); -void dumpsys __P((void)); -void stackdump __P((void)); +caddr_t allocsys(caddr_t); +void dumpsys(void); +void stackdump(void); /* * This is the table that tells us how to access different bus space types. @@ -948,7 +948,7 @@ dumpsys() { register int psize; daddr_t blkno; - register int (*dump) __P((dev_t, daddr_t, caddr_t, size_t)); + register int (*dump)(dev_t, daddr_t, caddr_t, size_t); int error = 0; register struct mem_region *mp; extern struct mem_region *mem; @@ -1053,7 +1053,7 @@ printf("starting dump, blkno %d\n", blkno); } } -void trapdump __P((struct trapframe64*)); +void trapdump(struct trapframe64*); /* * dump out a trapframe. */ @@ -1700,25 +1700,25 @@ struct sparc_bus_dma_tag mainbus_dma_tag = { /* * Base bus space handlers. */ -static int sparc_bus_map __P(( bus_space_tag_t, bus_type_t, bus_addr_t, +static int sparc_bus_map( bus_space_tag_t, bus_type_t, bus_addr_t, bus_size_t, int, vaddr_t, - bus_space_handle_t *)); -static int sparc_bus_unmap __P((bus_space_tag_t, bus_space_handle_t, - bus_size_t)); -static int sparc_bus_subregion __P((bus_space_tag_t, bus_space_handle_t, + bus_space_handle_t *); +static int sparc_bus_unmap(bus_space_tag_t, bus_space_handle_t, + bus_size_t); +static int sparc_bus_subregion(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_size_t, - bus_space_handle_t *)); -static paddr_t sparc_bus_mmap __P((bus_space_tag_t, bus_addr_t, off_t, int, int)); + bus_space_handle_t *); +static paddr_t sparc_bus_mmap(bus_space_tag_t, bus_addr_t, off_t, int, int); static void *sparc_mainbus_intr_establish __P((bus_space_tag_t, int, int, - int, int (*) __P((void *)), + int, int (*)(void *), void *)); -static void sparc_bus_barrier __P((bus_space_tag_t, bus_space_handle_t, - bus_size_t, bus_size_t, int)); -static int sparc_bus_alloc __P((bus_space_tag_t, bus_addr_t, bus_addr_t, +static void sparc_bus_barrier(bus_space_tag_t, bus_space_handle_t, + bus_size_t, bus_size_t, int); +static int sparc_bus_alloc(bus_space_tag_t, bus_addr_t, bus_addr_t, bus_size_t, bus_size_t, bus_size_t, int, - bus_addr_t *, bus_space_handle_t *)); -static void sparc_bus_free __P((bus_space_tag_t, bus_space_handle_t, - bus_size_t)); + bus_addr_t *, bus_space_handle_t *); +static void sparc_bus_free(bus_space_tag_t, bus_space_handle_t, + bus_size_t); vaddr_t iobase = IODEV_BASE; struct extent *io_space = NULL; @@ -1865,7 +1865,7 @@ bus_space_probe(tag, btype, paddr, size, offset, flags, callback, arg) bus_size_t size; size_t offset; int flags; - int (*callback) __P((void *, void *)); + int (*callback)(void *, void *); void *arg; { bus_space_handle_t bh; @@ -1890,7 +1890,7 @@ sparc_mainbus_intr_establish(t, pil, level, flags, handler, arg) int pil; int level; int flags; - int (*handler)__P((void *)); + int (*handler)(void *); void *arg; { struct intrhand *ih; diff --git a/sys/arch/sparc64/sparc64/ofw_machdep.c b/sys/arch/sparc64/sparc64/ofw_machdep.c index 16e7c63f9e3..985838e8732 100644 --- a/sys/arch/sparc64/sparc64/ofw_machdep.c +++ b/sys/arch/sparc64/sparc64/ofw_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofw_machdep.c,v 1.4 2002/01/03 22:09:35 jason Exp $ */ +/* $OpenBSD: ofw_machdep.c,v 1.5 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: ofw_machdep.c,v 1.16 2001/07/20 00:07:14 eeh Exp $ */ /* @@ -57,14 +57,14 @@ #include <machine/sparc64.h> -int vsprintf __P((char *, const char *, va_list)); +int vsprintf(char *, const char *, va_list); -void dk_cleanup __P((void)); +void dk_cleanup(void); static u_int mmuh = -1, memh = -1; -static u_int get_mmu_handle __P((void)); -static u_int get_memory_handle __P((void)); +static u_int get_mmu_handle(void); +static u_int get_memory_handle(void); static u_int get_mmu_handle() diff --git a/sys/arch/sparc64/sparc64/openfirm.c b/sys/arch/sparc64/sparc64/openfirm.c index c39812bdaab..1880ed64dd8 100644 --- a/sys/arch/sparc64/sparc64/openfirm.c +++ b/sys/arch/sparc64/sparc64/openfirm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: openfirm.c,v 1.5 2001/12/05 01:59:55 jason Exp $ */ +/* $OpenBSD: openfirm.c,v 1.6 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: openfirm.c,v 1.13 2001/06/21 00:08:02 eeh Exp $ */ /* @@ -544,7 +544,7 @@ OF_read(handle, addr, len) return act; } -void prom_printf __P((const char *fmt, ...)); /* XXX for below */ +void prom_printf(const char *fmt, ...); /* XXX for below */ int OF_write(handle, addr, len) diff --git a/sys/arch/sparc64/sparc64/openprom.c b/sys/arch/sparc64/sparc64/openprom.c index 562ec605a68..3479bcf4438 100644 --- a/sys/arch/sparc64/sparc64/openprom.c +++ b/sys/arch/sparc64/sparc64/openprom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: openprom.c,v 1.2 2001/08/20 20:23:53 jason Exp $ */ +/* $OpenBSD: openprom.c,v 1.3 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: openprom.c,v 1.2 2000/11/18 23:45:05 mrg Exp $ */ /* @@ -65,8 +65,8 @@ static int lastnode; /* speed hack */ extern int optionsnode; /* node ID of ROM's options */ extern struct promvec *promvec; -static int openpromcheckid __P((int, int)); -static int openpromgetstr __P((int, char *, char **)); +static int openpromcheckid(int, int); +static int openpromgetstr(int, char *, char **); int openpromopen(dev, flags, mode, p) diff --git a/sys/arch/sparc64/sparc64/pmap.c b/sys/arch/sparc64/sparc64/pmap.c index 2775450f7f9..9a52101867d 100644 --- a/sys/arch/sparc64/sparc64/pmap.c +++ b/sys/arch/sparc64/sparc64/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.10 2002/01/25 15:43:59 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.11 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: pmap.c,v 1.107 2001/08/31 16:47:41 eeh Exp $ */ #undef NO_VCACHE /* Don't forget the locked TLB in dostart */ #define HWREF @@ -67,19 +67,19 @@ paddr_t cpu0paddr;/* XXXXXXXXXXXXXXXX */ -extern int64_t asmptechk __P((int64_t *pseg[], int addr)); /* DEBUG XXXXX */ +extern int64_t asmptechk(int64_t *pseg[], int addr); /* DEBUG XXXXX */ #define IS_VM_PHYSADDR(PA) (vm_physseg_find(atop(PA), NULL) != -1) #if 0 -static int pseg_check __P((struct pmap*, vaddr_t addr, int64_t tte, paddr_t spare)); +static int pseg_check(struct pmap*, vaddr_t addr, int64_t tte, paddr_t spare); static int pseg_check(struct pmap *pm, vaddr_t addr, int64_t tte, paddr_t spare) { int i, k, s; paddr_t *pdir, *ptbl; - extern int pseg_set __P((struct pmap*, vaddr_t addr, int64_t tte, - paddr_t spare)); + extern int pseg_set(struct pmap*, vaddr_t addr, int64_t tte, + paddr_t spare); if (!spare) return pseg_set(pm, addr, tte, spare); @@ -110,13 +110,13 @@ pseg_check(struct pmap *pm, vaddr_t addr, int64_t tte, paddr_t spare) /* These routines are in assembly to allow access thru physical mappings */ #if 1 -extern int64_t pseg_get __P((struct pmap*, vaddr_t addr)); -extern int pseg_set __P((struct pmap*, vaddr_t addr, int64_t tte, paddr_t spare)); -extern paddr_t pseg_find __P((struct pmap*, vaddr_t addr, paddr_t spare)); +extern int64_t pseg_get(struct pmap*, vaddr_t addr); +extern int pseg_set(struct pmap*, vaddr_t addr, int64_t tte, paddr_t spare); +extern paddr_t pseg_find(struct pmap*, vaddr_t addr, paddr_t spare); #else -static int64_t pseg_get __P((struct pmap*, vaddr_t addr)); -static int pseg_set __P((struct pmap*, vaddr_t addr, int64_t tte, paddr_t spare)); -static paddr_t pseg_find __P((struct pmap*, vaddr_t addr, paddr_t spare)); +static int64_t pseg_get(struct pmap*, vaddr_t addr); +static int pseg_set(struct pmap*, vaddr_t addr, int64_t tte, paddr_t spare); +static paddr_t pseg_find(struct pmap*, vaddr_t addr, paddr_t spare); static int64_t pseg_get(struct pmap* pm, vaddr_t addr) { paddr_t *pdir, *ptbl; @@ -172,8 +172,8 @@ static paddr_t pseg_find(struct pmap* pm, vaddr_t addr, paddr_t spare) { #endif -extern struct vm_page *vm_page_alloc1 __P((void)); -extern void vm_page_free1 __P((struct vm_page *)); +extern struct vm_page *vm_page_alloc1(void); +extern void vm_page_free1(struct vm_page *); #ifdef DEBUG @@ -244,12 +244,12 @@ typedef struct pv_entry { pv_entry_t pv_table; /* array of entries, one per page */ static struct pool pv_pool; static struct pool pmap_pool; -extern void pmap_remove_pv __P((struct pmap *pm, vaddr_t va, paddr_t pa)); -extern void pmap_enter_pv __P((struct pmap *pm, vaddr_t va, paddr_t pa)); -extern void pmap_page_cache __P((struct pmap *pm, paddr_t pa, int mode)); +extern void pmap_remove_pv(struct pmap *pm, vaddr_t va, paddr_t pa); +extern void pmap_enter_pv(struct pmap *pm, vaddr_t va, paddr_t pa); +extern void pmap_page_cache(struct pmap *pm, paddr_t pa, int mode); -void pmap_pinit __P((struct pmap *)); -void pmap_release __P((struct pmap *)); +void pmap_pinit(struct pmap *); +void pmap_release(struct pmap *); /* * First and last managed physical addresses. XXX only used for dumping the system. @@ -305,9 +305,9 @@ static int memh = 0, vmemh = 0; /* Handles to OBP devices */ int avail_start, avail_end; /* These are used by ps & family */ -static int ptelookup_va __P((vaddr_t va)); /* sun4u */ +static int ptelookup_va(vaddr_t va); /* sun4u */ #if notyet -static void tsb_enter __P((int ctx, int64_t va, int64_t data)); +static void tsb_enter(int ctx, int64_t va, int64_t data); #endif struct pmap_stats { @@ -383,7 +383,7 @@ int pmap_pages_stolen = 0; #endif #ifdef NOTDEF_DEBUG -void pv_check __P((void)); +void pv_check(void); void pv_check() { @@ -471,7 +471,7 @@ do { \ * can lose ref/mod info!!!! * */ -static void pmap_enter_kpage __P((vaddr_t, int64_t)); +static void pmap_enter_kpage(vaddr_t, int64_t); static void pmap_enter_kpage(va, data) vaddr_t va; @@ -505,7 +505,7 @@ pmap_enter_kpage(va, data) * See checp bootargs to see if we need to enable bootdebug. */ #ifdef DEBUG -void pmap_bootdebug __P((void)); +void pmap_bootdebug(void); void pmap_bootdebug() { @@ -543,7 +543,7 @@ pmap_bootdebug() * size of the E$/NBPG. However, different CPUs can have different sized * E$, so we need to take the GCM of the E$ size. */ -static int pmap_calculate_colors __P((void)); +static int pmap_calculate_colors(void); static int pmap_calculate_colors() { int node = 0; @@ -1359,7 +1359,7 @@ remap_data: { extern vaddr_t u0[2]; extern struct pcb* proc0paddr; - extern void main __P((void)); + extern void main(void); paddr_t pa; /* Initialize all the pointers to u0 */ @@ -2640,7 +2640,7 @@ pmap_dumpsize() int pmap_dumpmmu(dump, blkno) register daddr_t blkno; - register int (*dump) __P((dev_t, daddr_t, caddr_t, size_t)); + register int (*dump)(dev_t, daddr_t, caddr_t, size_t); { kcore_seg_t *kseg; cpu_kcore_hdr_t *kcpu; @@ -3831,7 +3831,7 @@ vm_page_free1(mem) #ifdef DDB -void db_dump_pv __P((db_expr_t, int, db_expr_t, char *)); +void db_dump_pv(db_expr_t, int, db_expr_t, char *); void db_dump_pv(addr, have_addr, count, modif) db_expr_t addr; @@ -3859,7 +3859,7 @@ db_dump_pv(addr, have_addr, count, modif) /* * Test ref/modify handling. */ -void pmap_testout __P((void)); +void pmap_testout(void); void pmap_testout() { diff --git a/sys/arch/sparc64/sparc64/swapgeneric.c b/sys/arch/sparc64/sparc64/swapgeneric.c index 61e1048813a..0f7a6f4ebff 100644 --- a/sys/arch/sparc64/sparc64/swapgeneric.c +++ b/sys/arch/sparc64/sparc64/swapgeneric.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapgeneric.c,v 1.2 2001/09/29 18:40:32 miod Exp $ */ +/* $OpenBSD: swapgeneric.c,v 1.3 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: swapgeneric.c,v 1.8 1996/03/14 21:09:32 christos Exp $ */ /*- @@ -43,7 +43,7 @@ #include <sys/param.h> #include <sys/conf.h> -int (*mountroot) __P((void)) = NULL; /* tells autoconf.c that we are "generic" */ +int (*mountroot)(void) = NULL; /* tells autoconf.c that we are "generic" */ dev_t rootdev = NODEV; dev_t dumpdev = NODEV; diff --git a/sys/arch/sparc64/sparc64/trap.c b/sys/arch/sparc64/sparc64/trap.c index 5adfe3c23f2..cf9a0e8f8f5 100644 --- a/sys/arch/sparc64/sparc64/trap.c +++ b/sys/arch/sparc64/sparc64/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.16 2002/02/22 19:25:17 deraadt Exp $ */ +/* $OpenBSD: trap.c,v 1.17 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: trap.c,v 1.73 2001/08/09 01:03:01 eeh Exp $ */ /* @@ -319,19 +319,19 @@ const char *trap_type[] = { #define N_TRAP_TYPES (sizeof trap_type / sizeof *trap_type) -static __inline void userret __P((struct proc *, int, u_quad_t)); -static __inline void share_fpu __P((struct proc *, struct trapframe64 *)); - -void trap __P((struct trapframe64 *tf, unsigned type, vaddr_t pc, long tstate)); -void data_access_fault __P((struct trapframe64 *tf, unsigned type, vaddr_t pc, - vaddr_t va, vaddr_t sfva, u_long sfsr)); -void data_access_error __P((struct trapframe64 *tf, unsigned type, - vaddr_t afva, u_long afsr, vaddr_t sfva, u_long sfsr)); -void text_access_fault __P((struct trapframe64 *tf, unsigned type, - vaddr_t pc, u_long sfsr)); -void text_access_error __P((struct trapframe64 *tf, unsigned type, - vaddr_t pc, u_long sfsr, vaddr_t afva, u_long afsr)); -void syscall __P((struct trapframe64 *, register_t code, register_t pc)); +static __inline void userret(struct proc *, int, u_quad_t); +static __inline void share_fpu(struct proc *, struct trapframe64 *); + +void trap(struct trapframe64 *tf, unsigned type, vaddr_t pc, long tstate); +void data_access_fault(struct trapframe64 *tf, unsigned type, vaddr_t pc, + vaddr_t va, vaddr_t sfva, u_long sfsr); +void data_access_error(struct trapframe64 *tf, unsigned type, + vaddr_t afva, u_long afsr, vaddr_t sfva, u_long sfsr); +void text_access_fault(struct trapframe64 *tf, unsigned type, + vaddr_t pc, u_long sfsr); +void text_access_error(struct trapframe64 *tf, unsigned type, + vaddr_t pc, u_long sfsr, vaddr_t afva, u_long afsr); +void syscall(struct trapframe64 *, register_t code, register_t pc); /* * Define the code needed before returning to user mode, for diff --git a/sys/arch/sparc64/sparc64/vm_machdep.c b/sys/arch/sparc64/sparc64/vm_machdep.c index d708018688e..72b95f68a16 100644 --- a/sys/arch/sparc64/sparc64/vm_machdep.c +++ b/sys/arch/sparc64/sparc64/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.6 2001/12/04 23:22:42 art Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.7 2002/03/14 01:26:45 millert Exp $ */ /* $NetBSD: vm_machdep.c,v 1.38 2001/06/30 00:02:20 eeh Exp $ */ /* @@ -71,8 +71,8 @@ /* XXX These are in sbusvar.h, but including that would be problematical */ struct sbus_softc *sbus0; -void sbus_enter __P((struct sbus_softc *, vaddr_t va, int64_t pa, int flags)); -void sbus_remove __P((struct sbus_softc *, vaddr_t va, int len)); +void sbus_enter(struct sbus_softc *, vaddr_t va, int64_t pa, int flags); +void sbus_remove(struct sbus_softc *, vaddr_t va, int len); /* * Move pages from one kernel virtual address to another. diff --git a/sys/arch/sparc64/stand/installboot/installboot.c b/sys/arch/sparc64/stand/installboot/installboot.c index b08e4fa8fdc..1a028498edb 100644 --- a/sys/arch/sparc64/stand/installboot/installboot.c +++ b/sys/arch/sparc64/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.2 2001/09/06 19:24:47 jason Exp $ */ +/* $OpenBSD: installboot.c,v 1.3 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: installboot.c,v 1.8 2001/02/19 22:48:59 cgd Exp $ */ /*- @@ -86,11 +86,11 @@ int32_t *block_count_p; /* size of this array */ int32_t *block_size_p; /* filesystem block size */ int32_t max_block_count; -char *loadprotoblocks __P((char *, size_t *)); -int loadblocknums __P((char *, int)); -static void devread __P((int, void *, daddr_t, size_t, char *)); -static void usage __P((void)); -int main __P((int, char *[])); +char *loadprotoblocks(char *, size_t *); +int loadblocknums(char *, int); +static void devread(int, void *, daddr_t, size_t, char *); +static void usage(void); +int main(int, char *[]); static void usage() diff --git a/sys/arch/sparc64/stand/ofwboot/Locore.c b/sys/arch/sparc64/stand/ofwboot/Locore.c index f9526d8f9b0..8bb954407a3 100644 --- a/sys/arch/sparc64/stand/ofwboot/Locore.c +++ b/sys/arch/sparc64/stand/ofwboot/Locore.c @@ -1,4 +1,4 @@ -/* $OpenBSD: Locore.c,v 1.2 2001/08/20 19:55:33 jason Exp $ */ +/* $OpenBSD: Locore.c,v 1.3 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: Locore.c,v 1.1 2000/08/20 14:58:36 mrg Exp $ */ /* @@ -37,18 +37,18 @@ #include <machine/cpu.h> -vaddr_t OF_claim_virt __P((vaddr_t vaddr, int len)); -vaddr_t OF_alloc_virt __P((int len, int align)); -int OF_free_virt __P((vaddr_t vaddr, int len)); -int OF_unmap_virt __P((vaddr_t vaddr, int len)); -vaddr_t OF_map_phys __P((paddr_t paddr, off_t size, vaddr_t vaddr, int mode)); -paddr_t OF_alloc_phys __P((int len, int align)); -paddr_t OF_claim_phys __P((paddr_t phys, int len)); -int OF_free_phys __P((paddr_t paddr, int len)); +vaddr_t OF_claim_virt(vaddr_t vaddr, int len); +vaddr_t OF_alloc_virt(int len, int align); +int OF_free_virt(vaddr_t vaddr, int len); +int OF_unmap_virt(vaddr_t vaddr, int len); +vaddr_t OF_map_phys(paddr_t paddr, off_t size, vaddr_t vaddr, int mode); +paddr_t OF_alloc_phys(int len, int align); +paddr_t OF_claim_phys(paddr_t phys, int len); +int OF_free_phys(paddr_t paddr, int len); extern int openfirmware(void *); -void setup __P((void)); +void setup(void); #if 0 #ifdef XCOFF_GLUE diff --git a/sys/arch/sparc64/stand/ofwboot/boot.c b/sys/arch/sparc64/stand/ofwboot/boot.c index e05d045af91..58ea26c65da 100644 --- a/sys/arch/sparc64/stand/ofwboot/boot.c +++ b/sys/arch/sparc64/stand/ofwboot/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.4 2001/08/23 14:35:53 art Exp $ */ +/* $OpenBSD: boot.c,v 1.5 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: boot.c,v 1.3 2001/05/31 08:55:19 mrg Exp $ */ /* * Copyright (c) 1997, 1999 Eduardo E. Horvath. All rights reserved. @@ -81,12 +81,12 @@ int debug; #ifdef SPARC_BOOT_ELF -int elf32_exec __P((int, Elf32_Ehdr *, u_int64_t *, void **, void **)); -int elf64_exec __P((int, Elf64_Ehdr *, u_int64_t *, void **, void **)); +int elf32_exec(int, Elf32_Ehdr *, u_int64_t *, void **, void **); +int elf64_exec(int, Elf64_Ehdr *, u_int64_t *, void **, void **); #endif #ifdef SPARC_BOOT_AOUT -int aout_exec __P((int, struct exec *, u_int64_t *, void **)); +int aout_exec(int, struct exec *, u_int64_t *, void **); #endif #if 0 diff --git a/sys/arch/sparc64/stand/ofwboot/md5.h b/sys/arch/sparc64/stand/ofwboot/md5.h index 850f084483c..216e28046ed 100644 --- a/sys/arch/sparc64/stand/ofwboot/md5.h +++ b/sys/arch/sparc64/stand/ofwboot/md5.h @@ -1,4 +1,4 @@ -/* $OpenBSD: md5.h,v 1.2 2001/08/20 19:55:33 jason Exp $ */ +/* $OpenBSD: md5.h,v 1.3 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: md5.h,v 1.1 2000/08/20 14:58:38 mrg Exp $ */ /* @@ -43,13 +43,13 @@ typedef struct MD5Context { } MD5_CTX; __BEGIN_DECLS -void MD5Init __P((MD5_CTX *)); -void MD5Update __P((MD5_CTX *, const unsigned char *, unsigned int)); -void MD5Final __P((unsigned char[16], MD5_CTX *)); +void MD5Init(MD5_CTX *); +void MD5Update(MD5_CTX *, const unsigned char *, unsigned int); +void MD5Final(unsigned char[16], MD5_CTX *); #ifndef _KERNEL -char *MD5End __P((MD5_CTX *, char *)); -char *MD5File __P((const char *, char *)); -char *MD5Data __P((const unsigned char *, unsigned int, char *)); +char *MD5End(MD5_CTX *, char *); +char *MD5File(const char *, char *); +char *MD5Data(const unsigned char *, unsigned int, char *); #endif /* _KERNEL */ __END_DECLS diff --git a/sys/arch/sparc64/stand/ofwboot/net.c b/sys/arch/sparc64/stand/ofwboot/net.c index 355a4481118..ff4beed14db 100644 --- a/sys/arch/sparc64/stand/ofwboot/net.c +++ b/sys/arch/sparc64/stand/ofwboot/net.c @@ -1,4 +1,4 @@ -/* $OpenBSD: net.c,v 1.2 2001/08/20 19:55:33 jason Exp $ */ +/* $OpenBSD: net.c,v 1.3 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: net.c,v 1.1 2000/08/20 14:58:38 mrg Exp $ */ /* @@ -63,8 +63,8 @@ #include <lib/libsa/netif.h> -static int net_mountroot_bootparams __P((void)); -static int net_mountroot_bootp __P((void)); +static int net_mountroot_bootparams(void); +static int net_mountroot_bootp(void); char rootpath[FNAME_SIZE]; diff --git a/sys/arch/sparc64/stand/ofwboot/ofdev.c b/sys/arch/sparc64/stand/ofwboot/ofdev.c index 299f566351c..51920736c13 100644 --- a/sys/arch/sparc64/stand/ofwboot/ofdev.c +++ b/sys/arch/sparc64/stand/ofwboot/ofdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofdev.c,v 1.2 2001/08/20 19:55:33 jason Exp $ */ +/* $OpenBSD: ofdev.c,v 1.3 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: ofdev.c,v 1.1 2000/08/20 14:58:41 mrg Exp $ */ /* @@ -178,7 +178,7 @@ devclose(of) static struct devsw devsw[1] = { "OpenFirmware", strategy, - (int (*)__P((struct open_file *, ...)))nodev, + (int (*)(struct open_file *, ...))nodev, devclose, noioctl }; diff --git a/sys/arch/sparc64/stand/ofwboot/openfirm.h b/sys/arch/sparc64/stand/ofwboot/openfirm.h index 4ec55a3bec7..5bdb18b3980 100644 --- a/sys/arch/sparc64/stand/ofwboot/openfirm.h +++ b/sys/arch/sparc64/stand/ofwboot/openfirm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: openfirm.h,v 1.2 2001/08/20 19:55:33 jason Exp $ */ +/* $OpenBSD: openfirm.h,v 1.3 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: openfirm.h,v 1.1 2000/08/20 14:58:42 mrg Exp $ */ /* @@ -40,20 +40,20 @@ #include <machine/openfirm.h> #if 0 -u_int OF_finddevice __P((char *name)); -u_int OF_instance_to_package __P((u_int ihandle)); -u_int OF_getprop __P((u_int handle, char *prop, void *buf, int buflen)); +u_int OF_finddevice(char *name); +u_int OF_instance_to_package(u_int ihandle); +u_int OF_getprop(u_int handle, char *prop, void *buf, int buflen); #ifdef __notyet__ -int OF_setprop __P((u_int handle, char *prop, void *buf, int len)); +int OF_setprop(u_int handle, char *prop, void *buf, int len); #endif -u_int OF_open __P((char *dname)); -void OF_close __P((u_int handle)); -int OF_write __P((u_int handle, void *addr, int len)); -int OF_read __P((u_int handle, void *addr, int len)); -int OF_seek __P((u_int handle, u_int64_t pos)); +u_int OF_open(char *dname); +void OF_close(u_int handle); +int OF_write(u_int handle, void *addr, int len); +int OF_read(u_int handle, void *addr, int len); +int OF_seek(u_int handle, u_int64_t pos); #endif -void *OF_claim __P((void *virt, u_int size, u_int align)); -void OF_release __P((void *virt, u_int size)); -int OF_milliseconds __P((void)); +void *OF_claim(void *virt, u_int size, u_int align); +void OF_release(void *virt, u_int size); +int OF_milliseconds(void); void OF_chain __P((void *addr, u_int size, void (*entry)(), void *parm, u_int parmlen)); diff --git a/sys/arch/sun3/dev/btvar.h b/sys/arch/sun3/dev/btvar.h index b2481fcf708..bb7567f2f35 100644 --- a/sys/arch/sun3/dev/btvar.h +++ b/sys/arch/sun3/dev/btvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: btvar.h,v 1.2 2001/07/04 08:33:41 niklas Exp $ */ +/* $OpenBSD: btvar.h,v 1.3 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: btvar.h,v 1.1 1995/03/10 01:50:47 gwr Exp $ */ /* @@ -62,8 +62,8 @@ union bt_cmap { /* * Routines in bt_subr.c. */ -int bt_getcmap __P((struct fbcmap *, union bt_cmap *, int)); -int bt_putcmap __P((struct fbcmap *, union bt_cmap *, int)); +int bt_getcmap(struct fbcmap *, union bt_cmap *, int); +int bt_putcmap(struct fbcmap *, union bt_cmap *, int); /* * Compute (x / 4) * 3 and (x / 4) * 4. These are used in turning diff --git a/sys/arch/sun3/dev/bw2.c b/sys/arch/sun3/dev/bw2.c index ad8aed93ec3..7196bd6ce98 100644 --- a/sys/arch/sun3/dev/bw2.c +++ b/sys/arch/sun3/dev/bw2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bw2.c,v 1.10 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: bw2.c,v 1.11 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: bw2.c,v 1.8 1996/10/13 03:47:25 christos Exp $ */ /* @@ -82,8 +82,8 @@ struct bw2_softc { }; /* autoconfiguration driver */ -static void bw2attach __P((struct device *, struct device *, void *)); -static int bw2match __P((struct device *, void *, void *)); +static void bw2attach(struct device *, struct device *, void *); +static int bw2match(struct device *, void *, void *); struct cfattach bwtwo_ca = { sizeof(struct bw2_softc), bw2match, bw2attach @@ -95,8 +95,8 @@ struct cfdriver bwtwo_cd = { /* XXX we do not handle frame buffer interrupts */ -static int bw2gvideo __P((struct fbdevice *, int *)); -static int bw2svideo __P((struct fbdevice *, int *)); +static int bw2gvideo(struct fbdevice *, int *); +static int bw2svideo(struct fbdevice *, int *); static struct fbdriver bw2fbdriver = { bw2open, bw2close, bw2mmap, diff --git a/sys/arch/sun3/dev/cg2.c b/sys/arch/sun3/dev/cg2.c index 53411377c73..17aca349433 100644 --- a/sys/arch/sun3/dev/cg2.c +++ b/sys/arch/sun3/dev/cg2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cg2.c,v 1.9 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: cg2.c,v 1.10 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: cg2.c,v 1.7 1996/10/13 03:47:26 christos Exp $ */ /* @@ -95,8 +95,8 @@ struct cg2_softc { }; /* autoconfiguration driver */ -static void cg2attach __P((struct device *, struct device *, void *)); -static int cg2match __P((struct device *, void *, void *)); +static void cg2attach(struct device *, struct device *, void *); +static int cg2match(struct device *, void *, void *); struct cfattach cgtwo_ca = { sizeof(struct cg2_softc), cg2match, cg2attach @@ -106,11 +106,11 @@ struct cfdriver cgtwo_cd = { NULL, "cgtwo", DV_DULL }; -static int cg2gattr __P((struct fbdevice *, struct fbgattr *)); -static int cg2gvideo __P((struct fbdevice *, int *)); -static int cg2svideo __P((struct fbdevice *, int *)); -static int cg2getcmap __P((struct fbdevice *, struct fbcmap *)); -static int cg2putcmap __P((struct fbdevice *, struct fbcmap *)); +static int cg2gattr(struct fbdevice *, struct fbgattr *); +static int cg2gvideo(struct fbdevice *, int *); +static int cg2svideo(struct fbdevice *, int *); +static int cg2getcmap(struct fbdevice *, struct fbcmap *); +static int cg2putcmap(struct fbdevice *, struct fbcmap *); static struct fbdriver cg2fbdriver = { cg2open, cg2close, cg2mmap, cg2gattr, @@ -118,7 +118,7 @@ static struct fbdriver cg2fbdriver = { cg2getcmap, cg2putcmap }; -static int cg2intr __P((void*)); +static int cg2intr(void*); /* * Match a cg2. diff --git a/sys/arch/sun3/dev/cg4.c b/sys/arch/sun3/dev/cg4.c index c6115e12381..da050615dae 100644 --- a/sys/arch/sun3/dev/cg4.c +++ b/sys/arch/sun3/dev/cg4.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cg4.c,v 1.10 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: cg4.c,v 1.11 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: cg4.c,v 1.11 1996/10/29 19:54:19 gwr Exp $ */ /* @@ -108,8 +108,8 @@ struct cg4_softc { }; /* autoconfiguration driver */ -static void cg4attach __P((struct device *, struct device *, void *)); -static int cg4match __P((struct device *, void *, void *)); +static void cg4attach(struct device *, struct device *, void *); +static int cg4match(struct device *, void *, void *); struct cfattach cgfour_ca = { sizeof(struct cg4_softc), cg4match, cg4attach @@ -121,19 +121,19 @@ struct cfdriver cgfour_cd = { /* frame buffer generic driver */ -static int cg4gattr __P((struct fbdevice *, struct fbgattr *)); -static int cg4gvideo __P((struct fbdevice *, int *)); -static int cg4svideo __P((struct fbdevice *, int *)); -static int cg4getcmap __P((struct fbdevice *, struct fbcmap *)); -static int cg4putcmap __P((struct fbdevice *, struct fbcmap *)); +static int cg4gattr(struct fbdevice *, struct fbgattr *); +static int cg4gvideo(struct fbdevice *, int *); +static int cg4svideo(struct fbdevice *, int *); +static int cg4getcmap(struct fbdevice *, struct fbcmap *); +static int cg4putcmap(struct fbdevice *, struct fbcmap *); -static void cg4a_init __P((struct cg4_softc *)); -static void cg4a_svideo __P((struct cg4_softc *, int)); -static void cg4a_ldcmap __P((struct cg4_softc *)); +static void cg4a_init(struct cg4_softc *); +static void cg4a_svideo(struct cg4_softc *, int); +static void cg4a_ldcmap(struct cg4_softc *); -static void cg4b_init __P((struct cg4_softc *)); -static void cg4b_svideo __P((struct cg4_softc *, int)); -static void cg4b_ldcmap __P((struct cg4_softc *)); +static void cg4b_init(struct cg4_softc *); +static void cg4b_svideo(struct cg4_softc *, int); +static void cg4b_ldcmap(struct cg4_softc *); static struct fbdriver cg4_fbdriver = { cg4open, cg4close, cg4mmap, cg4gattr, diff --git a/sys/arch/sun3/dev/eeprom.c b/sys/arch/sun3/dev/eeprom.c index 61672907da6..863535aaefd 100644 --- a/sys/arch/sun3/dev/eeprom.c +++ b/sys/arch/sun3/dev/eeprom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eeprom.c,v 1.8 2001/05/16 12:49:48 ho Exp $ */ +/* $OpenBSD: eeprom.c,v 1.9 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: eeprom.c,v 1.8 1996/03/26 15:16:06 gwr Exp $ */ /* @@ -54,12 +54,12 @@ int ee_console; /* for convenience of drivers */ static char *eeprom_va; static int ee_busy, ee_want; -static int eeprom_match __P((struct device *, void *vcf, void *args)); -static void eeprom_attach __P((struct device *, struct device *, void *)); -static int ee_update __P((caddr_t, int, int)); -static int ee_take __P((void)); -static void ee_give __P((void)); -int ee_get_byte __P((int, int)); +static int eeprom_match(struct device *, void *vcf, void *args); +static void eeprom_attach(struct device *, struct device *, void *); +static int ee_update(caddr_t, int, int); +static int ee_take(void); +static void ee_give(void); +int ee_get_byte(int, int); struct cfattach eeprom_ca = { sizeof(struct device), eeprom_match, eeprom_attach diff --git a/sys/arch/sun3/dev/fbvar.h b/sys/arch/sun3/dev/fbvar.h index 9a6dce8fc4f..f110a276521 100644 --- a/sys/arch/sun3/dev/fbvar.h +++ b/sys/arch/sun3/dev/fbvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fbvar.h,v 1.6 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: fbvar.h,v 1.7 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: fbvar.h,v 1.3 1996/10/29 19:27:37 gwr Exp $ */ /* @@ -68,16 +68,16 @@ struct fbdevice { struct fbdriver { /* These avoid the need to know our major number. */ - int (*fbd_open) __P((dev_t, int, int, struct proc *)); - int (*fbd_close) __P((dev_t, int, int, struct proc *)); - paddr_t (*fbd_mmap) __P((dev_t, off_t, int)); + int (*fbd_open)(dev_t, int, int, struct proc *); + int (*fbd_close)(dev_t, int, int, struct proc *); + paddr_t (*fbd_mmap)(dev_t, off_t, int); /* These are the internal ioctl functions */ - int (*fbd_gattr) __P((struct fbdevice *, struct fbgattr *)); - int (*fbd_gvideo) __P((struct fbdevice *, int *)); - int (*fbd_svideo) __P((struct fbdevice *, int *)); - int (*fbd_getcmap) __P((struct fbdevice *, struct fbcmap *)); - int (*fbd_putcmap) __P((struct fbdevice *, struct fbcmap *)); + int (*fbd_gattr)(struct fbdevice *, struct fbgattr *); + int (*fbd_gvideo)(struct fbdevice *, int *); + int (*fbd_svideo)(struct fbdevice *, int *); + int (*fbd_getcmap)(struct fbdevice *, struct fbcmap *); + int (*fbd_putcmap)(struct fbdevice *, struct fbcmap *); }; -void fb_attach __P((struct fbdevice *, int)); -int fbioctlfb __P((struct fbdevice *, u_long, caddr_t)); +void fb_attach(struct fbdevice *, int); +int fbioctlfb(struct fbdevice *, u_long, caddr_t); diff --git a/sys/arch/sun3/dev/if_ie.c b/sys/arch/sun3/dev/if_ie.c index 8c5d88c3b92..125779bc848 100644 --- a/sys/arch/sun3/dev/if_ie.c +++ b/sys/arch/sun3/dev/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.15 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: if_ie.c,v 1.16 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: if_ie.c,v 1.15 1996/10/30 00:24:33 gwr Exp $ */ /*- @@ -168,38 +168,38 @@ static struct mbuf *last_not_for_us; #define ETHER_MAX_LEN 1518 #define ETHER_ADDR_LEN 6 -void iewatchdog __P((struct ifnet *)); -int ieinit __P((struct ie_softc *)); -int ieioctl __P((struct ifnet *, u_long, caddr_t)); -void iestart __P((struct ifnet *)); -void iereset __P((struct ie_softc *)); -static void ie_readframe __P((struct ie_softc *, int)); -static void ie_drop_packet_buffer __P((struct ie_softc *)); -static int command_and_wait __P((struct ie_softc *, int, void volatile *, int)); -static __inline__ void ie_setup_config __P((volatile struct ie_config_cmd *, - int, int)); -static void ierint __P((struct ie_softc *)); -static void ietint __P((struct ie_softc *)); -static void setup_bufs __P((struct ie_softc *)); -static int mc_setup __P((struct ie_softc *, void *)); -static void mc_reset __P((struct ie_softc *)); -static int ie_setupram __P((struct ie_softc *)); -static __inline__ caddr_t Align __P((caddr_t)); -static __inline__ void ie_ack __P((struct ie_softc *, u_int)); -static __inline__ u_short ether_cmp __P((u_char *, u_char *)); -static __inline__ int check_eh __P((struct ie_softc *, struct ether_header *, - int *)); -static __inline__ int ie_buflen __P((struct ie_softc *, int)); -static __inline__ int ie_packet_len __P((struct ie_softc *)); -static __inline__ void iexmit __P((struct ie_softc *)); -static __inline__ int ieget __P((struct ie_softc *, struct mbuf **, - struct ether_header *, int *)); -static void chan_attn_timeout __P((void *)); -static void run_tdr __P((struct ie_softc *, struct ie_tdr_cmd *)); -static void iestop __P((struct ie_softc *)); +void iewatchdog(struct ifnet *); +int ieinit(struct ie_softc *); +int ieioctl(struct ifnet *, u_long, caddr_t); +void iestart(struct ifnet *); +void iereset(struct ie_softc *); +static void ie_readframe(struct ie_softc *, int); +static void ie_drop_packet_buffer(struct ie_softc *); +static int command_and_wait(struct ie_softc *, int, void volatile *, int); +static __inline__ void ie_setup_config(volatile struct ie_config_cmd *, + int, int); +static void ierint(struct ie_softc *); +static void ietint(struct ie_softc *); +static void setup_bufs(struct ie_softc *); +static int mc_setup(struct ie_softc *, void *); +static void mc_reset(struct ie_softc *); +static int ie_setupram(struct ie_softc *); +static __inline__ caddr_t Align(caddr_t); +static __inline__ void ie_ack(struct ie_softc *, u_int); +static __inline__ u_short ether_cmp(u_char *, u_char *); +static __inline__ int check_eh(struct ie_softc *, struct ether_header *, + int *); +static __inline__ int ie_buflen(struct ie_softc *, int); +static __inline__ int ie_packet_len(struct ie_softc *); +static __inline__ void iexmit(struct ie_softc *); +static __inline__ int ieget(struct ie_softc *, struct mbuf **, + struct ether_header *, int *); +static void chan_attn_timeout(void *); +static void run_tdr(struct ie_softc *, struct ie_tdr_cmd *); +static void iestop(struct ie_softc *); #ifdef IEDEBUG -void print_rbd __P((volatile struct ie_recv_buf_desc *)); +void print_rbd(volatile struct ie_recv_buf_desc *); int in_ierint = 0; int in_ietint = 0; #endif diff --git a/sys/arch/sun3/dev/if_ie_obio.c b/sys/arch/sun3/dev/if_ie_obio.c index e3e830b150d..f6de6ac4ade 100644 --- a/sys/arch/sun3/dev/if_ie_obio.c +++ b/sys/arch/sun3/dev/if_ie_obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie_obio.c,v 1.6 2000/08/28 21:59:34 miod Exp $ */ +/* $OpenBSD: if_ie_obio.c,v 1.7 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: if_ie_obio.c,v 1.6 1996/11/20 18:56:51 gwr Exp $ */ /*- @@ -67,16 +67,16 @@ #include <sun3/dev/if_iereg.h> #include <sun3/dev/if_ievar.h> -static void ie_obreset __P((struct ie_softc *)); -static void ie_obattend __P((struct ie_softc *)); -static void ie_obrun __P((struct ie_softc *)); +static void ie_obreset(struct ie_softc *); +static void ie_obattend(struct ie_softc *); +static void ie_obrun(struct ie_softc *); /* * New-style autoconfig attachment */ -static int ie_obio_match __P((struct device *, void *, void *)); -static void ie_obio_attach __P((struct device *, struct device *, void *)); +static int ie_obio_match(struct device *, void *, void *); +static void ie_obio_attach(struct device *, struct device *, void *); struct cfattach ie_obio_ca = { sizeof(struct ie_softc), ie_obio_match, ie_obio_attach diff --git a/sys/arch/sun3/dev/if_ie_vmes.c b/sys/arch/sun3/dev/if_ie_vmes.c index 89287d75658..23d0ac4e173 100644 --- a/sys/arch/sun3/dev/if_ie_vmes.c +++ b/sys/arch/sun3/dev/if_ie_vmes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie_vmes.c,v 1.6 2000/08/28 21:59:35 miod Exp $ */ +/* $OpenBSD: if_ie_vmes.c,v 1.7 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: if_ie_vmes.c,v 1.5 1996/11/20 18:56:51 gwr Exp $ */ /*- @@ -66,23 +66,23 @@ #include <sun3/dev/if_iereg.h> #include <sun3/dev/if_ievar.h> -static void ie_vmereset __P((struct ie_softc *)); -static void ie_vmeattend __P((struct ie_softc *)); -static void ie_vmerun __P((struct ie_softc *)); +static void ie_vmereset(struct ie_softc *); +static void ie_vmeattend(struct ie_softc *); +static void ie_vmerun(struct ie_softc *); /* * zero/copy functions: OBIO can use the normal functions, but VME * must do only byte or half-word (16 bit) accesses... */ -static void wcopy __P((const void *, void *, u_int)); -static void wzero __P((void *, u_int)); +static void wcopy(const void *, void *, u_int); +static void wzero(void *, u_int); /* * New-style autoconfig attachment */ -static int ie_vmes_match __P((struct device *, void *, void *)); -static void ie_vmes_attach __P((struct device *, struct device *, void *)); +static int ie_vmes_match(struct device *, void *, void *); +static void ie_vmes_attach(struct device *, struct device *, void *); struct cfattach ie_vmes_ca = { sizeof(struct ie_softc), ie_vmes_match, ie_vmes_attach diff --git a/sys/arch/sun3/dev/if_ievar.h b/sys/arch/sun3/dev/if_ievar.h index 259673c60eb..a3e024390f0 100644 --- a/sys/arch/sun3/dev/if_ievar.h +++ b/sys/arch/sun3/dev/if_ievar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ievar.h,v 1.4 1997/01/16 04:03:48 kstailey Exp $ */ +/* $OpenBSD: if_ievar.h,v 1.5 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: if_ievar.h,v 1.6 1996/03/26 14:38:33 gwr Exp $ */ /* @@ -68,11 +68,11 @@ struct ie_softc { caddr_t sc_reg; /* KVA of card's register */ enum ie_hardware hard_type; /* card type */ - void (*reset_586) __P((struct ie_softc *)); /* three card */ - void (*chan_attn) __P((struct ie_softc *)); /* dependant */ - void (*run_586) __P((struct ie_softc *)); /* functions */ - void (*sc_bcopy) __P((const void *, void *, u_int)); - void (*sc_bzero) __P((void *, u_int)); + void (*reset_586)(struct ie_softc *); /* three card */ + void (*chan_attn)(struct ie_softc *); /* dependant */ + void (*run_586)(struct ie_softc *); /* functions */ + void (*sc_bcopy)(const void *, void *, u_int); + void (*sc_bzero)(void *, u_int); int want_mcsetup; /* flag for multicast setup */ int promisc; /* are we in promisc mode? */ @@ -118,5 +118,5 @@ struct ie_softc { }; -extern void ie_attach __P((struct ie_softc *)); -extern int ie_intr __P((void *)); +extern void ie_attach(struct ie_softc *); +extern int ie_intr(void *); diff --git a/sys/arch/sun3/dev/if_le.c b/sys/arch/sun3/dev/if_le.c index db30b8b027d..734719c9e96 100644 --- a/sys/arch/sun3/dev/if_le.c +++ b/sys/arch/sun3/dev/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.12 2000/08/28 22:03:01 miod Exp $ */ +/* $OpenBSD: if_le.c,v 1.13 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: if_le.c,v 1.33 1996/11/20 18:56:52 gwr Exp $ */ /*- @@ -83,15 +83,15 @@ struct le_softc { struct lereg1 *sc_r1; /* LANCE registers */ }; -static int le_match __P((struct device *, void *, void *)); -static void le_attach __P((struct device *, struct device *, void *)); +static int le_match(struct device *, void *, void *); +static void le_attach(struct device *, struct device *, void *); struct cfattach le_ca = { sizeof(struct le_softc), le_match, le_attach }; -hide void lewrcsr __P((struct am7990_softc *, u_int16_t, u_int16_t)); -hide u_int16_t lerdcsr __P((struct am7990_softc *, u_int16_t)); +hide void lewrcsr(struct am7990_softc *, u_int16_t, u_int16_t); +hide u_int16_t lerdcsr(struct am7990_softc *, u_int16_t); hide void lewrcsr(sc, port, val) diff --git a/sys/arch/sun3/dev/kbd.c b/sys/arch/sun3/dev/kbd.c index 2f8e405606b..d9d5b23986e 100644 --- a/sys/arch/sun3/dev/kbd.c +++ b/sys/arch/sun3/dev/kbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kbd.c,v 1.8 2001/08/12 12:03:02 heko Exp $ */ +/* $OpenBSD: kbd.c,v 1.9 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: kbd.c,v 1.8 1996/05/17 19:32:06 gwr Exp $ */ /* @@ -190,18 +190,18 @@ struct zsops zsops_kbd; * Definition of the driver for autoconfig. ****************************************************************/ -static int kbd_match __P((struct device *, void *, void *)); -static void kbd_attach __P((struct device *, struct device *, void *)); +static int kbd_match(struct device *, void *, void *); +static void kbd_attach(struct device *, struct device *, void *); -static int kbd_drain_tx __P((struct kbd_softc *)); -static void kbd_input_string __P((struct kbd_softc *, char *str)); -static void kbd_input_funckey __P((struct kbd_softc *,register int)); -static void kbd_input_keysym __P((struct kbd_softc *,register int)); -static void kbd_input_raw __P((struct kbd_softc *,register int)); -static void kbd_rxint __P((register struct zs_chanstate *)); -static void kbd_txint __P((register struct zs_chanstate *)); -static void kbd_stint __P((register struct zs_chanstate *)); -static void kbd_softint __P((register struct zs_chanstate *)); +static int kbd_drain_tx(struct kbd_softc *); +static void kbd_input_string(struct kbd_softc *, char *str); +static void kbd_input_funckey(struct kbd_softc *,register int); +static void kbd_input_keysym(struct kbd_softc *,register int); +static void kbd_input_raw(struct kbd_softc *,register int); +static void kbd_rxint(register struct zs_chanstate *); +static void kbd_txint(register struct zs_chanstate *); +static void kbd_stint(register struct zs_chanstate *); +static void kbd_softint(register struct zs_chanstate *); struct cfattach kbd_ca = { sizeof(struct kbd_softc), kbd_match, kbd_attach @@ -395,14 +395,14 @@ kbdselect(dev, rw, p) static int kbd_ioccmd(struct kbd_softc *k, int *data); -static int kbd_iockeymap __P((struct kbd_state *ks, - u_long cmd, struct kiockeymap *kio)); +static int kbd_iockeymap(struct kbd_state *ks, + u_long cmd, struct kiockeymap *kio); static int kbd_iocsled(struct kbd_softc *k, int *data); #ifdef KIOCGETKEY -static int kbd_oldkeymap __P((struct kbd_state *ks, - u_long cmd, struct okiockey *okio)); +static int kbd_oldkeymap(struct kbd_state *ks, + u_long cmd, struct okiockey *okio); #endif int diff --git a/sys/arch/sun3/dev/kbd_xlate.h b/sys/arch/sun3/dev/kbd_xlate.h index 2a811e0ece5..e2bf24adf2f 100644 --- a/sys/arch/sun3/dev/kbd_xlate.h +++ b/sys/arch/sun3/dev/kbd_xlate.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kbd_xlate.h,v 1.2 1997/08/19 23:09:32 kstailey Exp $ */ +/* $OpenBSD: kbd_xlate.h,v 1.3 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: kbd_xlate.h,v 1.1.1.1 1996/01/24 01:15:35 gwr Exp $ */ /* @@ -79,14 +79,14 @@ struct kbd_state { }; -extern void kbd_xlate_init __P((struct kbd_state *ks)); -extern int kbd_code_to_keysym __P((struct kbd_state *ks, int c)); +extern void kbd_xlate_init(struct kbd_state *ks); +extern int kbd_code_to_keysym(struct kbd_state *ks, int c); /* * XXX: kd/kbd interface... Does this belong elsewhere? * This is the only header shared between them... */ -extern int kbd_iopen __P((int unit)); -extern void kd_init __P((int unit)); -extern void kd_input __P((int c)); +extern int kbd_iopen(int unit); +extern void kd_init(int unit); +extern void kd_input(int c); diff --git a/sys/arch/sun3/dev/memerr.c b/sys/arch/sun3/dev/memerr.c index 37de3dbb300..4cab97e942a 100644 --- a/sys/arch/sun3/dev/memerr.c +++ b/sys/arch/sun3/dev/memerr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: memerr.c,v 1.8 1997/01/16 04:03:50 kstailey Exp $ */ +/* $OpenBSD: memerr.c,v 1.9 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: memerr.c,v 1.6 1996/11/13 07:05:14 thorpej Exp $ */ /* @@ -73,10 +73,10 @@ struct memerr_softc { /* XXX: counters? */ }; -static int memerr_match __P((struct device *, void *vcf, void *args)); -static void memerr_attach __P((struct device *, struct device *, void *)); -static int memerr_interrupt __P((void *)); -static void memerr_correctable __P((struct memerr_softc *)); +static int memerr_match(struct device *, void *vcf, void *args); +static void memerr_attach(struct device *, struct device *, void *); +static int memerr_interrupt(void *); +static void memerr_correctable(struct memerr_softc *); struct cfattach memerr_ca = { sizeof(struct memerr_softc), memerr_match, memerr_attach diff --git a/sys/arch/sun3/dev/ms.c b/sys/arch/sun3/dev/ms.c index 7128789dbe1..cc87729cae9 100644 --- a/sys/arch/sun3/dev/ms.c +++ b/sys/arch/sun3/dev/ms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ms.c,v 1.4 1997/08/19 23:09:34 kstailey Exp $ */ +/* $OpenBSD: ms.c,v 1.5 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: ms.c,v 1.6 1996/05/17 19:32:09 gwr Exp $ */ /* @@ -141,14 +141,14 @@ struct zsops zsops_ms; * Definition of the driver for autoconfig. ****************************************************************/ -static int ms_match __P((struct device *, void *, void *)); -static void ms_attach __P((struct device *, struct device *, void *)); +static int ms_match(struct device *, void *, void *); +static void ms_attach(struct device *, struct device *, void *); -static void ms_input __P((register struct ms_softc *, register int)); -static void ms_rxint __P((register struct zs_chanstate *)); -static void ms_txint __P((register struct zs_chanstate *)); -static void ms_stint __P((register struct zs_chanstate *)); -static void ms_softint __P((struct zs_chanstate *)); +static void ms_input(register struct ms_softc *, register int); +static void ms_rxint(register struct zs_chanstate *); +static void ms_txint(register struct zs_chanstate *); +static void ms_stint(register struct zs_chanstate *); +static void ms_softint(struct zs_chanstate *); struct cfattach ms_ca = { sizeof(struct ms_softc), ms_match, ms_attach diff --git a/sys/arch/sun3/dev/obio.c b/sys/arch/sun3/dev/obio.c index 5160324edf3..5a1ff223dd6 100644 --- a/sys/arch/sun3/dev/obio.c +++ b/sys/arch/sun3/dev/obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: obio.c,v 1.7 1999/01/11 05:12:02 millert Exp $ */ +/* $OpenBSD: obio.c,v 1.8 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: obio.c,v 1.23 1996/11/20 18:56:56 gwr Exp $ */ /*- @@ -47,13 +47,13 @@ #include <machine/mon.h> #include <machine/obio.h> -static int obio_match __P((struct device *, void *, void *)); -static void obio_attach __P((struct device *, struct device *, void *)); -static int obio_print __P((void *, const char *parentname)); -static int obio_submatch __P((struct device *, void *, void *)); +static int obio_match(struct device *, void *, void *); +static void obio_attach(struct device *, struct device *, void *); +static int obio_print(void *, const char *parentname); +static int obio_submatch(struct device *, void *, void *); -static void save_prom_mappings __P((void)); -static void make_required_mappings __P((void)); +static void save_prom_mappings(void); +static void make_required_mappings(void); struct cfattach obio_ca = { sizeof(struct device), obio_match, obio_attach diff --git a/sys/arch/sun3/dev/obmem.c b/sys/arch/sun3/dev/obmem.c index 72b3bb15870..296c543beeb 100644 --- a/sys/arch/sun3/dev/obmem.c +++ b/sys/arch/sun3/dev/obmem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: obmem.c,v 1.6 1997/01/16 04:03:51 kstailey Exp $ */ +/* $OpenBSD: obmem.c,v 1.7 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: obmem.c,v 1.11 1996/11/20 18:56:57 gwr Exp $ */ /*- @@ -49,8 +49,8 @@ #include <machine/autoconf.h> #include <machine/obmem.h> -static int obmem_match __P((struct device *, void *, void *)); -static void obmem_attach __P((struct device *, struct device *, void *)); +static int obmem_match(struct device *, void *, void *); +static void obmem_attach(struct device *, struct device *, void *); struct cfattach obmem_ca = { sizeof(struct device), obmem_match, obmem_attach diff --git a/sys/arch/sun3/dev/si.c b/sys/arch/sun3/dev/si.c index 917e3167cd2..8e7b3796708 100644 --- a/sys/arch/sun3/dev/si.c +++ b/sys/arch/sun3/dev/si.c @@ -1,4 +1,4 @@ -/* $OpenBSD: si.c,v 1.14 2001/05/16 12:49:49 ho Exp $ */ +/* $OpenBSD: si.c,v 1.15 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: si.c,v 1.31 1996/11/20 18:56:59 gwr Exp $ */ /*- @@ -115,7 +115,7 @@ static int si_link_flags = 0 /* | SDEV_DB2 */ ; /* How long to wait for DMA before declaring an error. */ int si_dma_intr_timo = 500; /* ticks (sec. X 100) */ -static void si_minphys __P((struct buf *)); +static void si_minphys(struct buf *); static struct scsi_adapter si_ops = { ncr5380_scsi_cmd, /* scsi_cmd() */ diff --git a/sys/arch/sun3/dev/si_obio.c b/sys/arch/sun3/dev/si_obio.c index 23cdac9b2b7..88f879778d8 100644 --- a/sys/arch/sun3/dev/si_obio.c +++ b/sys/arch/sun3/dev/si_obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: si_obio.c,v 1.10 2001/01/25 03:50:49 todd Exp $ */ +/* $OpenBSD: si_obio.c,v 1.11 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: si_obio.c,v 1.7 1996/11/20 18:57:00 gwr Exp $ */ /*- @@ -117,21 +117,21 @@ */ #define UDC_WAIT_USEC 5 -void si_obio_dma_setup __P((struct ncr5380_softc *)); -void si_obio_dma_start __P((struct ncr5380_softc *)); -void si_obio_dma_eop __P((struct ncr5380_softc *)); -void si_obio_dma_stop __P((struct ncr5380_softc *)); +void si_obio_dma_setup(struct ncr5380_softc *); +void si_obio_dma_start(struct ncr5380_softc *); +void si_obio_dma_eop(struct ncr5380_softc *); +void si_obio_dma_stop(struct ncr5380_softc *); -static __inline__ int si_obio_udc_read __P((volatile struct si_regs *, int)); -static __inline__ void si_obio_udc_write __P((volatile struct si_regs *, - int, int)); +static __inline__ int si_obio_udc_read(volatile struct si_regs *, int); +static __inline__ void si_obio_udc_write(volatile struct si_regs *, + int, int); /* * New-style autoconfig attachment */ -static int si_obio_match __P((struct device *, void *, void *)); -static void si_obio_attach __P((struct device *, struct device *, void *)); +static int si_obio_match(struct device *, void *, void *); +static void si_obio_attach(struct device *, struct device *, void *); struct cfattach si_obio_ca = { sizeof(struct si_softc), si_obio_match, si_obio_attach diff --git a/sys/arch/sun3/dev/si_vme.c b/sys/arch/sun3/dev/si_vme.c index 4505e66c825..f370898b017 100644 --- a/sys/arch/sun3/dev/si_vme.c +++ b/sys/arch/sun3/dev/si_vme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: si_vme.c,v 1.6 1997/01/16 04:03:54 kstailey Exp $ */ +/* $OpenBSD: si_vme.c,v 1.7 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: si_vme.c,v 1.7 1996/11/20 18:57:01 gwr Exp $ */ /*- @@ -107,20 +107,20 @@ #include "sireg.h" #include "sivar.h" -void si_vme_dma_setup __P((struct ncr5380_softc *)); -void si_vme_dma_start __P((struct ncr5380_softc *)); -void si_vme_dma_eop __P((struct ncr5380_softc *)); -void si_vme_dma_stop __P((struct ncr5380_softc *)); +void si_vme_dma_setup(struct ncr5380_softc *); +void si_vme_dma_start(struct ncr5380_softc *); +void si_vme_dma_eop(struct ncr5380_softc *); +void si_vme_dma_stop(struct ncr5380_softc *); -void si_vme_intr_on __P((struct ncr5380_softc *)); -void si_vme_intr_off __P((struct ncr5380_softc *)); +void si_vme_intr_on(struct ncr5380_softc *); +void si_vme_intr_off(struct ncr5380_softc *); /* * New-style autoconfig attachment */ -static int si_vmes_match __P((struct device *, void *, void *)); -static void si_vmes_attach __P((struct device *, struct device *, void *)); +static int si_vmes_match(struct device *, void *, void *); +static void si_vmes_attach(struct device *, struct device *, void *); struct cfattach si_vmes_ca = { sizeof(struct si_softc), si_vmes_match, si_vmes_attach diff --git a/sys/arch/sun3/dev/sivar.h b/sys/arch/sun3/dev/sivar.h index f1f6bee8442..8b5c51328f0 100644 --- a/sys/arch/sun3/dev/sivar.h +++ b/sys/arch/sun3/dev/sivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sivar.h,v 1.3 2000/05/02 21:48:52 miod Exp $ */ +/* $OpenBSD: sivar.h,v 1.4 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: sivar.h,v 1.3 1996/11/20 18:57:01 gwr Exp $ */ /*- @@ -92,11 +92,11 @@ struct si_softc { extern int si_debug; -void si_attach __P((struct si_softc *)); -int si_intr __P((void *)); +void si_attach(struct si_softc *); +int si_intr(void *); -void si_reset_adapter __P((struct ncr5380_softc *)); +void si_reset_adapter(struct ncr5380_softc *); -void si_dma_alloc __P((struct ncr5380_softc *)); -void si_dma_free __P((struct ncr5380_softc *)); -void si_dma_poll __P((struct ncr5380_softc *)); +void si_dma_alloc(struct ncr5380_softc *); +void si_dma_free(struct ncr5380_softc *); +void si_dma_poll(struct ncr5380_softc *); diff --git a/sys/arch/sun3/dev/vme.c b/sys/arch/sun3/dev/vme.c index b188762dc39..ceb8667b1a8 100644 --- a/sys/arch/sun3/dev/vme.c +++ b/sys/arch/sun3/dev/vme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vme.c,v 1.4 1997/01/16 04:03:55 kstailey Exp $ */ +/* $OpenBSD: vme.c,v 1.5 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: vme.c,v 1.6 1996/11/20 18:57:02 gwr Exp $ */ /*- @@ -44,10 +44,10 @@ #include <machine/autoconf.h> /* #include <machine/vme.h> */ -static int vmes_match __P((struct device *, void *, void *)); -static int vmel_match __P((struct device *, void *, void *)); +static int vmes_match(struct device *, void *, void *); +static int vmel_match(struct device *, void *, void *); -static void vme_attach __P((struct device *, struct device *, void *)); +static void vme_attach(struct device *, struct device *, void *); struct cfattach vmes_ca = { sizeof(struct device), vmes_match, vme_attach diff --git a/sys/arch/sun3/dev/xd.c b/sys/arch/sun3/dev/xd.c index bb14ceb4b71..9f3d204a0ab 100644 --- a/sys/arch/sun3/dev/xd.c +++ b/sys/arch/sun3/dev/xd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xd.c,v 1.15 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: xd.c,v 1.16 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: xd.c,v 1.10 1996/10/13 03:47:39 christos Exp $ */ /* @@ -201,46 +201,46 @@ */ /* internals */ -int xdc_cmd __P((struct xdc_softc *, int, int, int, int, int, char *, int)); -char *xdc_e2str __P((int)); -int xdc_error __P((struct xdc_softc *, struct xd_iorq *, - struct xd_iopb *, int, int)); -int xdc_ioctlcmd __P((struct xd_softc *, dev_t dev, struct xd_iocmd *)); -void xdc_perror __P((struct xd_iorq *, struct xd_iopb *, int)); -int xdc_piodriver __P((struct xdc_softc *, int, int)); -int xdc_remove_iorq __P((struct xdc_softc *)); -int xdc_reset __P((struct xdc_softc *, int, int, int, struct xd_softc *)); -inline void xdc_rqinit __P((struct xd_iorq *, struct xdc_softc *, +int xdc_cmd(struct xdc_softc *, int, int, int, int, int, char *, int); +char *xdc_e2str(int); +int xdc_error(struct xdc_softc *, struct xd_iorq *, + struct xd_iopb *, int, int); +int xdc_ioctlcmd(struct xd_softc *, dev_t dev, struct xd_iocmd *); +void xdc_perror(struct xd_iorq *, struct xd_iopb *, int); +int xdc_piodriver(struct xdc_softc *, int, int); +int xdc_remove_iorq(struct xdc_softc *); +int xdc_reset(struct xdc_softc *, int, int, int, struct xd_softc *); +inline void xdc_rqinit(struct xd_iorq *, struct xdc_softc *, struct xd_softc *, int, u_long, int, - caddr_t, struct buf *)); -void xdc_rqtopb __P((struct xd_iorq *, struct xd_iopb *, int, int)); -void xdc_start __P((struct xdc_softc *, int)); -int xdc_startbuf __P((struct xdc_softc *, struct xd_softc *, struct buf *)); -int xdc_submit_iorq __P((struct xdc_softc *, int, int)); -void xdc_tick __P((void *)); -void xdc_xdreset __P((struct xdc_softc *, struct xd_softc *)); + caddr_t, struct buf *); +void xdc_rqtopb(struct xd_iorq *, struct xd_iopb *, int, int); +void xdc_start(struct xdc_softc *, int); +int xdc_startbuf(struct xdc_softc *, struct xd_softc *, struct buf *); +int xdc_submit_iorq(struct xdc_softc *, int, int); +void xdc_tick(void *); +void xdc_xdreset(struct xdc_softc *, struct xd_softc *); /* machine interrupt hook */ -int xdcintr __P((void *)); +int xdcintr(void *); /* {b,c}devsw */ -int xdclose __P((dev_t, int, int)); -int xddump __P((dev_t)); -int xdioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); -int xdopen __P((dev_t, int, int)); -int xdread __P((dev_t, struct uio *)); -int xdwrite __P((dev_t, struct uio *)); -int xdsize __P((dev_t)); -void xdstrategy __P((struct buf *)); +int xdclose(dev_t, int, int); +int xddump(dev_t); +int xdioctl(dev_t, u_long, caddr_t, int, struct proc *); +int xdopen(dev_t, int, int); +int xdread(dev_t, struct uio *); +int xdwrite(dev_t, struct uio *); +int xdsize(dev_t); +void xdstrategy(struct buf *); /* autoconf */ -int xdcmatch __P((struct device *, void *, void *)); -void xdcattach __P((struct device *, struct device *, void *)); -int xdmatch __P((struct device *, void *, void *)); -void xdattach __P((struct device *, struct device *, void *)); +int xdcmatch(struct device *, void *, void *); +void xdcattach(struct device *, struct device *, void *); +int xdmatch(struct device *, void *, void *); +void xdattach(struct device *, struct device *, void *); -static void xddummystrat __P((struct buf *)); -int xdgetdisklabel __P((struct xd_softc *, void *)); +static void xddummystrat(struct buf *); +int xdgetdisklabel(struct xd_softc *, void *); /* * cfdrivers: device driver interface to autoconfig diff --git a/sys/arch/sun3/dev/xy.c b/sys/arch/sun3/dev/xy.c index 50e73f1a45d..7a9afd87300 100644 --- a/sys/arch/sun3/dev/xy.c +++ b/sys/arch/sun3/dev/xy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xy.c,v 1.15 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: xy.c,v 1.16 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: xy.c,v 1.11 1996/10/13 03:47:40 christos Exp $ */ /* @@ -139,50 +139,50 @@ */ /* internals */ -struct xy_iopb *xyc_chain __P((struct xyc_softc *, struct xy_iorq *)); -int xyc_cmd __P((struct xyc_softc *, int, int, int, int, int, char *, int)); -char *xyc_e2str __P((int)); -int xyc_entoact __P((int)); -int xyc_error __P((struct xyc_softc *, struct xy_iorq *, - struct xy_iopb *, int)); -int xyc_ioctlcmd __P((struct xy_softc *, dev_t dev, struct xd_iocmd *)); -void xyc_perror __P((struct xy_iorq *, struct xy_iopb *, int)); -int xyc_piodriver __P((struct xyc_softc *, struct xy_iorq *)); -int xyc_remove_iorq __P((struct xyc_softc *)); -int xyc_reset __P((struct xyc_softc *, int, struct xy_iorq *, int, - struct xy_softc *)); -inline void xyc_rqinit __P((struct xy_iorq *, struct xyc_softc *, +struct xy_iopb *xyc_chain(struct xyc_softc *, struct xy_iorq *); +int xyc_cmd(struct xyc_softc *, int, int, int, int, int, char *, int); +char *xyc_e2str(int); +int xyc_entoact(int); +int xyc_error(struct xyc_softc *, struct xy_iorq *, + struct xy_iopb *, int); +int xyc_ioctlcmd(struct xy_softc *, dev_t dev, struct xd_iocmd *); +void xyc_perror(struct xy_iorq *, struct xy_iopb *, int); +int xyc_piodriver(struct xyc_softc *, struct xy_iorq *); +int xyc_remove_iorq(struct xyc_softc *); +int xyc_reset(struct xyc_softc *, int, struct xy_iorq *, int, + struct xy_softc *); +inline void xyc_rqinit(struct xy_iorq *, struct xyc_softc *, struct xy_softc *, int, u_long, int, - caddr_t, struct buf *)); -void xyc_rqtopb __P((struct xy_iorq *, struct xy_iopb *, int, int)); -void xyc_start __P((struct xyc_softc *, struct xy_iorq *)); -int xyc_startbuf __P((struct xyc_softc *, struct xy_softc *, struct buf *)); -int xyc_submit_iorq __P((struct xyc_softc *, struct xy_iorq *, int)); -void xyc_tick __P((void *)); -int xyc_unbusy __P((struct xyc *, int)); -void xyc_xyreset __P((struct xyc_softc *, struct xy_softc *)); + caddr_t, struct buf *); +void xyc_rqtopb(struct xy_iorq *, struct xy_iopb *, int, int); +void xyc_start(struct xyc_softc *, struct xy_iorq *); +int xyc_startbuf(struct xyc_softc *, struct xy_softc *, struct buf *); +int xyc_submit_iorq(struct xyc_softc *, struct xy_iorq *, int); +void xyc_tick(void *); +int xyc_unbusy(struct xyc *, int); +void xyc_xyreset(struct xyc_softc *, struct xy_softc *); /* machine interrupt hook */ -int xycintr __P((void *)); +int xycintr(void *); /* {b,c}devsw */ -int xyclose __P((dev_t, int, int)); -int xydump __P((dev_t)); -int xyioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); -int xyopen __P((dev_t, int, int)); -int xyread __P((dev_t, struct uio *)); -int xywrite __P((dev_t, struct uio *)); -int xysize __P((dev_t)); -void xystrategy __P((struct buf *)); +int xyclose(dev_t, int, int); +int xydump(dev_t); +int xyioctl(dev_t, u_long, caddr_t, int, struct proc *); +int xyopen(dev_t, int, int); +int xyread(dev_t, struct uio *); +int xywrite(dev_t, struct uio *); +int xysize(dev_t); +void xystrategy(struct buf *); /* autoconf */ -int xycmatch __P((struct device *, void *, void *)); -void xycattach __P((struct device *, struct device *, void *)); -int xymatch __P((struct device *, void *, void *)); -void xyattach __P((struct device *, struct device *, void *)); +int xycmatch(struct device *, void *, void *); +void xycattach(struct device *, struct device *, void *); +int xymatch(struct device *, void *, void *); +void xyattach(struct device *, struct device *, void *); -static void xydummystrat __P((struct buf *)); -int xygetdisklabel __P((struct xy_softc *, void *)); +static void xydummystrat(struct buf *); +int xygetdisklabel(struct xy_softc *, void *); /* * cfdrivers: device driver interface to autoconfig diff --git a/sys/arch/sun3/dev/zs.c b/sys/arch/sun3/dev/zs.c index 28cf5bd432d..269a0f38298 100644 --- a/sys/arch/sun3/dev/zs.c +++ b/sys/arch/sun3/dev/zs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zs.c,v 1.10 2001/05/13 00:22:21 miod Exp $ */ +/* $OpenBSD: zs.c,v 1.11 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: zs.c,v 1.42 1996/11/20 18:57:03 gwr Exp $ */ /*- @@ -124,14 +124,14 @@ static int zs_defspeed[NZS][2] = { }; -static struct zschan *zs_get_chan_addr __P((int, int)); -int zs_getc __P((volatile void *)); -static void zs_putc __P((volatile void *, int)); +static struct zschan *zs_get_chan_addr(int, int); +int zs_getc(volatile void *); +static void zs_putc(volatile void *, int); -int zscngetc __P((dev_t)); -void zscnputc __P((dev_t, int)); -void nullcnprobe __P((struct consdev *)); -void zscninit __P((struct consdev *)); +int zscngetc(dev_t); +void zscnputc(dev_t, int); +void nullcnprobe(struct consdev *); +void zscninit(struct consdev *); /* Find PROM mappings (for console support). */ void zs_init() @@ -191,9 +191,9 @@ static u_char zs_init_reg[16] = { ****************************************************************/ /* Definition of the driver for autoconfig. */ -static int zsc_match __P((struct device *, void *, void *)); -static void zsc_attach __P((struct device *, struct device *, void *)); -static int zsc_print __P((void *, const char *name)); +static int zsc_match(struct device *, void *, void *); +static void zsc_attach(struct device *, struct device *, void *); +static int zsc_print(void *, const char *name); struct cfattach zsc_ca = { sizeof(struct zsc_softc), zsc_match, zsc_attach diff --git a/sys/arch/sun3/dev/zs_cons.h b/sys/arch/sun3/dev/zs_cons.h index e8afb5faca7..1cedb7ae4af 100644 --- a/sys/arch/sun3/dev/zs_cons.h +++ b/sys/arch/sun3/dev/zs_cons.h @@ -1,9 +1,9 @@ -/* $OpenBSD: zs_cons.h,v 1.1 1997/01/16 04:04:01 kstailey Exp $ */ +/* $OpenBSD: zs_cons.h,v 1.2 2002/03/14 01:26:46 millert Exp $ */ extern void *zs_conschan; -extern void nullcnprobe __P((struct consdev *)); +extern void nullcnprobe(struct consdev *); -extern int zs_getc __P((void *arg)); -extern void zs_putc __P((void *arg, int c)); +extern int zs_getc(void *arg); +extern void zs_putc(void *arg, int c); diff --git a/sys/arch/sun3/dev/zs_kgdb.c b/sys/arch/sun3/dev/zs_kgdb.c index 0700f3d2441..8fb478bce04 100644 --- a/sys/arch/sun3/dev/zs_kgdb.c +++ b/sys/arch/sun3/dev/zs_kgdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zs_kgdb.c,v 1.5 1997/01/16 04:04:01 kstailey Exp $ */ +/* $OpenBSD: zs_kgdb.c,v 1.6 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: zs_kgdb.c,v 1.9 1996/11/20 18:57:04 gwr Exp $ */ /*- @@ -79,10 +79,10 @@ struct zschan { extern int kgdb_dev; extern int kgdb_rate; -struct zschan * zs_get_chan_addr __P((int zsc_unit, int channel)); +struct zschan * zs_get_chan_addr(int zsc_unit, int channel); -extern int zs_getc __P((void *arg)); -extern void zs_putc __P((void *arg, int c)); +extern int zs_getc(void *arg); +extern void zs_putc(void *arg, int c); struct zsops zsops_kgdb; diff --git a/sys/arch/sun3/include/autoconf.h b/sys/arch/sun3/include/autoconf.h index bb03f2fc41f..62b095b3664 100644 --- a/sys/arch/sun3/include/autoconf.h +++ b/sys/arch/sun3/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.7 1997/01/16 04:04:04 kstailey Exp $ */ +/* $OpenBSD: autoconf.h,v 1.8 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: autoconf.h,v 1.12 1996/11/20 18:57:05 gwr Exp $ */ /*- @@ -62,19 +62,19 @@ struct confargs { #define cf_intpri cf_loc[1] #define cf_intvec cf_loc[2] -int bus_scan __P((struct device *, void *, void *)); -int bus_print __P((void *, const char *)); -int bus_peek __P((int, int, int)); -char * bus_mapin __P((int, int, int)); +int bus_scan(struct device *, void *, void *); +int bus_print(void *, const char *); +int bus_peek(int, int, int); +char * bus_mapin(int, int, int); -typedef int (*isr_func_t) __P((void *)); -void isr_add_custom __P((int, void *)); -void isr_add_autovect __P((isr_func_t, void *arg, int level)); -void isr_add_vectored __P((isr_func_t, void *arg, int pri, int vec)); +typedef int (*isr_func_t)(void *); +void isr_add_custom(int, void *); +void isr_add_autovect(isr_func_t, void *arg, int level); +void isr_add_vectored(isr_func_t, void *arg, int pri, int vec); -void isr_soft_request __P((int level)); -void isr_soft_clear __P((int level)); +void isr_soft_request(int level); +void isr_soft_clear(int level); /* Bus-error tolerant access to mapped address. */ -int peek_byte __P((caddr_t)); -int peek_word __P((caddr_t)); +int peek_byte(caddr_t); +int peek_word(caddr_t); diff --git a/sys/arch/sun3/include/control.h b/sys/arch/sun3/include/control.h index ddde823e01c..c7c5854f5bf 100644 --- a/sys/arch/sun3/include/control.h +++ b/sys/arch/sun3/include/control.h @@ -1,4 +1,4 @@ -/* $OpenBSD: control.h,v 1.5 1997/09/21 04:21:06 niklas Exp $ */ +/* $OpenBSD: control.h,v 1.6 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: control.h,v 1.14 1996/11/20 18:57:06 gwr Exp $ */ /*- @@ -85,18 +85,18 @@ #include <sys/types.h> -unsigned char get_control_byte __P((char *)); -unsigned int get_control_word __P((char *)); -void set_control_byte __P((char *, unsigned char)); -void set_control_word __P((char *, unsigned int)); +unsigned char get_control_byte(char *); +unsigned int get_control_word(char *); +void set_control_byte(char *, unsigned char); +void set_control_word(char *, unsigned int); -int get_context __P((void)); -void set_context __P((int)); +int get_context(void); +void set_context(int); -vm_offset_t get_pte __P((vm_offset_t va)); -void set_pte __P((vm_offset_t, vm_offset_t)); +vm_offset_t get_pte(vm_offset_t va); +void set_pte(vm_offset_t, vm_offset_t); -unsigned char get_segmap __P((vm_offset_t)); -void set_segmap __P((vm_offset_t va, unsigned char)); -void set_segmap_allctx __P((vm_offset_t va, unsigned char)); +unsigned char get_segmap(vm_offset_t); +void set_segmap(vm_offset_t va, unsigned char); +void set_segmap_allctx(vm_offset_t va, unsigned char); diff --git a/sys/arch/sun3/include/cpu.h b/sys/arch/sun3/include/cpu.h index 0c7d910b1e4..c4b85a7a936 100644 --- a/sys/arch/sun3/include/cpu.h +++ b/sys/arch/sun3/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.14 2001/11/06 18:41:10 art Exp $ */ +/* $OpenBSD: cpu.h,v 1.15 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: cpu.h,v 1.20 1995/12/21 05:02:10 mycroft Exp $ */ /* @@ -117,7 +117,7 @@ extern int want_resched; /* resched() was called */ * isr_soft_request() so this scheme just multiplexes four * software interrupt `sources' on the level one handler. */ -extern void isr_soft_request __P((int level)); +extern void isr_soft_request(int level); union sun3sir { int sir_any; char sir_which[4]; @@ -147,15 +147,15 @@ union sun3sir { extern unsigned char cpu_machine_id; /* dma.c */ -long dvma_kvtopa __P((long, int)); +long dvma_kvtopa(long, int); /* machdep.c */ -void dumpconf __P((void)); +void dumpconf(void); struct pcb; -void savectx __P((struct pcb *)); -void switch_exit __P((struct proc *)); -void proc_trampoline __P((void)); +void savectx(struct pcb *); +void switch_exit(struct proc *); +void proc_trampoline(void); #endif /* _KERNEL */ diff --git a/sys/arch/sun3/include/cpufunc.h b/sys/arch/sun3/include/cpufunc.h index 20c32f11420..cc5688fa516 100644 --- a/sys/arch/sun3/include/cpufunc.h +++ b/sys/arch/sun3/include/cpufunc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpufunc.h,v 1.3 1997/09/21 04:21:07 niklas Exp $ */ +/* $OpenBSD: cpufunc.h,v 1.4 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: cpufunc.h,v 1.6 1996/11/20 18:57:07 gwr Exp $ */ /*- @@ -41,5 +41,5 @@ * Functions to provide access to special 68k instructions. */ -unsigned int *getvbr __P((void)); -void setvbr __P((unsigned int *)); +unsigned int *getvbr(void); +void setvbr(unsigned int *); diff --git a/sys/arch/sun3/include/db_machdep.h b/sys/arch/sun3/include/db_machdep.h index fcf395331a2..32e16665fc5 100644 --- a/sys/arch/sun3/include/db_machdep.h +++ b/sys/arch/sun3/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.4 1997/01/16 04:04:06 kstailey Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.5 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: db_machdep.h,v 1.7 1995/02/07 04:34:45 gwr Exp $ */ #include <m68k/db_machdep.h> @@ -6,9 +6,9 @@ /* This enables some code in db_command.c */ #define DB_MACHINE_COMMANDS -void db_machine_init __P((void)); -void ddb_init __P((void)); +void db_machine_init(void); +void ddb_init(void); /* These are in db_memrw.c */ -extern void db_read_bytes __P((vm_offset_t addr, size_t size, char *data)); -extern void db_write_bytes __P((vm_offset_t addr, size_t size, char *data)); +extern void db_read_bytes(vm_offset_t addr, size_t size, char *data); +extern void db_write_bytes(vm_offset_t addr, size_t size, char *data); diff --git a/sys/arch/sun3/include/dvma.h b/sys/arch/sun3/include/dvma.h index 9ebbdbe3bc8..2944477d965 100644 --- a/sys/arch/sun3/include/dvma.h +++ b/sys/arch/sun3/include/dvma.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dvma.h,v 1.6 1997/01/16 04:04:06 kstailey Exp $ */ +/* $OpenBSD: dvma.h,v 1.7 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: dvma.h,v 1.4 1996/11/20 18:57:08 gwr Exp $ */ /*- @@ -76,7 +76,7 @@ #define DVMA_SPACE_START 0x0FF00000 #define DVMA_SPACE_END 0x0FFFE000 -void dvma_init __P((void)); +void dvma_init(void); /* Allocate/free actual pages of DVMA space. */ caddr_t dvma_malloc(size_t bytes); diff --git a/sys/arch/sun3/include/eeprom.h b/sys/arch/sun3/include/eeprom.h index 6f6dbba9db7..8f1fcee2862 100644 --- a/sys/arch/sun3/include/eeprom.h +++ b/sys/arch/sun3/include/eeprom.h @@ -1,4 +1,4 @@ -/* $OpenBSD: eeprom.h,v 1.2 1996/10/12 08:27:14 deraadt Exp $ */ +/* $OpenBSD: eeprom.h,v 1.3 2002/03/14 01:26:46 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -360,5 +360,5 @@ struct eeprom { #ifdef _KERNEL extern char *eeprom_va; -int eeprom_uio __P((struct uio *)); +int eeprom_uio(struct uio *); #endif /* _KERNEL */ diff --git a/sys/arch/sun3/include/idprom.h b/sys/arch/sun3/include/idprom.h index 50cd844a2d5..d09a62262dd 100644 --- a/sys/arch/sun3/include/idprom.h +++ b/sys/arch/sun3/include/idprom.h @@ -1,4 +1,4 @@ -/* $OpenBSD: idprom.h,v 1.5 1997/01/16 04:04:07 kstailey Exp $ */ +/* $OpenBSD: idprom.h,v 1.6 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: idprom.h,v 1.12 1996/11/20 18:57:10 gwr Exp $ */ /*- @@ -58,7 +58,7 @@ struct idprom { extern struct idprom identity_prom; -int idprom_init __P((void)); -void idprom_etheraddr __P((u_char *)); +int idprom_init(void); +void idprom_etheraddr(u_char *); #endif diff --git a/sys/arch/sun3/include/machdep.h b/sys/arch/sun3/include/machdep.h index 51f20b4e3c4..da3f744ed42 100644 --- a/sys/arch/sun3/include/machdep.h +++ b/sys/arch/sun3/include/machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.h,v 1.16 2001/11/06 18:41:10 art Exp $ */ +/* $OpenBSD: machdep.h,v 1.17 2002/03/14 01:26:46 millert Exp $ */ /* * Copyright (c) 1994 Gordon W. Ross @@ -73,67 +73,67 @@ extern vm_offset_t avail_start, avail_end; /* The "hole" (used to skip the Sun3/50 video RAM) */ extern vm_offset_t hole_start, hole_size; -void ICIA __P((void)); -void DCIA __P((void)); -void DCIU __P((void)); +void ICIA(void); +void DCIA(void); +void DCIU(void); -void cache_enable __P((void)); +void cache_enable(void); void cache_flush_page(vm_offset_t pgva); void cache_flush_segment(vm_offset_t sgva); void cache_flush_context(void); -int cachectl __P((int req, caddr_t addr, int len)); +int cachectl(int req, caddr_t addr, int len); -void cninit __P((void)); +void cninit(void); -void dumpconf __P((void)); -void dumpsys __P((void)); +void dumpconf(void); +void dumpsys(void); -void fb_unblank __P((void)); +void fb_unblank(void); -int fpu_emulate __P((struct frame *, struct fpframe *)); +int fpu_emulate(struct frame *, struct fpframe *); /* Backward compatibility... */ #define getsr _getsr -void** getvbr __P((void)); +void** getvbr(void); -vm_offset_t high_segment_alloc __P((int npages)); +vm_offset_t high_segment_alloc(int npages); -void initfpu __P((void)); +void initfpu(void); -void intreg_init __P((void)); +void intreg_init(void); -void isr_init __P((void)); -void isr_config __P((void)); +void isr_init(void); +void isr_config(void); -void m68881_save __P((struct fpframe *)); -void m68881_restore __P((struct fpframe *)); +void m68881_save(struct fpframe *); +void m68881_restore(struct fpframe *); -void proc_do_uret __P((void)); -void proc_trampoline __P((void)); +void proc_do_uret(void); +void proc_trampoline(void); -void pmap_bootstrap __P((void)); -vm_offset_t pmap_map __P((vm_offset_t, vm_offset_t, vm_offset_t, int)); -int pmap_fault_reload __P((struct pmap *, vm_offset_t, int)); -void pmap_get_ksegmap __P((u_char *)); -void pmap_get_pagemap __P((int *pt, int off)); +void pmap_bootstrap(void); +vm_offset_t pmap_map(vm_offset_t, vm_offset_t, vm_offset_t, int); +int pmap_fault_reload(struct pmap *, vm_offset_t, int); +void pmap_get_ksegmap(u_char *); +void pmap_get_pagemap(int *pt, int off); -int reboot2 __P((int, char *)); +int reboot2(int, char *); -void savectx __P((struct pcb *)); +void savectx(struct pcb *); -void setvbr __P((void **)); +void setvbr(void **); -void sun3_mon_abort __P((void)); -void sun3_mon_halt __P((void)); -void sun3_mon_reboot __P((char *)); -void sun3_pmeg_init __P((void)); -void sun3_reserve_pmeg __P((int pmeg_num)); +void sun3_mon_abort(void); +void sun3_mon_halt(void); +void sun3_mon_reboot(char *); +void sun3_pmeg_init(void); +void sun3_reserve_pmeg(int pmeg_num); -void swapconf __P((void)); -void swapgeneric __P((void)); +void swapconf(void); +void swapgeneric(void); -void switch_exit __P((struct proc *)); +void switch_exit(struct proc *); #endif /* _KERNEL */ diff --git a/sys/arch/sun3/include/mon.h b/sys/arch/sun3/include/mon.h index d142f001e57..bb1dcc2f69f 100644 --- a/sys/arch/sun3/include/mon.h +++ b/sys/arch/sun3/include/mon.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mon.h,v 1.5 1997/01/16 04:04:08 kstailey Exp $ */ +/* $OpenBSD: mon.h,v 1.6 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: mon.h,v 1.19 1996/11/20 18:57:12 gwr Exp $ */ /*- @@ -106,7 +106,7 @@ typedef struct bootparam { typedef struct { char *initSp; /* Initial system stack ptr * for hardware */ - int (*startMon)__P((void)); /* Initial PC for hardware */ + int (*startMon)(void); /* Initial PC for hardware */ int *diagberr; /* Bus err handler for diags */ @@ -121,10 +121,10 @@ typedef struct { * Single-character input and output */ - u_char (*getChar)__P((void)); /* Get char from input source */ - int (*putChar)__P((int)); /* Put char to output sink */ - int (*mayGet)__P((void)); /* Maybe get char, or -1 */ - int (*mayPut)__P((int)); /* Maybe put char, or -1 */ + u_char (*getChar)(void); /* Get char from input source */ + int (*putChar)(int); /* Put char to output sink */ + int (*mayGet)(void); /* Maybe get char, or -1 */ + int (*mayPut)(int); /* Maybe put char, or -1 */ u_char *echo; /* Should getchar echo? */ u_char *inSource; /* Input source selector */ u_char *outSink; /* Output sink selector */ @@ -133,8 +133,8 @@ typedef struct { * Keyboard input (scanned by monitor nmi routine) */ - int (*getKey)__P((void)); /* Get next key if one exists */ - int (*initGetKey)__P((void*)); /* Initialize get key */ + int (*getKey)(void); /* Get next key if one exists */ + int (*initGetKey)(void*); /* Initialize get key */ u_int *translation; /* Kbd translation selector (see keyboard.h in sun monitor code) */ @@ -153,18 +153,18 @@ typedef struct { * Frame buffer output and terminal emulation */ - int (*fbWriteChar)__P((int)); /* Write a character to FB */ + int (*fbWriteChar)(int); /* Write a character to FB */ int *fbAddr; /* Address of frame buffer */ char **font; /* Font table for FB */ /* Quickly write string to FB */ - int (*fbWriteStr)__P((char *buf, int len)); + int (*fbWriteStr)(char *buf, int len); /* * Reboot interface routine -- resets and reboots system. No return. * XXX should this be declared volatile? */ - int (*reBoot)__P((char *)); /* e.g. reBoot("sd()bsd") */ + int (*reBoot)(char *); /* e.g. reBoot("sd()bsd") */ /* * Line input and parsing @@ -173,32 +173,32 @@ typedef struct { u_char *lineBuf; /* The line input buffer */ u_char **linePtr; /* Cur pointer into linebuf */ int *lineSize; /* length of line in linebuf */ - int (*getLine)__P((int)); /* Get line from user */ - u_char (*getNextChar)__P((void)); /* Get next char from linebuf */ - u_char (*peekNextChar)__P((void)); /* Peek at next char */ + int (*getLine)(int); /* Get line from user */ + u_char (*getNextChar)(void); /* Get next char from linebuf */ + u_char (*peekNextChar)(void); /* Peek at next char */ int *fbThere; /* =1 if frame buffer there */ - int (*getNum)__P((void)); /* Grab hex num from line */ + int (*getNum)(void); /* Grab hex num from line */ /* * Print formatted output to current output sink */ - int (*printf)__P((char *, ...)); /* Similar to "Kernel printf" */ - int (*printHex)__P((int,int)); /* Format N digits in hex */ + int (*printf)(char *, ...); /* Similar to "Kernel printf" */ + int (*printHex)(int,int); /* Format N digits in hex */ /* * Led stuff */ u_char *leds; /* RAM copy of LED register */ - int (*setLeds)__P((int)); /* Sets LED's and RAM copy */ + int (*setLeds)(int); /* Sets LED's and RAM copy */ /* * Non-maskable interrupt (nmi) information */ - int (*nmiAddr)__P((void*)); /* Addr for level 7 vector */ - int (*abortEntry)__P((void*)); /* Entry for keyboard abort */ + int (*nmiAddr)(void*); /* Addr for level 7 vector */ + int (*abortEntry)(void*); /* Entry for keyboard abort */ int *nmiClock; /* Counts up in msec */ /* @@ -221,10 +221,10 @@ typedef struct { long *resetAddr; /* where to jump on a reset */ long *resetMap; /* pgmap entry for resetaddr */ /* Really struct pgmapent * */ - int (*exitToMon)__P((void)); /* Exit from user program */ + int (*exitToMon)(void); /* Exit from user program */ u_char **memorybitmap; /* V1: &{0 or &bits} */ - void (*setcxsegmap)__P((int,int,int)); /* Set seg in any context */ - void (**vector_cmd)__P((int, char*)); /* V2: Handler for 'v' cmd */ + void (*setcxsegmap)(int,int,int); /* Set seg in any context */ + void (**vector_cmd)(int, char*); /* V2: Handler for 'v' cmd */ int dummy1z; int dummy2z; int dummy3z; diff --git a/sys/arch/sun3/include/obio.h b/sys/arch/sun3/include/obio.h index f8d8c3b9a39..01a7be77faa 100644 --- a/sys/arch/sun3/include/obio.h +++ b/sys/arch/sun3/include/obio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: obio.h,v 1.7 2000/08/28 22:04:22 miod Exp $ */ +/* $OpenBSD: obio.h,v 1.8 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: obio.h,v 1.16 1996/11/20 18:57:14 gwr Exp $ */ /*- @@ -77,15 +77,15 @@ #ifdef _KERNEL -caddr_t obio_alloc __P((int, int)); -caddr_t obio_vm_alloc __P((int)); -caddr_t obio_find_mapping __P((int pa, int size)); +caddr_t obio_alloc(int, int); +caddr_t obio_vm_alloc(int); +caddr_t obio_find_mapping(int pa, int size); /* routines called during earily startup */ -void obio_init __P((void)); -void zs_init __P((void)); -void eeprom_init __P((void)); -void intreg_init __P((void)); -void clock_init __P((void)); +void obio_init(void); +void zs_init(void); +void eeprom_init(void); +void intreg_init(void); +void clock_init(void); #endif /* _KERNEL */ diff --git a/sys/arch/sun3/include/param.h b/sys/arch/sun3/include/param.h index 85c0f2231c0..714ad6151e3 100644 --- a/sys/arch/sun3/include/param.h +++ b/sys/arch/sun3/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.29 2001/12/05 01:57:15 provos Exp $ */ +/* $OpenBSD: param.h,v 1.30 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: param.h,v 1.34 1996/03/04 05:04:40 cgd Exp $ */ /* @@ -93,7 +93,7 @@ #if defined(_KERNEL) && !defined(_LOCORE) #include <machine/cpu.h> -extern void _delay __P((unsigned)); +extern void _delay(unsigned); #define delay(us) _delay((us)<<8) #define DELAY(n) delay(n) #endif /* _KERNEL && !_LOCORE */ diff --git a/sys/arch/sun3/include/pmap.h b/sys/arch/sun3/include/pmap.h index 21670f5f7e5..14a04f3e825 100644 --- a/sys/arch/sun3/include/pmap.h +++ b/sys/arch/sun3/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.12 2001/12/05 00:11:51 millert Exp $ */ +/* $OpenBSD: pmap.h,v 1.13 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: pmap.h,v 1.18 1997/01/27 19:41:06 gwr Exp $ */ /*- @@ -60,7 +60,7 @@ extern struct pmap kernel_pmap_store; #define pmap_kernel() (&kernel_pmap_store) /* This is called from locore.s:cpu_switch() */ -void pmap_switch __P((pmap_t pmap)); +void pmap_switch(pmap_t pmap); /* This lets us have some say in choosing VA locations. */ extern void pmap_prefer(vm_offset_t, vm_offset_t *); diff --git a/sys/arch/sun3/include/psl.h b/sys/arch/sun3/include/psl.h index 605c941115c..d6a5029747f 100644 --- a/sys/arch/sun3/include/psl.h +++ b/sys/arch/sun3/include/psl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psl.h,v 1.11 2001/11/23 00:47:47 miod Exp $ */ +/* $OpenBSD: psl.h,v 1.12 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: psl.h,v 1.14 1998/11/24 17:07:54 kleink Exp $ */ /*- @@ -48,9 +48,9 @@ #ifndef __GNUC__ /* No inline, use the real functions in locore.s */ -extern int _getsr __P((void)); -extern int _spl __P((int new)); -extern int _splraise __P((int new)); +extern int _getsr(void); +extern int _spl(int new); +extern int _splraise(int new); #else /* GNUC */ /* * Define inline functions for PSL manipulation. @@ -61,9 +61,9 @@ extern int _splraise __P((int new)); * (See the GCC extensions info document.) */ -static __inline int _getsr __P((void)); -static __inline int _spl __P((int)); -static __inline int _splraise __P((int)); +static __inline int _getsr(void); +static __inline int _spl(int); +static __inline int _splraise(int); /* Get current sr value. */ static __inline int diff --git a/sys/arch/sun3/include/z8530var.h b/sys/arch/sun3/include/z8530var.h index 5f28e10b1e1..9b60b3c8eb7 100644 --- a/sys/arch/sun3/include/z8530var.h +++ b/sys/arch/sun3/include/z8530var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530var.h,v 1.8 2001/08/18 22:37:40 art Exp $ */ +/* $OpenBSD: z8530var.h,v 1.9 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: z8530var.h,v 1.5 1996/10/13 03:47:44 christos Exp $ */ /* @@ -60,23 +60,23 @@ struct zsc_softc { * These could be inlines, but with the delay, speed is moot. */ -u_char zs_read_reg __P((struct zs_chanstate *cs, u_char reg)); -u_char zs_read_csr __P((struct zs_chanstate *cs)); -u_char zs_read_data __P((struct zs_chanstate *cs)); +u_char zs_read_reg(struct zs_chanstate *cs, u_char reg); +u_char zs_read_csr(struct zs_chanstate *cs); +u_char zs_read_data(struct zs_chanstate *cs); -void zs_write_reg __P((struct zs_chanstate *cs, u_char reg, u_char val)); -void zs_write_csr __P((struct zs_chanstate *cs, u_char val)); -void zs_write_data __P((struct zs_chanstate *cs, u_char val)); +void zs_write_reg(struct zs_chanstate *cs, u_char reg, u_char val); +void zs_write_csr(struct zs_chanstate *cs, u_char val); +void zs_write_data(struct zs_chanstate *cs, u_char val); /* * How to request a "soft" interrupt. * This could be a macro if you like. */ -void zsc_req_softint __P((struct zsc_softc *zsc)); +void zsc_req_softint(struct zsc_softc *zsc); /* Handle user request to enter kernel debugger. */ -void zs_abort __P((void)); +void zs_abort(void); /* * Some warts needed by z8530tty.c - diff --git a/sys/arch/sun3/stand/installboot/installboot.c b/sys/arch/sun3/stand/installboot/installboot.c index cd3bca8bd5d..8f3621e75aa 100644 --- a/sys/arch/sun3/stand/installboot/installboot.c +++ b/sys/arch/sun3/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.6 2001/07/04 08:33:46 niklas Exp $ */ +/* $OpenBSD: installboot.c,v 1.7 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -65,11 +65,11 @@ daddr_t *block_table; /* block number array in prototype image */ int maxblocknum; /* size of this array */ -char *loadprotoblocks __P((char *, long *)); -int loadblocknums __P((char *, int)); -static void devread __P((int, void *, daddr_t, size_t, char *)); -static void usage __P((void)); -int main __P((int, char *[])); +char *loadprotoblocks(char *, long *); +int loadblocknums(char *, int); +static void devread(int, void *, daddr_t, size_t, char *); +static void usage(void); +int main(int, char *[]); static void diff --git a/sys/arch/sun3/stand/libsa/dev_disk.h b/sys/arch/sun3/stand/libsa/dev_disk.h index f1897aaf848..c03c96842fd 100644 --- a/sys/arch/sun3/stand/libsa/dev_disk.h +++ b/sys/arch/sun3/stand/libsa/dev_disk.h @@ -1,8 +1,8 @@ -/* $OpenBSD: dev_disk.h,v 1.2 2001/07/04 08:33:48 niklas Exp $ */ +/* $OpenBSD: dev_disk.h,v 1.3 2002/03/14 01:26:47 millert Exp $ */ -int disk_open __P((struct open_file *, ...)); -int disk_close __P((struct open_file *)); -int disk_strategy __P((void *, int, daddr_t, size_t, void *, size_t *)); +int disk_open(struct open_file *, ...); +int disk_close(struct open_file *); +int disk_strategy(void *, int, daddr_t, size_t, void *, size_t *); int disk_ioctl(); diff --git a/sys/arch/sun3/stand/libsa/dvma.c b/sys/arch/sun3/stand/libsa/dvma.c index 221cf6324e6..f92b3b17c17 100644 --- a/sys/arch/sun3/stand/libsa/dvma.c +++ b/sys/arch/sun3/stand/libsa/dvma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dvma.c,v 1.4 2001/07/04 08:33:48 niklas Exp $ */ +/* $OpenBSD: dvma.c,v 1.5 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: dvma.c,v 1.6 1996/01/31 17:20:39 gwr Exp $ */ /* @@ -45,8 +45,8 @@ #include "stand.h" /* XXX */ -extern int get_segmap __P((int)); -extern void set_segmap __P((int, int)); +extern int get_segmap(int); +extern void set_segmap(int, int); #define DVMA_BASE 0xFFf00000 diff --git a/sys/arch/sun3/stand/libsa/netif.h b/sys/arch/sun3/stand/libsa/netif.h index 381375b3a4e..ca8f791c6f6 100644 --- a/sys/arch/sun3/stand/libsa/netif.h +++ b/sys/arch/sun3/stand/libsa/netif.h @@ -1,4 +1,4 @@ -/* $OpenBSD: netif.h,v 1.3 2001/07/04 08:33:50 niklas Exp $ */ +/* $OpenBSD: netif.h,v 1.4 2002/03/14 01:26:47 millert Exp $ */ #include "iodesc.h" @@ -7,11 +7,11 @@ struct netif { void *nif_devdata; }; -ssize_t netif_get __P((struct iodesc *, void *, size_t, time_t)); -ssize_t netif_put __P((struct iodesc *, void *, size_t)); +ssize_t netif_get(struct iodesc *, void *, size_t, time_t); +ssize_t netif_put(struct iodesc *, void *, size_t); -int netif_open __P((void *)); -int netif_close __P((int)); +int netif_open(void *); +int netif_close(int); -struct iodesc *socktodesc __P((int)); +struct iodesc *socktodesc(int); diff --git a/sys/arch/sun3/stand/libsa/netif_sun.c b/sys/arch/sun3/stand/libsa/netif_sun.c index 2a4116c2b57..7b447035acf 100644 --- a/sys/arch/sun3/stand/libsa/netif_sun.c +++ b/sys/arch/sun3/stand/libsa/netif_sun.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netif_sun.c,v 1.5 2001/07/04 08:33:51 niklas Exp $ */ +/* $OpenBSD: netif_sun.c,v 1.6 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: netif_sun.c,v 1.4 1996/01/29 23:41:07 gwr Exp $ */ /* @@ -66,7 +66,7 @@ int debug; int errno; -static void sun3_getether __P((u_char *)); +static void sun3_getether(u_char *); struct iodesc sockets[SOPEN_MAX]; diff --git a/sys/arch/sun3/stand/libsa/promdev.c b/sys/arch/sun3/stand/libsa/promdev.c index 620c8a4d1b8..e585af44173 100644 --- a/sys/arch/sun3/stand/libsa/promdev.c +++ b/sys/arch/sun3/stand/libsa/promdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: promdev.c,v 1.6 2001/07/04 08:33:52 niklas Exp $ */ +/* $OpenBSD: promdev.c,v 1.7 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: promdev.c,v 1.7 1996/01/29 23:41:10 gwr Exp $ */ /* @@ -40,7 +40,7 @@ #include "stand.h" #include "dvma.h" -extern void set_pte __P((int, int)); +extern void set_pte(int, int); extern int debug; static int promdev_inuse; diff --git a/sys/arch/sun3/stand/netboot/dev_net.h b/sys/arch/sun3/stand/netboot/dev_net.h index 9a8986fe528..4fb7675949d 100644 --- a/sys/arch/sun3/stand/netboot/dev_net.h +++ b/sys/arch/sun3/stand/netboot/dev_net.h @@ -1,8 +1,8 @@ -/* $OpenBSD: dev_net.h,v 1.2 2001/07/04 08:33:54 niklas Exp $ */ +/* $OpenBSD: dev_net.h,v 1.3 2002/03/14 01:26:47 millert Exp $ */ -int net_open __P((struct open_file *, ...)); -int net_close __P((struct open_file *)); +int net_open(struct open_file *, ...); +int net_close(struct open_file *); int net_ioctl(); int net_strategy(); diff --git a/sys/arch/sun3/stand/tapeboot/dev_tape.h b/sys/arch/sun3/stand/tapeboot/dev_tape.h index 7e530554dea..d88fbe96ede 100644 --- a/sys/arch/sun3/stand/tapeboot/dev_tape.h +++ b/sys/arch/sun3/stand/tapeboot/dev_tape.h @@ -1,8 +1,8 @@ -/* $OpenBSD: dev_tape.h,v 1.3 2001/07/04 08:33:57 niklas Exp $ */ +/* $OpenBSD: dev_tape.h,v 1.4 2002/03/14 01:26:47 millert Exp $ */ -int tape_open __P((struct open_file *, ...)); -int tape_close __P((struct open_file *)); -int tape_strategy __P((void *, int, daddr_t, size_t, void *, size_t *)); +int tape_open(struct open_file *, ...); +int tape_close(struct open_file *); +int tape_strategy(void *, int, daddr_t, size_t, void *, size_t *); int tape_ioctl(); diff --git a/sys/arch/sun3/stand/tapeboot/rawfs.c b/sys/arch/sun3/stand/tapeboot/rawfs.c index a7490fe8357..c2ada1c9653 100644 --- a/sys/arch/sun3/stand/tapeboot/rawfs.c +++ b/sys/arch/sun3/stand/tapeboot/rawfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rawfs.c,v 1.2 2001/07/04 08:33:57 niklas Exp $ */ +/* $OpenBSD: rawfs.c,v 1.3 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: rawfs.c,v 1.1 1995/10/17 22:58:27 gwr Exp $ */ /* @@ -59,7 +59,7 @@ struct file { }; static int -rawfs_get_block __P((struct open_file *)); +rawfs_get_block(struct open_file *); int rawfs_open(path, f) char *path; diff --git a/sys/arch/sun3/stand/tapeboot/rawfs.h b/sys/arch/sun3/stand/tapeboot/rawfs.h index 1b1538ae4f1..2dc10b99a8e 100644 --- a/sys/arch/sun3/stand/tapeboot/rawfs.h +++ b/sys/arch/sun3/stand/tapeboot/rawfs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rawfs.h,v 1.2 2001/07/04 08:33:57 niklas Exp $ */ +/* $OpenBSD: rawfs.h,v 1.3 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: rawfs.h,v 1.1 1995/10/17 22:58:29 gwr Exp $ */ /* @@ -6,11 +6,11 @@ * No random access, only sequential read allowed. */ -int rawfs_open __P((char *path, struct open_file *f)); -int rawfs_close __P((struct open_file *f)); -int rawfs_read __P((struct open_file *f, void *buf, - u_int size, u_int *resid)); -int rawfs_write __P((struct open_file *f, void *buf, - u_int size, u_int *resid)); -off_t rawfs_seek __P((struct open_file *f, off_t offset, int where)); -int rawfs_stat __P((struct open_file *f, struct stat *sb)); +int rawfs_open(char *path, struct open_file *f); +int rawfs_close(struct open_file *f); +int rawfs_read(struct open_file *f, void *buf, + u_int size, u_int *resid); +int rawfs_write(struct open_file *f, void *buf, + u_int size, u_int *resid); +off_t rawfs_seek(struct open_file *f, off_t offset, int where); +int rawfs_stat(struct open_file *f, struct stat *sb); diff --git a/sys/arch/sun3/sun3/autoconf.c b/sys/arch/sun3/sun3/autoconf.c index 0b1184ef1e3..98316a8e94d 100644 --- a/sys/arch/sun3/sun3/autoconf.c +++ b/sys/arch/sun3/sun3/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.20 2002/01/16 20:50:17 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.21 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: autoconf.c,v 1.37 1996/11/20 18:57:22 gwr Exp $ */ /*- @@ -73,12 +73,12 @@ /* Want compile-time initialization here. */ int cold = 1; -void setroot __P((void)); -void swapconf __P((void)); -int findblkmajor __P((struct device *)); -struct device *getdisk __P((char *, int, int, dev_t *)); -struct device *parsedisk __P((char *, int, int, dev_t *)); -int getstr __P((char *, int)); +void setroot(void); +void swapconf(void); +int findblkmajor(struct device *); +struct device *getdisk(char *, int, int, dev_t *); +struct device *parsedisk(char *, int, int, dev_t *); +int getstr(char *, int); void cpu_configure() @@ -366,12 +366,12 @@ struct nam2blk { }; /* This takes the args: name, ctlr, unit */ -typedef struct device *(*findfunc_t) __P((char *, int, int)); +typedef struct device *(*findfunc_t)(char *, int, int); -struct device *find_dev_byname __P((char *)); -struct device *net_find __P((char *, int, int)); -struct device *scsi_find __P((char *, int, int)); -struct device *xx_find __P((char *, int, int)); +struct device *find_dev_byname(char *); +struct device *net_find(char *, int, int); +struct device *scsi_find(char *, int, int); +struct device *xx_find(char *, int, int); struct prom_n2f { char name[4]; diff --git a/sys/arch/sun3/sun3/cache.c b/sys/arch/sun3/sun3/cache.c index 223f431480b..4f270de9828 100644 --- a/sys/arch/sun3/sun3/cache.c +++ b/sys/arch/sun3/sun3/cache.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cache.c,v 1.8 2001/11/06 02:49:22 art Exp $ */ +/* $OpenBSD: cache.c,v 1.9 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: cache.c,v 1.5 1996/11/20 18:57:24 gwr Exp $ */ /*- @@ -60,7 +60,7 @@ #define VAC_FLUSH_INCR 512 /* bytes */ #define VADDR_MASK 0xfFFffFF /* 28 bits */ -static void cache_clear_tags __P((void)); +static void cache_clear_tags(void); void cache_flush_page(pgva) diff --git a/sys/arch/sun3/sun3/clock.c b/sys/arch/sun3/sun3/clock.c index 7e3a9ef2e48..85bf6ff7586 100644 --- a/sys/arch/sun3/sun3/clock.c +++ b/sys/arch/sun3/sun3/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.9 2001/01/04 22:34:48 miod Exp $ */ +/* $OpenBSD: clock.c,v 1.10 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: clock.c,v 1.31 1996/10/30 00:24:42 gwr Exp $ */ /* @@ -68,8 +68,8 @@ #define CLOCK_PRI 5 -void cpu_initclocks __P((void)); -void clock_intr __P((struct clockframe *)); +void cpu_initclocks(void); +void clock_intr(struct clockframe *); extern volatile u_char *interrupt_reg; volatile char *clock_va; @@ -82,8 +82,8 @@ volatile char *clock_va; #define intersil_clear() (void)intersil_clock->clk_intr_reg -static int clock_match __P((struct device *, void *vcf, void *args)); -static void clock_attach __P((struct device *, struct device *, void *)); +static int clock_match(struct device *, void *vcf, void *args); +static void clock_attach(struct device *, struct device *, void *); struct cfattach clock_ca = { sizeof(struct device), clock_match, clock_attach @@ -222,7 +222,7 @@ void cpu_initclocks() { int s; - extern void _isr_clock __P((void)); /* in locore.s */ + extern void _isr_clock(void); /* in locore.s */ if (!intersil_clock) panic("cpu_initclocks"); @@ -329,12 +329,12 @@ microtime(tvp) #define SECDAY 86400L #define SECYR (SECDAY * 365) -static void clk_get_dt __P((struct date_time *)); -static void clk_set_dt __P((struct date_time *)); -void gmt_to_dt __P((long *, struct date_time *)); -void dt_to_gmt __P((struct date_time *, long *)); -static long clk_get_secs __P((void)); -static void clk_set_secs __P((long)); +static void clk_get_dt(struct date_time *); +static void clk_set_dt(struct date_time *); +void gmt_to_dt(long *, struct date_time *); +void dt_to_gmt(struct date_time *, long *); +static long clk_get_secs(void); +static void clk_set_secs(long); /* * Initialize the time of day register, based on the time base diff --git a/sys/arch/sun3/sun3/db_machdep.c b/sys/arch/sun3/sun3/db_machdep.c index 78f481d5815..734784838d0 100644 --- a/sys/arch/sun3/sun3/db_machdep.c +++ b/sys/arch/sun3/sun3/db_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.c,v 1.12 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: db_machdep.c,v 1.13 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: db_machdep.c,v 1.8 1996/11/20 18:57:27 gwr Exp $ */ /*- @@ -55,10 +55,10 @@ #include <ddb/db_command.h> #include <ddb/db_output.h> -static void db_mach_pagemap __P((db_expr_t, int, db_expr_t, char *)); -static void db_mach_abort __P((db_expr_t, int, db_expr_t, char *)); +static void db_mach_pagemap(db_expr_t, int, db_expr_t, char *); +static void db_mach_abort(db_expr_t, int, db_expr_t, char *); -static void pte_print __P((int)); +static void pte_print(int); static char *pgt_names[] = { "MEM", "OBIO", "VMES", "VMEL" }; diff --git a/sys/arch/sun3/sun3/db_memrw.c b/sys/arch/sun3/sun3/db_memrw.c index c1b267265fc..886af8e81f3 100644 --- a/sys/arch/sun3/sun3/db_memrw.c +++ b/sys/arch/sun3/sun3/db_memrw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_memrw.c,v 1.9 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: db_memrw.c,v 1.10 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: db_memrw.c,v 1.13 1996/11/20 18:57:28 gwr Exp $ */ /*- @@ -67,7 +67,7 @@ #include <ddb/db_access.h> -static void db_write_text __P((vm_offset_t, size_t size, char *)); +static void db_write_text(vm_offset_t, size_t size, char *); /* * Read bytes from kernel address space for debugger. diff --git a/sys/arch/sun3/sun3/disksubr.c b/sys/arch/sun3/sun3/disksubr.c index aed8243bef4..953abb22bcf 100644 --- a/sys/arch/sun3/sun3/disksubr.c +++ b/sys/arch/sun3/sun3/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.16 2002/02/19 02:50:59 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.17 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: disksubr.c,v 1.14 1996/09/26 18:10:21 gwr Exp $ */ /* @@ -65,9 +65,9 @@ #error "Default value of LABELSECTOR no longer zero?" #endif -static char * disklabel_sun_to_bsd __P((char *, struct disklabel *)); -static int disklabel_bsd_to_sun __P((struct disklabel *, char *)); -static __inline u_long sun_extended_sum __P((struct sun_disklabel *)); +static char * disklabel_sun_to_bsd(char *, struct disklabel *); +static int disklabel_bsd_to_sun(struct disklabel *, char *); +static __inline u_long sun_extended_sum(struct sun_disklabel *); /* * Attempt to read a disk label from a device @@ -84,7 +84,7 @@ static __inline u_long sun_extended_sum __P((struct sun_disklabel *)); char * readdisklabel(dev, strat, lp, clp, spoofonly) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *clp; int spoofonly; @@ -208,7 +208,7 @@ setdisklabel(olp, nlp, openmask, clp) int writedisklabel(dev, strat, lp, clp) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *clp; { diff --git a/sys/arch/sun3/sun3/fpu.c b/sys/arch/sun3/sun3/fpu.c index 652ec087d3d..415bd24cb87 100644 --- a/sys/arch/sun3/sun3/fpu.c +++ b/sys/arch/sun3/sun3/fpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu.c,v 1.7 1997/04/05 20:24:24 kstailey Exp $ */ +/* $OpenBSD: fpu.c,v 1.8 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: fpu.c,v 1.9 1996/11/20 18:57:29 gwr Exp $ */ /*- @@ -67,7 +67,7 @@ static char *fpu_descr[] = { "mc68882", /* 2 */ "?" }; -static int fpu_probe __P((void)); +static int fpu_probe(void); void initfpu() diff --git a/sys/arch/sun3/sun3/interreg.h b/sys/arch/sun3/sun3/interreg.h index fdd95ce51d6..d8eae3933cf 100644 --- a/sys/arch/sun3/sun3/interreg.h +++ b/sys/arch/sun3/sun3/interreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: interreg.h,v 1.5 1997/01/16 04:04:22 kstailey Exp $ */ +/* $OpenBSD: interreg.h,v 1.6 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: interreg.h,v 1.7 1996/11/20 18:57:30 gwr Exp $ */ /*- @@ -48,4 +48,4 @@ #define IREG_BITS "\20\8CLK7\7RSV6\6CLK5\5VIDEO\4SOFT3\3SOFT2\2SOFT1\1ALL\n" -void set_clk_mode __P((u_char on, u_char off, int enable)); +void set_clk_mode(u_char on, u_char off, int enable); diff --git a/sys/arch/sun3/sun3/intreg.c b/sys/arch/sun3/sun3/intreg.c index a0e9796c11b..d8efcc211cf 100644 --- a/sys/arch/sun3/sun3/intreg.c +++ b/sys/arch/sun3/sun3/intreg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intreg.c,v 1.9 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: intreg.c,v 1.10 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: intreg.c,v 1.5 1996/11/20 18:57:32 gwr Exp $ */ /*- @@ -64,9 +64,9 @@ struct intreg_softc { volatile u_char *sc_reg; }; -static int intreg_match __P((struct device *, void *vcf, void *args)); -static void intreg_attach __P((struct device *, struct device *, void *)); -static int soft1intr __P((void *)); +static int intreg_match(struct device *, void *vcf, void *args); +static void intreg_attach(struct device *, struct device *, void *); +static int soft1intr(void *); struct cfattach intreg_ca = { sizeof(struct intreg_softc), intreg_match, intreg_attach diff --git a/sys/arch/sun3/sun3/isr.c b/sys/arch/sun3/sun3/isr.c index 8ed7530e513..e651d78ae2d 100644 --- a/sys/arch/sun3/sun3/isr.c +++ b/sys/arch/sun3/sun3/isr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isr.c,v 1.15 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: isr.c,v 1.16 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: isr.c,v 1.25 1996/11/20 18:57:32 gwr Exp $ */ /*- @@ -69,11 +69,11 @@ struct isr { int isr_ipl; }; -void set_vector_entry __P((int, void (*handler) __P((void)))); -unsigned int get_vector_entry __P((int)); +void set_vector_entry __P((int, void (*handler)(void))); +unsigned int get_vector_entry(int); -void isr_autovec __P((int)); -void isr_vectored __P((int)); +void isr_autovec(int); +void isr_vectored(int); void isr_add_custom(level, handler) @@ -193,7 +193,7 @@ isr_vectored(evec) * Called by driver attach functions. */ -extern void _isr_vectored __P((void)); +extern void _isr_vectored(void); void isr_add_vectored(func, arg, level, vec) @@ -223,7 +223,7 @@ isr_add_vectored(func, arg, level, vec) void set_vector_entry(entry, handler) int entry; - void (*handler) __P((void)); + void (*handler)(void); { if ((entry <0) || (entry >= NVECTORS)) panic("set_vector_entry: setting vector too high or low"); diff --git a/sys/arch/sun3/sun3/kgdb_stub.c b/sys/arch/sun3/sun3/kgdb_stub.c index 68d000596f3..56523d79b5a 100644 --- a/sys/arch/sun3/sun3/kgdb_stub.c +++ b/sys/arch/sun3/sun3/kgdb_stub.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kgdb_stub.c,v 1.8 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: kgdb_stub.c,v 1.9 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: kgdb_stub.c,v 1.6 1996/10/23 16:30:48 gwr Exp $ */ /* @@ -81,14 +81,14 @@ int kgdb_active = 0; /* remote debugging active if != 0 */ int kgdb_debug_init = 0; /* != 0 waits for remote at system init */ int kgdb_debug_panic = 0; /* != 0 waits for remote on panic */ -static void kgdb_send __P((u_int, u_char *, int)); -static int kgdb_recv __P((u_char *, int *)); -static int computeSignal __P((int)); -int kgdb_trap __P((int, struct trapframe *)); -int kgdb_acc __P((caddr_t, int)); +static void kgdb_send(u_int, u_char *, int); +static int kgdb_recv(u_char *, int *); +static int computeSignal(int); +int kgdb_trap(int, struct trapframe *); +int kgdb_acc(caddr_t, int); -static int (*kgdb_getc) __P((void *)); -static void (*kgdb_putc) __P((void *, int)); +static int (*kgdb_getc)(void *); +static void (*kgdb_putc)(void *, int); static void *kgdb_ioarg; #define GETC() ((*kgdb_getc)(kgdb_ioarg)) @@ -113,8 +113,8 @@ static void *kgdb_ioarg; */ void kgdb_attach(getfn, putfn, ioarg) - int (*getfn) __P((void *)); - void (*putfn) __P((void *, int)); + int (*getfn)(void *); + void (*putfn)(void *, int); void *ioarg; { diff --git a/sys/arch/sun3/sun3/ledsvar.h b/sys/arch/sun3/sun3/ledsvar.h index 91c80eef6f4..495b3283b1f 100644 --- a/sys/arch/sun3/sun3/ledsvar.h +++ b/sys/arch/sun3/sun3/ledsvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ledsvar.h,v 1.2 1997/01/16 04:04:26 kstailey Exp $ */ +/* $OpenBSD: ledsvar.h,v 1.3 2002/03/14 01:26:47 millert Exp $ */ extern volatile unsigned int led_n_patterns; extern volatile unsigned int led_countmax; @@ -6,4 +6,4 @@ extern volatile const unsigned char * volatile led_patterns; extern volatile unsigned int led_countdown; extern volatile unsigned int led_px; -extern int ledrw __P((struct uio *)); +extern int ledrw(struct uio *); diff --git a/sys/arch/sun3/sun3/machdep.c b/sys/arch/sun3/sun3/machdep.c index 00c3a9ebb93..0932cdd5cb9 100644 --- a/sys/arch/sun3/sun3/machdep.c +++ b/sys/arch/sun3/sun3/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.51 2002/02/17 22:59:53 maja Exp $ */ +/* $OpenBSD: machdep.c,v 1.52 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: machdep.c,v 1.77 1996/10/13 03:47:51 christos Exp $ */ /* @@ -129,13 +129,13 @@ int bufpages = 0; #endif int bufcachepercent = BUFCACHEPERCENT; -static caddr_t allocsys __P((caddr_t)); -static void identifycpu __P((void)); -static void initcpu __P((void)); -static void reboot_sync __P((void)); -int reboot2 __P((int, char *)); /* share with sunos_misc.c */ +static caddr_t allocsys(caddr_t); +static void identifycpu(void); +static void initcpu(void); +static void reboot_sync(void); +int reboot2(int, char *); /* share with sunos_misc.c */ -void straytrap __P((struct trapframe)); /* called from locore.s */ +void straytrap(struct trapframe); /* called from locore.s */ /* * Console initialization: called early on from main, @@ -641,7 +641,7 @@ dumpconf() { int nblks; /* size of dump area */ int maj; - int (*getsize) __P((dev_t)); + int (*getsize)(dev_t); if (dumpdev == NODEV) return; @@ -843,8 +843,7 @@ cpu_exec_aout_makecmds(p, epp) int error = ENOEXEC; #ifdef COMPAT_SUNOS - extern int sunos_exec_aout_makecmds - __P((struct proc *, struct exec_package *)); + extern int sunos_exec_aout_makecmds(struct proc *, struct exec_package *); if ((error = sunos_exec_aout_makecmds(p, epp)) == 0) return 0; #endif diff --git a/sys/arch/sun3/sun3/mainbus.c b/sys/arch/sun3/sun3/mainbus.c index 369460f5419..c40830b925b 100644 --- a/sys/arch/sun3/sun3/mainbus.c +++ b/sys/arch/sun3/sun3/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.4 1997/01/16 04:04:29 kstailey Exp $ */ +/* $OpenBSD: mainbus.c,v 1.5 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: mainbus.c,v 1.5 1996/12/17 21:11:35 gwr Exp $ */ /*- @@ -43,8 +43,8 @@ #include <machine/autoconf.h> -static int main_match __P((struct device *, void *, void *)); -static void main_attach __P((struct device *, struct device *, void *)); +static int main_match(struct device *, void *, void *); +static void main_attach(struct device *, struct device *, void *); struct cfattach mainbus_ca = { sizeof(struct device), main_match, main_attach diff --git a/sys/arch/sun3/sun3/mem.c b/sys/arch/sun3/sun3/mem.c index 4de002442ce..927127a9de1 100644 --- a/sys/arch/sun3/sun3/mem.c +++ b/sys/arch/sun3/sun3/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.18 2001/12/08 02:24:07 art Exp $ */ +/* $OpenBSD: mem.c,v 1.19 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: mem.c,v 1.19 1995/08/08 21:09:01 gwr Exp $ */ /* @@ -64,7 +64,7 @@ #include <machine/pte.h> #include <machine/pmap.h> -extern int ledrw __P((struct uio *)); +extern int ledrw(struct uio *); static caddr_t devzeropage; diff --git a/sys/arch/sun3/sun3/pmap.c b/sys/arch/sun3/sun3/pmap.c index ec8b438e322..f2ba5a2fd41 100644 --- a/sys/arch/sun3/sun3/pmap.c +++ b/sys/arch/sun3/sun3/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.34 2001/11/28 15:34:17 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.35 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: pmap.c,v 1.64 1996/11/20 18:57:35 gwr Exp $ */ /*- @@ -191,7 +191,7 @@ typedef struct pv_entry *pv_entry_t; pv_entry_t pv_head_table = NULL; #ifdef DIAGNOSTIC -static struct pv_entry * pa_to_pvp __P((vm_offset_t pa)); +static struct pv_entry * pa_to_pvp(vm_offset_t pa); static struct pv_entry * pa_to_pvp(pa) vm_offset_t pa; @@ -314,12 +314,12 @@ struct pmeg_tailq pmeg_free_queue, pmeg_inactive_queue, static struct pmeg_state pmeg_array[NPMEG]; #ifdef PMAP_DEBUG -void pmap_print __P((pmap_t pmap)); -void pv_print __P((vm_offset_t pa)); +void pmap_print(pmap_t pmap); +void pv_print(vm_offset_t pa); -static pmeg_t pmeg_p __P((int sme)); -static void pmeg_verify_empty __P((vm_offset_t va)); -static void pmeg_print __P((pmeg_t pmegp)); +static pmeg_t pmeg_p(int sme); +static void pmeg_verify_empty(vm_offset_t va); +static void pmeg_print(pmeg_t pmegp); static pmeg_t pmeg_p(sme) @@ -358,56 +358,56 @@ int tmp_vpages_inuse; /* * prototypes */ -static int get_pte_pmeg __P((int, int)); -static void set_pte_pmeg __P((int, int, int)); +static int get_pte_pmeg(int, int); +static void set_pte_pmeg(int, int, int); -static void context_allocate __P((pmap_t pmap)); -static void context_free __P((pmap_t pmap)); -static void context_init __P((void)); +static void context_allocate(pmap_t pmap); +static void context_free(pmap_t pmap); +static void context_init(void); -static pmeg_t pmeg_allocate __P((pmap_t pmap, vm_offset_t va)); -static void pmeg_release __P((pmeg_t pmegp)); -static void pmeg_free __P((pmeg_t pmegp, int segnum)); -static pmeg_t pmeg_cache __P((pmap_t pmap, vm_offset_t va)); -static void pmeg_set_wiring __P((pmeg_t pmegp, vm_offset_t va, int)); +static pmeg_t pmeg_allocate(pmap_t pmap, vm_offset_t va); +static void pmeg_release(pmeg_t pmegp); +static void pmeg_free(pmeg_t pmegp, int segnum); +static pmeg_t pmeg_cache(pmap_t pmap, vm_offset_t va); +static void pmeg_set_wiring(pmeg_t pmegp, vm_offset_t va, int); -static int pv_link __P((pmap_t pmap, vm_offset_t, vm_offset_t, u_int)); -static void pv_unlink __P((pmap_t, vm_offset_t, vm_offset_t)); -static void pv_remove_all __P(( vm_offset_t pa)); -static void pv_changepte __P((pv_entry_t, int, int)); -static void pv_syncflags __P((pv_entry_t head)); +static int pv_link(pmap_t pmap, vm_offset_t, vm_offset_t, u_int); +static void pv_unlink(pmap_t, vm_offset_t, vm_offset_t); +static void pv_remove_all( vm_offset_t pa); +static void pv_changepte(pv_entry_t, int, int); +static void pv_syncflags(pv_entry_t head); -static void pmeg_clean __P((pmeg_t pmegp)); -static void pmeg_clean_free __P((void)); +static void pmeg_clean(pmeg_t pmegp); +static void pmeg_clean_free(void); -static void sun3_protection_init __P((void)); +static void sun3_protection_init(void); -static void pmap_common_init __P((pmap_t pmap)); +static void pmap_common_init(pmap_t pmap); -static void pmap_user_pmap_init __P((pmap_t pmap)); -static void pmap_page_upload __P((void)); +static void pmap_user_pmap_init(pmap_t pmap); +static void pmap_page_upload(void); -static void pmap_remove_range_mmu __P((pmap_t, vm_offset_t, vm_offset_t)); -static void pmap_remove_range_noctx __P((pmap_t, vm_offset_t, vm_offset_t)); -static void pmap_remove_range __P((pmap_t pmap, vm_offset_t, vm_offset_t)); +static void pmap_remove_range_mmu(pmap_t, vm_offset_t, vm_offset_t); +static void pmap_remove_range_noctx(pmap_t, vm_offset_t, vm_offset_t); +static void pmap_remove_range(pmap_t pmap, vm_offset_t, vm_offset_t); -static void pmap_enter_kernel __P((vm_offset_t va, vm_offset_t pa, - vm_prot_t prot, boolean_t wired, int pte_proto)); -static void pmap_enter_user __P((pmap_t pmap, vm_offset_t va, vm_offset_t pa, - vm_prot_t prot, boolean_t wired, int pte_proto)); +static void pmap_enter_kernel(vm_offset_t va, vm_offset_t pa, + vm_prot_t prot, boolean_t wired, int pte_proto); +static void pmap_enter_user(pmap_t pmap, vm_offset_t va, vm_offset_t pa, + vm_prot_t prot, boolean_t wired, int pte_proto); -static void pmap_protect_range_noctx __P((pmap_t, vm_offset_t, vm_offset_t)); -static void pmap_protect_range_mmu __P((pmap_t, vm_offset_t, vm_offset_t)); -static void pmap_protect_range __P((pmap_t, vm_offset_t, vm_offset_t)); +static void pmap_protect_range_noctx(pmap_t, vm_offset_t, vm_offset_t); +static void pmap_protect_range_mmu(pmap_t, vm_offset_t, vm_offset_t); +static void pmap_protect_range(pmap_t, vm_offset_t, vm_offset_t); -void pmap_switch __P((pmap_t pmap)); +void pmap_switch(pmap_t pmap); -extern int pmap_page_index __P((paddr_t)); -extern u_int pmap_free_pages __P((void)); -extern int pmap_next_page __P((vm_offset_t *)); +extern int pmap_page_index(paddr_t); +extern u_int pmap_free_pages(void); +extern int pmap_next_page(vm_offset_t *); -void pmap_pinit __P((struct pmap *)); -void pmap_release __P((struct pmap *)); +void pmap_pinit(struct pmap *); +void pmap_release(struct pmap *); /* * Debugging support. diff --git a/sys/arch/sun3/sun3/stub.c b/sys/arch/sun3/sun3/stub.c index c79cfbd0785..64762e9b9e7 100644 --- a/sys/arch/sun3/sun3/stub.c +++ b/sys/arch/sun3/sun3/stub.c @@ -1,4 +1,4 @@ -/* $OpenBSD: stub.c,v 1.8 2001/05/30 20:37:54 miod Exp $ */ +/* $OpenBSD: stub.c,v 1.9 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: stub.c,v 1.13 1996/11/20 18:57:37 gwr Exp $ */ /*- @@ -47,7 +47,7 @@ #include <machine/machdep.h> #ifndef DDB -void Debugger __P((void)); +void Debugger(void); /* * When DDB is included, Debugger() comes from db_interface.c diff --git a/sys/arch/sun3/sun3/sun3_startup.c b/sys/arch/sun3/sun3/sun3_startup.c index f5335b1c66f..7975deb4a13 100644 --- a/sys/arch/sun3/sun3/sun3_startup.c +++ b/sys/arch/sun3/sun3/sun3_startup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sun3_startup.c,v 1.20 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: sun3_startup.c,v 1.21 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: sun3_startup.c,v 1.55 1996/11/20 18:57:38 gwr Exp $ */ /*- @@ -106,22 +106,22 @@ extern struct pcb *curpcb; extern vm_offset_t dumppage_pa; extern vm_offset_t dumppage_va; -void sun3_bootstrap __P((struct exec)); +void sun3_bootstrap(struct exec); -static void sun3_mode_monitor __P((void)); -static void sun3_mode_normal __P((void)); -static void sun3_mon_init __P((vm_offset_t sva, vm_offset_t eva, int keep)); -static void sun3_monitor_hooks __P((void)); -static void sun3_context_equiv __P((void)); +static void sun3_mode_monitor(void); +static void sun3_mode_normal(void); +static void sun3_mon_init(vm_offset_t sva, vm_offset_t eva, int keep); +static void sun3_monitor_hooks(void); +static void sun3_context_equiv(void); #if (defined(DDB) || NKSYMS > 0) && !defined(SYMTAB_SPACE) -static void sun3_save_symtab __P((struct exec *kehp)); +static void sun3_save_symtab(struct exec *kehp); #endif -static void sun3_verify_hardware __P((void)); -static void sun3_vm_init __P((struct exec *kehp)); -static void tracedump __P((int)); -static void v_handler __P((int addr, char *str)); +static void sun3_verify_hardware(void); +static void sun3_vm_init(struct exec *kehp); +static void tracedump(int); +static void v_handler(int addr, char *str); -static void internal_configure __P((void)); +static void internal_configure(void); vm_offset_t high_segment_alloc(npages) diff --git a/sys/arch/sun3/sun3/swapgeneric.c b/sys/arch/sun3/sun3/swapgeneric.c index 049738b45ec..b236178efe5 100644 --- a/sys/arch/sun3/sun3/swapgeneric.c +++ b/sys/arch/sun3/sun3/swapgeneric.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapgeneric.c,v 1.7 2001/09/29 18:40:33 miod Exp $ */ +/* $OpenBSD: swapgeneric.c,v 1.8 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: swapgeneric.c,v 1.14 1995/04/26 23:30:08 gwr Exp $ */ /* @@ -38,7 +38,7 @@ #include <sys/param.h> #include <sys/conf.h> -int (*mountroot) __P((void)) = NULL; /* tells autoconf.c that we are "generic" */ +int (*mountroot)(void) = NULL; /* tells autoconf.c that we are "generic" */ dev_t rootdev = NODEV; dev_t dumpdev = NODEV; diff --git a/sys/arch/sun3/sun3/trap.c b/sys/arch/sun3/sun3/trap.c index 4ff91c75db8..0605c2ecf8e 100644 --- a/sys/arch/sun3/sun3/trap.c +++ b/sys/arch/sun3/sun3/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.31 2001/11/28 16:13:29 art Exp $ */ +/* $OpenBSD: trap.c,v 1.32 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: trap.c,v 1.63-1.65ish 1997/01/16 15:41:40 gwr Exp $ */ /* @@ -78,9 +78,9 @@ extern struct emul emul_sunos; extern char fubail[], subail[]; /* These are called from locore.s */ -void syscall __P((register_t code, struct frame)); -void trap __P((int type, u_int code, u_int v, struct frame)); -int nodb_trap __P((int type, struct frame *)); +void syscall(register_t code, struct frame); +void trap(int type, u_int code, u_int v, struct frame); +int nodb_trap(int type, struct frame *); int astpending; diff --git a/sys/arch/sun3/sun3/vector.c b/sys/arch/sun3/sun3/vector.c index 5629660a2e3..d100b60c432 100644 --- a/sys/arch/sun3/sun3/vector.c +++ b/sys/arch/sun3/sun3/vector.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vector.c,v 1.7 2000/08/28 22:06:36 miod Exp $ */ +/* $OpenBSD: vector.c,v 1.8 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: vector.c,v 1.15 1996/11/20 18:57:40 gwr Exp $ */ /*- @@ -59,7 +59,7 @@ #define fpsnan fpfault #define fpunfl fpfault -void (*vector_table[NVECTORS]) __P((void)) = { +void (*vector_table[NVECTORS])(void) = { (void*)0xfffe000, /* 0: NOT USED (reset SP) */ (void*)0xfef0000, /* 1: NOT USED (reset PC) */ buserr, /* 2: bus error */ diff --git a/sys/arch/sun3/sun3/vector.h b/sys/arch/sun3/sun3/vector.h index 24efecad59c..4ebba66540b 100644 --- a/sys/arch/sun3/sun3/vector.h +++ b/sys/arch/sun3/sun3/vector.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vector.h,v 1.6 2000/08/28 22:06:36 miod Exp $ */ +/* $OpenBSD: vector.h,v 1.7 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: vector.h,v 1.10 1996/11/20 18:57:40 gwr Exp $ */ /*- @@ -41,27 +41,27 @@ #define AUTOVEC_BASE 0x18 -extern void (*vector_table[]) __P((void)); +extern void (*vector_table[])(void); -void addrerr __P((void)); -void badtrap __P((void)); -void buserr __P((void)); -void chkinst __P((void)); -void coperr __P((void)); -void fmterr __P((void)); -void fpfline __P((void)); -void fpunsupp __P((void)); -void illinst __P((void)); -void privinst __P((void)); -void trace __P((void)); -void trap0 __P((void)); -void trap1 __P((void)); -void trap12 __P((void)); -void trap15 __P((void)); -void trap2 __P((void)); -void trapvinst __P((void)); -void zerodiv __P((void)); -void fpfault __P((void)); +void addrerr(void); +void badtrap(void); +void buserr(void); +void chkinst(void); +void coperr(void); +void fmterr(void); +void fpfline(void); +void fpunsupp(void); +void illinst(void); +void privinst(void); +void trace(void); +void trap0(void); +void trap1(void); +void trap12(void); +void trap15(void); +void trap2(void); +void trapvinst(void); +void zerodiv(void); +void fpfault(void); -void _isr_autovec __P((void)); +void _isr_autovec(void); diff --git a/sys/arch/vax/bi/bi.c b/sys/arch/vax/bi/bi.c index 9c2414abee5..8b8c55bca44 100644 --- a/sys/arch/vax/bi/bi.c +++ b/sys/arch/vax/bi/bi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bi.c,v 1.2 1997/05/29 00:04:16 niklas Exp $ */ +/* $OpenBSD: bi.c,v 1.3 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: bi.c,v 1.4 1996/10/13 03:34:44 christos Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -51,9 +51,9 @@ #include <arch/vax/bi/bireg.h> #include <arch/vax/bi/bivar.h> -static int bi_match __P((struct device *, void *, void *)); -static void bi_attach __P((struct device *, struct device *, void*)); -static int bi_print __P((void *, const char *)); +static int bi_match(struct device *, void *, void *); +static void bi_attach(struct device *, struct device *, void*); +static int bi_print(void *, const char *); struct cfdriver bi_cd = { NULL, "bi", DV_DULL diff --git a/sys/arch/vax/bi/bivar.h b/sys/arch/vax/bi/bivar.h index 6ee0c4cf91b..53af17b53d4 100644 --- a/sys/arch/vax/bi/bivar.h +++ b/sys/arch/vax/bi/bivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bivar.h,v 1.3 2000/04/28 03:42:39 bjc Exp $ */ +/* $OpenBSD: bivar.h,v 1.4 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: bivar.h,v 1.5 2000/03/26 11:45:04 ragge Exp $ */ /* * Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden. @@ -70,5 +70,5 @@ struct bi_list { }; /* Prototype */ -void bi_attach __P((struct bi_softc *)); +void bi_attach(struct bi_softc *); void bi_intr_establish __P((void *, int, void (*)(void *), void *)); diff --git a/sys/arch/vax/bi/kdb.c b/sys/arch/vax/bi/kdb.c index 59fc4bc72c8..0362e0958ca 100644 --- a/sys/arch/vax/bi/kdb.c +++ b/sys/arch/vax/bi/kdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kdb.c,v 1.5 2001/11/06 19:53:17 miod Exp $ */ +/* $OpenBSD: kdb.c,v 1.6 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: kdb.c,v 1.5 1997/01/11 11:34:39 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -76,14 +76,14 @@ struct kdb_softc { struct mscp *sc_mscp; /* Keep pointer to active mscp */ }; -int kdbmatch __P((struct device *, void *, void *)); -void kdbattach __P((struct device *, struct device *, void *)); -void kdbreset __P((int)); -void kdbintr __P((int)); -void kdbctlrdone __P((struct device *, int)); -int kdbprint __P((void *, const char *)); -void kdbsaerror __P((struct device *, int)); -int kdbgo __P((struct device *, struct buf *)); +int kdbmatch(struct device *, void *, void *); +void kdbattach(struct device *, struct device *, void *); +void kdbreset(int); +void kdbintr(int); +void kdbctlrdone(struct device *, int); +int kdbprint(void *, const char *); +void kdbsaerror(struct device *, int); +int kdbgo(struct device *, struct buf *); struct cfdriver kdb_cd = { NULL, "kdb", DV_DULL diff --git a/sys/arch/vax/boot/boot/consio.c b/sys/arch/vax/boot/boot/consio.c index 78c50c89472..39775324c5b 100644 --- a/sys/arch/vax/boot/boot/consio.c +++ b/sys/arch/vax/boot/boot/consio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: consio.c,v 1.2 2000/10/04 04:38:08 bjc Exp $ */ +/* $OpenBSD: consio.c,v 1.3 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: consio.c,v 1.11 2000/07/19 00:58:24 matt Exp $ */ /* * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden. @@ -44,31 +44,31 @@ #include "data.h" -void setup __P((void)); +void setup(void); unsigned *bootregs; extern struct rpb *rpb; struct bqo *bqo; -static int (*put_fp) __P((int)) = NULL; -static int (*get_fp) __P((void)) = NULL; -static int (*test_fp) __P((void)) = NULL; +static int (*put_fp)(int) = NULL; +static int (*get_fp)(void) = NULL; +static int (*test_fp)(void) = NULL; /* Also added such a thing for KA53 - MK-991208 */ unsigned char *ka53_conspage; -void ka53_consinit __P((void)); +void ka53_consinit(void); -int ka53_rom_putchar __P((int c)); -int ka53_rom_getchar __P((void)); -int ka53_rom_testchar __P((void)); +int ka53_rom_putchar(int c); +int ka53_rom_getchar(void); +int ka53_rom_testchar(void); -int pr_putchar __P((int c)); /* putchar() using mtpr/mfpr */ -int pr_getchar __P((void)); -int pr_testchar __P((void)); +int pr_putchar(int c); /* putchar() using mtpr/mfpr */ +int pr_getchar(void); +int pr_testchar(void); -int rom_putchar __P((int c)); /* putchar() using ROM routines */ -int rom_getchar __P((void)); -int rom_testchar __P((void)); +int rom_putchar(int c); /* putchar() using ROM routines */ +int rom_getchar(void); +int rom_testchar(void); static int rom_putc; /* ROM-address of put-routine */ static int rom_getc; /* ROM-address of get-routine */ @@ -88,11 +88,11 @@ static int rom_getc; /* ROM-address of get-routine */ /* Pointer to KA630 console page, initialized by ka630_consinit */ unsigned char *ka630_conspage; /* Function that initializes things for KA630 ROM console I/O */ -void ka630_consinit __P((void)); +void ka630_consinit(void); /* Functions that use KA630 ROM for console I/O */ -int ka630_rom_putchar __P((int c)); -int ka630_rom_getchar __P((void)); -int ka630_rom_testchar __P((void)); +int ka630_rom_putchar(int c); +int ka630_rom_getchar(void); +int ka630_rom_testchar(void); putchar(c) int c; diff --git a/sys/arch/vax/boot/boot/ctu.c b/sys/arch/vax/boot/boot/ctu.c index 3f2c9afb891..acdd35a7c70 100644 --- a/sys/arch/vax/boot/boot/ctu.c +++ b/sys/arch/vax/boot/boot/ctu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ctu.c,v 1.1 2000/04/27 02:26:25 bjc Exp $ */ +/* $OpenBSD: ctu.c,v 1.2 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: ctu.c,v 1.1 1996/02/17 18:23:20 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -59,8 +59,8 @@ volatile struct tu_softc { int sc_bbytes; /* Number of xfer'd bytes this block */ } tu_sc; -void ctutintr __P((void)); -void cturintr __P((void)); +void ctutintr(void); +void cturintr(void); int ctuopen(f, adapt, ctlr, unit, part) diff --git a/sys/arch/vax/boot/boot/netio.c b/sys/arch/vax/boot/boot/netio.c index f458f57d710..116e28f2c9c 100644 --- a/sys/arch/vax/boot/boot/netio.c +++ b/sys/arch/vax/boot/boot/netio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netio.c,v 1.2 2001/04/10 12:27:54 bjc Exp $ */ +/* $OpenBSD: netio.c,v 1.3 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: netio.c,v 1.4 1999/06/30 18:38:03 ragge Exp $ */ /*- @@ -111,7 +111,7 @@ int netio_ask = 0; /* default to bootparam, can override */ static char input_line[100]; -int netmountroot __P((struct open_file *, char *)); +int netmountroot(struct open_file *, char *); /* * Called by devopen after it sets f->f_dev to our devsw entry. diff --git a/sys/arch/vax/boot/xxboot/bootxx.c b/sys/arch/vax/boot/xxboot/bootxx.c index 62673d86b53..e91679f2a9e 100644 --- a/sys/arch/vax/boot/xxboot/bootxx.c +++ b/sys/arch/vax/boot/xxboot/bootxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bootxx.c,v 1.2 2000/10/04 04:16:40 bjc Exp $ */ +/* $OpenBSD: bootxx.c,v 1.3 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: bootxx.c,v 1.2 1999/10/23 14:40:38 ragge Exp $ */ /*- * Copyright (c) 1982, 1986 The Regents of the University of California. @@ -64,8 +64,8 @@ struct rom_softc { int unit; } rom_softc; -int romstrategy __P((void *, int, daddr_t, size_t, void *, size_t *)); -int romopen __P((struct open_file *, int, int, int, int)); +int romstrategy(void *, int, daddr_t, size_t, void *, size_t *); +int romopen(struct open_file *, int, int, int, int); struct fs_ops file_system[] = { { ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek, ufs_stat } @@ -77,7 +77,7 @@ struct devsw devsw[] = { }; int ndevs = (sizeof(devsw)/sizeof(devsw[0])); -int command __P((int cmd, int arg)); +int command(int cmd, int arg); /* * Boot program... argume passed in r10 and r11 determine whether boot diff --git a/sys/arch/vax/dec/dzkbd.c b/sys/arch/vax/dec/dzkbd.c index 2670dcc39fd..29767ccd802 100644 --- a/sys/arch/vax/dec/dzkbd.c +++ b/sys/arch/vax/dec/dzkbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dzkbd.c,v 1.2 2002/01/10 00:11:14 nordin Exp $ */ +/* $OpenBSD: dzkbd.c,v 1.3 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: dzkbd.c,v 1.1 2000/12/02 17:03:55 ragge Exp $ */ /* @@ -89,10 +89,10 @@ struct dzkbd_softc { struct device *sc_wskbddev; }; -static int dzkbd_input __P((void *, int)); +static int dzkbd_input(void *, int); -static int dzkbd_match __P((struct device *, struct cfdata *, void *)); -static void dzkbd_attach __P((struct device *, struct device *, void *)); +static int dzkbd_match(struct device *, struct cfdata *, void *); +static void dzkbd_attach(struct device *, struct device *, void *); struct cfattach dzkbd_ca = { sizeof(struct dzkbd_softc), (cfmatch_t)dzkbd_match, dzkbd_attach, @@ -102,9 +102,9 @@ struct cfdriver lkkbd_cd = { NULL, "lkkbd", DV_DULL }; -static int dzkbd_enable __P((void *, int)); -static void dzkbd_set_leds __P((void *, int)); -static int dzkbd_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); +static int dzkbd_enable(void *, int); +static void dzkbd_set_leds(void *, int); +static int dzkbd_ioctl(void *, u_long, caddr_t, int, struct proc *); const struct wskbd_accessops dzkbd_accessops = { dzkbd_enable, @@ -120,7 +120,7 @@ const struct wskbd_consops dzkbd_consops = { dzkbd_cnpollc, }; -static int dzkbd_sendchar __P((void *, u_char)); +static int dzkbd_sendchar(void *, u_char); const struct wskbd_mapdata dzkbd_keymapdata = { zskbd_keydesctab, diff --git a/sys/arch/vax/dec/dzms.c b/sys/arch/vax/dec/dzms.c index 60abd4f0901..52680d026ef 100644 --- a/sys/arch/vax/dec/dzms.c +++ b/sys/arch/vax/dec/dzms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dzms.c,v 1.1 2001/05/16 22:15:17 hugh Exp $ */ +/* $OpenBSD: dzms.c,v 1.2 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: dzms.c,v 1.1 2000/12/02 17:03:55 ragge Exp $ */ /* @@ -81,9 +81,9 @@ struct dzms_softc { /* driver status information */ struct device *sc_wsmousedev; }; -static int dzms_match __P((struct device *, struct cfdata *, void *)); -static void dzms_attach __P((struct device *, struct device *, void *)); -static int dzms_input __P((void *, int)); +static int dzms_match(struct device *, struct cfdata *, void *); +static void dzms_attach(struct device *, struct device *, void *); +static int dzms_input(void *, int); struct cfattach dzms_ca = { sizeof(struct dzms_softc), (cfmatch_t)dzms_match, dzms_attach, @@ -93,9 +93,9 @@ struct cfdriver lkms_cd = { NULL, "lkms", DV_DULL }; -static int dzms_enable __P((void *)); -static int dzms_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); -static void dzms_disable __P((void *)); +static int dzms_enable(void *); +static int dzms_ioctl(void *, u_long, caddr_t, int, struct proc *); +static void dzms_disable(void *); const struct wsmouse_accessops dzms_accessops = { dzms_enable, diff --git a/sys/arch/vax/dec/lk201.h b/sys/arch/vax/dec/lk201.h index ce901212c8e..edec87498b9 100644 --- a/sys/arch/vax/dec/lk201.h +++ b/sys/arch/vax/dec/lk201.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lk201.h,v 1.1 2001/05/16 22:15:17 hugh Exp $ */ +/* $OpenBSD: lk201.h,v 1.2 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: lk201.h,v 1.7 1999/03/19 18:34:01 ad Exp $ */ @@ -141,6 +141,6 @@ #define LEFT_BUTTON 0x04 #ifdef _KERNEL -extern int LKgetc __P((dev_t dev)); +extern int LKgetc(dev_t dev); extern void lkdivert __P ((int (*getc_fn)(dev_t dev), dev_t dev)); #endif diff --git a/sys/arch/vax/dec/lk201var.h b/sys/arch/vax/dec/lk201var.h index 1bb10ca2b09..e623e9e709b 100644 --- a/sys/arch/vax/dec/lk201var.h +++ b/sys/arch/vax/dec/lk201var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lk201var.h,v 1.1 2001/05/16 22:15:17 hugh Exp $ */ +/* $OpenBSD: lk201var.h,v 1.2 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: lk201var.h,v 1.2 1998/10/22 17:55:20 drochner Exp $ */ /* @@ -34,7 +34,7 @@ */ struct lk201_attachment { - int (*sendchar) __P((void *, u_char)); + int (*sendchar)(void *, u_char); void *cookie; }; @@ -46,7 +46,7 @@ struct lk201_state { int leds_state; }; -int lk201_init __P((struct lk201_state *)); -int lk201_decode __P((struct lk201_state *, int, u_int *, int *)); -void lk201_bell __P((struct lk201_state *, struct wskbd_bell_data *)); -void lk201_set_leds __P((struct lk201_state *, int)); +int lk201_init(struct lk201_state *); +int lk201_decode(struct lk201_state *, int, u_int *, int *); +void lk201_bell(struct lk201_state *, struct wskbd_bell_data *); +void lk201_set_leds(struct lk201_state *, int); diff --git a/sys/arch/vax/if/if_de.c b/sys/arch/vax/if/if_de.c index 3a3b16720a2..a446eaf2fc1 100644 --- a/sys/arch/vax/if/if_de.c +++ b/sys/arch/vax/if/if_de.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_de.c,v 1.11 2000/04/27 03:14:42 bjc Exp $ */ +/* $OpenBSD: if_de.c,v 1.12 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: if_de.c,v 1.27 1997/04/19 15:02:29 ragge Exp $ */ /* @@ -139,17 +139,17 @@ struct de_softc { int ds_nxmit; /* # of transmits in progress */ }; -int dematch __P((struct device *, void *, void *)); -void deattach __P((struct device *, struct device *, void *)); -int dewait __P((struct de_softc *, char *)); -void deinit __P((struct de_softc *)); -int deioctl __P((struct ifnet *, u_long, caddr_t)); -void dereset __P((int)); -void destart __P((struct ifnet *)); -void deread __P((struct de_softc *, struct ifrw *, int)); -void derecv __P((int)); -void de_setaddr __P((u_char *, struct de_softc *)); -void deintr __P((int)); +int dematch(struct device *, void *, void *); +void deattach(struct device *, struct device *, void *); +int dewait(struct de_softc *, char *); +void deinit(struct de_softc *); +int deioctl(struct ifnet *, u_long, caddr_t); +void dereset(int); +void destart(struct ifnet *); +void deread(struct de_softc *, struct ifrw *, int); +void derecv(int); +void de_setaddr(u_char *, struct de_softc *); +void deintr(int); struct cfdriver de_cd = { diff --git a/sys/arch/vax/if/if_le.c b/sys/arch/vax/if/if_le.c index eb70d751946..991933230ba 100644 --- a/sys/arch/vax/if/if_le.c +++ b/sys/arch/vax/if/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.8 2001/11/06 19:53:17 miod Exp $ */ +/* $OpenBSD: if_le.c,v 1.9 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: if_le.c,v 1.14 1999/08/14 18:40:23 ragge Exp $ */ /*- @@ -112,14 +112,14 @@ struct le_softc { volatile u_short *sc_rdp; }; -int le_ibus_match __P((struct device *, void *, void *)); -void le_ibus_attach __P((struct device *, struct device *, void *)); -void lewrcsr __P((struct am7990_softc *, u_int16_t, u_int16_t)); -u_int16_t lerdcsr __P((struct am7990_softc *, u_int16_t)); -void lance_copytobuf_gap2 __P((struct am7990_softc *, void *, int, int)); -void lance_copyfrombuf_gap2 __P((struct am7990_softc *, void *, int, int)); -void lance_zerobuf_gap2 __P((struct am7990_softc *, int, int)); -void leintr __P((void *)); +int le_ibus_match(struct device *, void *, void *); +void le_ibus_attach(struct device *, struct device *, void *); +void lewrcsr(struct am7990_softc *, u_int16_t, u_int16_t); +u_int16_t lerdcsr(struct am7990_softc *, u_int16_t); +void lance_copytobuf_gap2(struct am7990_softc *, void *, int, int); +void lance_copyfrombuf_gap2(struct am7990_softc *, void *, int, int); +void lance_zerobuf_gap2(struct am7990_softc *, int, int); +void leintr(void *); struct cfattach le_ibus_ca = { sizeof(struct le_softc), le_ibus_match, le_ibus_attach diff --git a/sys/arch/vax/if/if_qe.c b/sys/arch/vax/if/if_qe.c index dcdd234f609..8f0e7756aed 100644 --- a/sys/arch/vax/if/if_qe.c +++ b/sys/arch/vax/if/if_qe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_qe.c,v 1.12 2001/02/20 19:39:35 mickey Exp $ */ +/* $OpenBSD: if_qe.c,v 1.13 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: if_qe.c,v 1.39 2000/01/24 02:40:29 matt Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved. @@ -98,15 +98,15 @@ struct qe_softc { int sc_setup; /* Setup packet in queue */ }; -static int qematch __P((struct device *, struct cfdata *, void *)); -static void qeattach __P((struct device *, struct device *, void *)); -static void qeinit __P((struct qe_softc *)); -static void qestart __P((struct ifnet *)); -static void qeintr __P((void *)); -static int qeioctl __P((struct ifnet *, u_long, caddr_t)); -static int qe_add_rxbuf __P((struct qe_softc *, int)); -static void qe_setup __P((struct qe_softc *)); -static void qetimeout __P((struct ifnet *)); +static int qematch(struct device *, struct cfdata *, void *); +static void qeattach(struct device *, struct device *, void *); +static void qeinit(struct qe_softc *); +static void qestart(struct ifnet *); +static void qeintr(void *); +static int qeioctl(struct ifnet *, u_long, caddr_t); +static int qe_add_rxbuf(struct qe_softc *, int); +static void qe_setup(struct qe_softc *); +static void qetimeout(struct ifnet *); struct cfattach qe_ca = { sizeof(struct qe_softc), (cfmatch_t)qematch, qeattach diff --git a/sys/arch/vax/if/if_uba.c b/sys/arch/vax/if/if_uba.c index be2e9330486..a497371c73f 100644 --- a/sys/arch/vax/if/if_uba.c +++ b/sys/arch/vax/if/if_uba.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_uba.c,v 1.8 2002/01/16 20:50:17 miod Exp $ */ +/* $OpenBSD: if_uba.c,v 1.9 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: if_uba.c,v 1.15 1999/01/01 21:43:18 ragge Exp $ */ /* @@ -56,9 +56,9 @@ #include <vax/uba/ubareg.h> #include <vax/uba/ubavar.h> -static int if_ubaalloc __P((struct ifubinfo *, struct ifrw *, int)); -static void rcv_xmtbuf __P((struct ifxmt *)); -static void restor_xmtbuf __P((struct ifxmt *)); +static int if_ubaalloc(struct ifubinfo *, struct ifrw *, int); +static void rcv_xmtbuf(struct ifxmt *); +static void restor_xmtbuf(struct ifxmt *); /* * Routines supporting UNIBUS network interfaces. diff --git a/sys/arch/vax/if/if_uba.h b/sys/arch/vax/if/if_uba.h index 7c2f90d4815..7357b82b81c 100644 --- a/sys/arch/vax/if/if_uba.h +++ b/sys/arch/vax/if/if_uba.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_uba.h,v 1.4 1997/05/29 00:04:34 niklas Exp $ */ +/* $OpenBSD: if_uba.h,v 1.5 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: if_uba.h,v 1.6 1996/08/20 14:07:50 ragge Exp $ */ /* @@ -135,10 +135,10 @@ struct ifuba { if_ubaput(&(ifu)->ifu_info, &(ifu)->ifu_xmt, m) /* Prototypes */ -int if_ubaminit __P((struct ifubinfo *, struct uba_softc *, int, int, - struct ifrw *, int, struct ifxmt *, int)); -int if_ubaput __P((struct ifubinfo *, struct ifxmt *, struct mbuf *)); -struct mbuf *if_ubaget __P((struct ifubinfo *, struct ifrw *, int, - struct ifnet *)); +int if_ubaminit(struct ifubinfo *, struct uba_softc *, int, int, + struct ifrw *, int, struct ifxmt *, int); +int if_ubaput(struct ifubinfo *, struct ifxmt *, struct mbuf *); +struct mbuf *if_ubaget(struct ifubinfo *, struct ifrw *, int, + struct ifnet *); #endif diff --git a/sys/arch/vax/if/if_ze.c b/sys/arch/vax/if/if_ze.c index 6853271ccdd..cb4b5d7b8f6 100644 --- a/sys/arch/vax/if/if_ze.c +++ b/sys/arch/vax/if/if_ze.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ze.c,v 1.3 2001/08/25 13:33:36 hugh Exp $ */ +/* $OpenBSD: if_ze.c,v 1.4 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: if_ze.c,v 1.3 2000/01/24 02:54:03 matt Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved. @@ -62,8 +62,8 @@ #define NISA_ROM 0x20084000 #define SGECVEC 0x108 -static int zematch __P((struct device *, struct cfdata *, void *)); -static void zeattach __P((struct device *, struct device *, void *)); +static int zematch(struct device *, struct cfdata *, void *); +static void zeattach(struct device *, struct device *, void *); struct cfattach ze_ibus_ca = { sizeof(struct ze_softc), (cfmatch_t)zematch, zeattach diff --git a/sys/arch/vax/if/sgec.c b/sys/arch/vax/if/sgec.c index 7259a99acd5..b4ddacb25ae 100644 --- a/sys/arch/vax/if/sgec.c +++ b/sys/arch/vax/if/sgec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sgec.c,v 1.3 2001/08/25 13:33:36 hugh Exp $ */ +/* $OpenBSD: sgec.c,v 1.4 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: sgec.c,v 1.5 2000/06/04 02:14:14 matt Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved. @@ -70,13 +70,13 @@ #include <vax/if/sgecreg.h> #include <vax/if/sgecvar.h> -static void zeinit __P((struct ze_softc *)); -static void zestart __P((struct ifnet *)); -static int zeioctl __P((struct ifnet *, u_long, caddr_t)); -static int ze_add_rxbuf __P((struct ze_softc *, int)); -static void ze_setup __P((struct ze_softc *)); -static void zetimeout __P((struct ifnet *)); -static int zereset __P((struct ze_softc *)); +static void zeinit(struct ze_softc *); +static void zestart(struct ifnet *); +static int zeioctl(struct ifnet *, u_long, caddr_t); +static int ze_add_rxbuf(struct ze_softc *, int); +static void ze_setup(struct ze_softc *); +static void zetimeout(struct ifnet *); +static int zereset(struct ze_softc *); #define ZE_WCSR(csr, val) \ bus_space_write_4(sc->sc_iot, sc->sc_ioh, csr, val) diff --git a/sys/arch/vax/if/sgecvar.h b/sys/arch/vax/if/sgecvar.h index fdee7fa4a43..a7bb0afc389 100644 --- a/sys/arch/vax/if/sgecvar.h +++ b/sys/arch/vax/if/sgecvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sgecvar.h,v 1.2 2001/08/25 13:33:36 hugh Exp $ */ +/* $OpenBSD: sgecvar.h,v 1.3 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: sgecvar.h,v 1.2 2000/06/04 02:14:14 matt Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved. @@ -65,5 +65,5 @@ struct ze_softc { int sc_setup; /* Setup packet in queue */ }; -void sgec_attach __P((struct ze_softc *)); -int sgec_intr __P((struct ze_softc *)); +void sgec_attach(struct ze_softc *); +int sgec_intr(struct ze_softc *); diff --git a/sys/arch/vax/include/bus.h b/sys/arch/vax/include/bus.h index 71285efbb7e..d66a7e7f881 100644 --- a/sys/arch/vax/include/bus.h +++ b/sys/arch/vax/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.4 2002/03/07 18:08:08 jason Exp $ */ +/* $OpenBSD: bus.h,v 1.5 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: bus.h,v 1.14 2000/06/26 04:56:13 simonb Exp $ */ /*- @@ -115,24 +115,24 @@ struct vax_bus_space { void *vbs_cookie; /* mapping/unmapping */ - int (*vbs_map) __P((void *, bus_addr_t, bus_size_t, - int, bus_space_handle_t *, int)); - void (*vbs_unmap) __P((void *, bus_space_handle_t, - bus_size_t, int)); - int (*vbs_subregion) __P((void *, bus_space_handle_t, - bus_size_t, bus_size_t, bus_space_handle_t *)); + int (*vbs_map)(void *, bus_addr_t, bus_size_t, + int, bus_space_handle_t *, int); + void (*vbs_unmap)(void *, bus_space_handle_t, + bus_size_t, int); + int (*vbs_subregion)(void *, bus_space_handle_t, + bus_size_t, bus_size_t, bus_space_handle_t *); /* allocation/deallocation */ - int (*vbs_alloc) __P((void *, bus_addr_t, bus_addr_t, + int (*vbs_alloc)(void *, bus_addr_t, bus_addr_t, bus_size_t, bus_size_t, bus_size_t, int, - bus_addr_t *, bus_space_handle_t *)); - void (*vbs_free) __P((void *, bus_space_handle_t, - bus_size_t)); + bus_addr_t *, bus_space_handle_t *); + void (*vbs_free)(void *, bus_space_handle_t, + bus_size_t); }; /* - * int bus_space_map __P((bus_space_tag_t t, bus_addr_t addr, - * bus_size_t size, int flags, bus_space_handle_t *bshp)); + * int bus_space_map(bus_space_tag_t t, bus_addr_t addr, + * bus_size_t size, int flags, bus_space_handle_t *bshp); * * Map a region of bus space. */ @@ -147,8 +147,8 @@ struct vax_bus_space { (*(t)->vbs_map)((t)->vbs_cookie, (a), (s), (f), (hp), 0) /* - * int bus_space_unmap __P((bus_space_tag_t t, - * bus_space_handle_t bsh, bus_size_t size)); + * int bus_space_unmap(bus_space_tag_t t, + * bus_space_handle_t bsh, bus_size_t size); * * Unmap a region of bus space. */ @@ -159,9 +159,9 @@ struct vax_bus_space { (*(t)->vbs_unmap)((t)->vbs_cookie, (h), (s), 0) /* - * int bus_space_subregion __P((bus_space_tag_t t, + * int bus_space_subregion(bus_space_tag_t t, * bus_space_handle_t bsh, bus_size_t offset, bus_size_t size, - * bus_space_handle_t *nbshp)); + * bus_space_handle_t *nbshp); * * Get a new handle for a subregion of an already-mapped area of bus space. */ @@ -170,10 +170,10 @@ struct vax_bus_space { (*(t)->vbs_subregion)((t)->vbs_cookie, (h), (o), (s), (nhp)) /* - * int bus_space_alloc __P((bus_space_tag_t t, bus_addr_t rstart, + * int bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart, * bus_addr_t rend, bus_size_t size, bus_size_t align, * bus_size_t boundary, int flags, bus_addr_t *addrp, - * bus_space_handle_t *bshp)); + * bus_space_handle_t *bshp); * * Allocate a region of bus space. */ @@ -183,8 +183,8 @@ struct vax_bus_space { (f), (ap), (hp)) /* - * int bus_space_free __P((bus_space_tag_t t, - * bus_space_handle_t bsh, bus_size_t size)); + * int bus_space_free(bus_space_tag_t t, + * bus_space_handle_t bsh, bus_size_t size); * * Free a region of bus space. */ @@ -193,8 +193,8 @@ struct vax_bus_space { (*(t)->vbs_free)((t)->vbs_cookie, (h), (s)) /* - * u_intN_t bus_space_read_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset)); + * u_intN_t bus_space_read_N(bus_space_tag_t tag, + * bus_space_handle_t bsh, bus_size_t offset); * * Read a 1, 2, 4, or 8 byte quantity from bus space * described by tag/handle/offset. @@ -216,19 +216,19 @@ struct vax_bus_space { #endif /* - * void bus_space_read_multi_N __P((bus_space_tag_t tag, + * void bus_space_read_multi_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t *addr, size_t count)); + * u_intN_t *addr, size_t count); * * Read `count' 1, 2, 4, or 8 byte quantities from bus space * described by tag/handle/offset and copy into buffer provided. */ -static __inline void vax_mem_read_multi_1 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int8_t *, size_t)); -static __inline void vax_mem_read_multi_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int16_t *, size_t)); -static __inline void vax_mem_read_multi_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int32_t *, size_t)); +static __inline void vax_mem_read_multi_1(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int8_t *, size_t); +static __inline void vax_mem_read_multi_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int16_t *, size_t); +static __inline void vax_mem_read_multi_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int32_t *, size_t); #define bus_space_read_multi_1(t, h, o, a, c) \ vax_mem_read_multi_1((t), (h), (o), (a), (c)) @@ -294,21 +294,21 @@ vax_mem_read_multi_4(t, h, o, a, c) } /* - * void bus_space_read_region_N __P((bus_space_tag_t tag, + * void bus_space_read_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t *addr, size_t count)); + * u_intN_t *addr, size_t count); * * Read `count' 1, 2, 4, or 8 byte quantities from bus space * described by tag/handle and starting at `offset' and copy into * buffer provided. */ -static __inline void vax_mem_read_region_1 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int8_t *, size_t)); -static __inline void vax_mem_read_region_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int16_t *, size_t)); -static __inline void vax_mem_read_region_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int32_t *, size_t)); +static __inline void vax_mem_read_region_1(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int8_t *, size_t); +static __inline void vax_mem_read_region_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int16_t *, size_t); +static __inline void vax_mem_read_region_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int32_t *, size_t); #define bus_space_read_region_1(t, h, o, a, c) \ do { \ @@ -377,9 +377,9 @@ vax_mem_read_region_4(t, h, o, a, c) } /* - * void bus_space_write_N __P((bus_space_tag_t tag, + * void bus_space_write_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t value)); + * u_intN_t value); * * Write the 1, 2, 4, or 8 byte value `value' to bus space * described by tag/handle/offset. @@ -407,19 +407,19 @@ do { \ #endif /* - * void bus_space_write_multi_N __P((bus_space_tag_t tag, + * void bus_space_write_multi_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * const u_intN_t *addr, size_t count)); + * const u_intN_t *addr, size_t count); * * Write `count' 1, 2, 4, or 8 byte quantities from the buffer * provided to bus space described by tag/handle/offset. */ -static __inline void vax_mem_write_multi_1 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, const u_int8_t *, size_t)); -static __inline void vax_mem_write_multi_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, const u_int16_t *, size_t)); -static __inline void vax_mem_write_multi_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, const u_int32_t *, size_t)); +static __inline void vax_mem_write_multi_1(bus_space_tag_t, + bus_space_handle_t, bus_size_t, const u_int8_t *, size_t); +static __inline void vax_mem_write_multi_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, const u_int16_t *, size_t); +static __inline void vax_mem_write_multi_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, const u_int32_t *, size_t); #define bus_space_write_multi_1(t, h, o, a, c) \ do { \ @@ -488,19 +488,19 @@ vax_mem_write_multi_4(t, h, o, a, c) } /* - * void bus_space_write_region_N __P((bus_space_tag_t tag, + * void bus_space_write_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * const u_intN_t *addr, size_t count)); + * const u_intN_t *addr, size_t count); * * Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided * to bus space described by tag/handle starting at `offset'. */ -static __inline void vax_mem_write_region_1 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, const u_int8_t *, size_t)); -static __inline void vax_mem_write_region_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, const u_int16_t *, size_t)); -static __inline void vax_mem_write_region_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, const u_int32_t *, size_t)); +static __inline void vax_mem_write_region_1(bus_space_tag_t, + bus_space_handle_t, bus_size_t, const u_int8_t *, size_t); +static __inline void vax_mem_write_region_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, const u_int16_t *, size_t); +static __inline void vax_mem_write_region_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, const u_int32_t *, size_t); #define bus_space_write_region_1(t, h, o, a, c) \ vax_mem_write_region_1((t), (h), (o), (a), (c)) @@ -567,20 +567,20 @@ vax_mem_write_region_4(t, h, o, a, c) } /* - * void bus_space_set_multi_N __P((bus_space_tag_t tag, + * void bus_space_set_multi_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, u_intN_t val, - * size_t count)); + * size_t count); * * Write the 1, 2, 4, or 8 byte value `val' to bus space described * by tag/handle/offset `count' times. */ -static __inline void vax_mem_set_multi_1 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int8_t, size_t)); -static __inline void vax_mem_set_multi_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int16_t, size_t)); -static __inline void vax_mem_set_multi_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int32_t, size_t)); +static __inline void vax_mem_set_multi_1(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int8_t, size_t); +static __inline void vax_mem_set_multi_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int16_t, size_t); +static __inline void vax_mem_set_multi_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int32_t, size_t); #define bus_space_set_multi_1(t, h, o, v, c) \ vax_mem_set_multi_1((t), (h), (o), (v), (c)) @@ -644,20 +644,20 @@ vax_mem_set_multi_4(t, h, o, v, c) #endif /* - * void bus_space_set_region_N __P((bus_space_tag_t tag, + * void bus_space_set_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, u_intN_t val, - * size_t count)); + * size_t count); * * Write `count' 1, 2, 4, or 8 byte value `val' to bus space described * by tag/handle starting at `offset'. */ -static __inline void vax_mem_set_region_1 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int8_t, size_t)); -static __inline void vax_mem_set_region_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int16_t, size_t)); -static __inline void vax_mem_set_region_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int32_t, size_t)); +static __inline void vax_mem_set_region_1(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int8_t, size_t); +static __inline void vax_mem_set_region_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int16_t, size_t); +static __inline void vax_mem_set_region_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int32_t, size_t); #define bus_space_set_region_1(t, h, o, v, c) \ vax_mem_set_region_1((t), (h), (o), (v), (c)) @@ -721,24 +721,24 @@ vax_mem_set_region_4(t, h, o, v, c) #endif /* - * void bus_space_copy_region_N __P((bus_space_tag_t tag, + * void bus_space_copy_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh1, bus_size_t off1, * bus_space_handle_t bsh2, bus_size_t off2, - * size_t count)); + * size_t count); * * Copy `count' 1, 2, 4, or 8 byte values from bus space starting * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2. */ -static __inline void vax_mem_copy_region_1 __P((bus_space_tag_t, +static __inline void vax_mem_copy_region_1(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_space_handle_t, - bus_size_t, size_t)); -static __inline void vax_mem_copy_region_2 __P((bus_space_tag_t, + bus_size_t, size_t); +static __inline void vax_mem_copy_region_2(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_space_handle_t, - bus_size_t, size_t)); -static __inline void vax_mem_copy_region_4 __P((bus_space_tag_t, + bus_size_t, size_t); +static __inline void vax_mem_copy_region_4(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_space_handle_t, - bus_size_t, size_t)); + bus_size_t, size_t); #define bus_space_copy_region_1(t, h1, o1, h2, o2, c) \ vax_mem_copy_region_1((t), (h1), (o1), (h2), (o2), (c)) @@ -843,9 +843,9 @@ vax_mem_copy_region_4(t, h1, o1, h2, o2, c) /* * Bus read/write barrier methods. * - * void bus_space_barrier __P((bus_space_tag_t tag, + * void bus_space_barrier(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * bus_size_t len, int flags)); + * bus_size_t len, int flags); * * Note: the vax does not currently require barriers, but we must * provide the flags to MI code. @@ -952,38 +952,38 @@ struct vax_bus_dma_tag { * Internal-use only utility methods. NOT TO BE USED BY * MACHINE-INDEPENDENT CODE! */ - bus_dma_tag_t (*_get_tag) __P((bus_dma_tag_t, vax_bus_t)); + bus_dma_tag_t (*_get_tag)(bus_dma_tag_t, vax_bus_t); /* * DMA mapping methods. */ - int (*_dmamap_create) __P((bus_dma_tag_t, bus_size_t, int, - bus_size_t, bus_size_t, int, bus_dmamap_t *)); - void (*_dmamap_destroy) __P((bus_dma_tag_t, bus_dmamap_t)); - int (*_dmamap_load) __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); - int (*_dmamap_load_mbuf) __P((bus_dma_tag_t, bus_dmamap_t, - struct mbuf *, int)); - int (*_dmamap_load_uio) __P((bus_dma_tag_t, bus_dmamap_t, - struct uio *, int)); - int (*_dmamap_load_raw) __P((bus_dma_tag_t, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int)); - void (*_dmamap_unload) __P((bus_dma_tag_t, bus_dmamap_t)); - void (*_dmamap_sync) __P((bus_dma_tag_t, bus_dmamap_t, - bus_addr_t, bus_size_t, int)); + int (*_dmamap_create)(bus_dma_tag_t, bus_size_t, int, + bus_size_t, bus_size_t, int, bus_dmamap_t *); + void (*_dmamap_destroy)(bus_dma_tag_t, bus_dmamap_t); + int (*_dmamap_load)(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int); + int (*_dmamap_load_mbuf)(bus_dma_tag_t, bus_dmamap_t, + struct mbuf *, int); + int (*_dmamap_load_uio)(bus_dma_tag_t, bus_dmamap_t, + struct uio *, int); + int (*_dmamap_load_raw)(bus_dma_tag_t, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int); + void (*_dmamap_unload)(bus_dma_tag_t, bus_dmamap_t); + void (*_dmamap_sync)(bus_dma_tag_t, bus_dmamap_t, + bus_addr_t, bus_size_t, int); /* * DMA memory utility functions. */ - int (*_dmamem_alloc) __P((bus_dma_tag_t, bus_size_t, bus_size_t, - bus_size_t, bus_dma_segment_t *, int, int *, int)); - void (*_dmamem_free) __P((bus_dma_tag_t, - bus_dma_segment_t *, int)); - int (*_dmamem_map) __P((bus_dma_tag_t, bus_dma_segment_t *, - int, size_t, caddr_t *, int)); - void (*_dmamem_unmap) __P((bus_dma_tag_t, caddr_t, size_t)); - paddr_t (*_dmamem_mmap) __P((bus_dma_tag_t, bus_dma_segment_t *, - int, off_t, int, int)); + int (*_dmamem_alloc)(bus_dma_tag_t, bus_size_t, bus_size_t, + bus_size_t, bus_dma_segment_t *, int, int *, int); + void (*_dmamem_free)(bus_dma_tag_t, + bus_dma_segment_t *, int); + int (*_dmamem_map)(bus_dma_tag_t, bus_dma_segment_t *, + int, size_t, caddr_t *, int); + void (*_dmamem_unmap)(bus_dma_tag_t, caddr_t, size_t); + paddr_t (*_dmamem_mmap)(bus_dma_tag_t, bus_dma_segment_t *, + int, off_t, int, int); }; #define vaxbus_dma_get_tag(t, b) \ @@ -1049,34 +1049,34 @@ struct vax_bus_dmamap { }; #ifdef _VAX_BUS_DMA_PRIVATE -int _bus_dmamap_create __P((bus_dma_tag_t, bus_size_t, int, bus_size_t, - bus_size_t, int, bus_dmamap_t *)); -void _bus_dmamap_destroy __P((bus_dma_tag_t, bus_dmamap_t)); - -int _bus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, - void *, bus_size_t, struct proc *, int)); -int _bus_dmamap_load_mbuf __P((bus_dma_tag_t, - bus_dmamap_t, struct mbuf *, int)); -int _bus_dmamap_load_uio __P((bus_dma_tag_t, - bus_dmamap_t, struct uio *, int)); -int _bus_dmamap_load_raw __P((bus_dma_tag_t, - bus_dmamap_t, bus_dma_segment_t *, int, bus_size_t, int)); - -void _bus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t)); -void _bus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t, bus_addr_t, - bus_size_t, int)); - -int _bus_dmamem_alloc __P((bus_dma_tag_t tag, bus_size_t size, +int _bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t, + bus_size_t, int, bus_dmamap_t *); +void _bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t); + +int _bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, + void *, bus_size_t, struct proc *, int); +int _bus_dmamap_load_mbuf(bus_dma_tag_t, + bus_dmamap_t, struct mbuf *, int); +int _bus_dmamap_load_uio(bus_dma_tag_t, + bus_dmamap_t, struct uio *, int); +int _bus_dmamap_load_raw(bus_dma_tag_t, + bus_dmamap_t, bus_dma_segment_t *, int, bus_size_t, int); + +void _bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t); +void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t, + bus_size_t, int); + +int _bus_dmamem_alloc(bus_dma_tag_t tag, bus_size_t size, bus_size_t alignment, bus_size_t boundary, - bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags)); -void _bus_dmamem_free __P((bus_dma_tag_t tag, bus_dma_segment_t *segs, - int nsegs)); -int _bus_dmamem_map __P((bus_dma_tag_t tag, bus_dma_segment_t *segs, - int nsegs, size_t size, caddr_t *kvap, int flags)); -void _bus_dmamem_unmap __P((bus_dma_tag_t tag, caddr_t kva, - size_t size)); -paddr_t _bus_dmamem_mmap __P((bus_dma_tag_t tag, bus_dma_segment_t *segs, - int nsegs, off_t off, int prot, int flags)); + bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags); +void _bus_dmamem_free(bus_dma_tag_t tag, bus_dma_segment_t *segs, + int nsegs); +int _bus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs, + int nsegs, size_t size, caddr_t *kvap, int flags); +void _bus_dmamem_unmap(bus_dma_tag_t tag, caddr_t kva, + size_t size); +paddr_t _bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs, + int nsegs, off_t off, int prot, int flags); #endif /* _VAX_BUS_DMA_PRIVATE */ #endif /* _VAX_BUS_H_ */ diff --git a/sys/arch/vax/include/clock.h b/sys/arch/vax/include/clock.h index e5f7d9c833e..a5a53365087 100644 --- a/sys/arch/vax/include/clock.h +++ b/sys/arch/vax/include/clock.h @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.h,v 1.4 2000/04/26 03:08:40 bjc Exp $ */ +/* $OpenBSD: clock.h,v 1.5 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: clock.h,v 1.4 1999/09/06 19:52:53 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -70,7 +70,7 @@ extern volatile short *clk_page; extern int clk_adrshift, clk_tweak; /* Prototypes */ -int generic_clkread __P((time_t)); -void generic_clkwrite __P((void)); -int chip_clkread __P((time_t)); -void chip_clkwrite __P((void)); +int generic_clkread(time_t); +void generic_clkwrite(void); +int chip_clkread(time_t); +void chip_clkwrite(void); diff --git a/sys/arch/vax/include/cpu.h b/sys/arch/vax/include/cpu.h index cdb3c3bccd0..bb24a2bc2d4 100644 --- a/sys/arch/vax/include/cpu.h +++ b/sys/arch/vax/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.11 2001/05/05 22:34:26 art Exp $ */ +/* $OpenBSD: cpu.h,v 1.12 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: cpu.h,v 1.41 1999/10/21 20:01:36 ragge Exp $ */ /* @@ -53,19 +53,19 @@ * struct for the current cpu is set up in locore.c. */ struct cpu_dep { - void (*cpu_steal_pages) __P((void)); /* pmap init before mm is on */ - int (*cpu_mchk) __P((caddr_t)); /* Machine check handling */ - void (*cpu_memerr) __P((void)); /* Memory subsystem errors */ + void (*cpu_steal_pages)(void); /* pmap init before mm is on */ + int (*cpu_mchk)(caddr_t); /* Machine check handling */ + void (*cpu_memerr)(void); /* Memory subsystem errors */ /* Autoconfiguration */ - void (*cpu_conf) __P((void)); - int (*cpu_clkread) __P((time_t)); /* Read cpu clock time */ - void (*cpu_clkwrite) __P((void)); /* Write system time to cpu */ + void (*cpu_conf)(void); + int (*cpu_clkread)(time_t); /* Read cpu clock time */ + void (*cpu_clkwrite)(void); /* Write system time to cpu */ short cpu_vups; /* speed of cpu */ short cpu_scbsz; /* (estimated) size of system control block */ - void (*cpu_halt) __P((void)); /* Cpu dependent halt call */ - void (*cpu_reboot) __P((int)); /* Cpu dependent reboot call */ - void (*cpu_clrf) __P((void)); /* Clear cold/warm start flags */ - void (*cpu_subconf) __P((struct device *));/*config cpu dep. devs */ + void (*cpu_halt)(void); /* Cpu dependent halt call */ + void (*cpu_reboot)(int); /* Cpu dependent reboot call */ + void (*cpu_clrf)(void); /* Clear cold/warm start flags */ + void (*cpu_subconf)(struct device *);/*config cpu dep. devs */ }; extern struct cpu_dep *dep_call; /* Holds pointer to current CPU struct. */ @@ -116,24 +116,24 @@ extern int want_resched; /* resched() was called */ struct device; /* Some low-level prototypes */ -int badaddr __P((caddr_t, int)); -void cpu_swapin __P((struct proc *)); -int hp_getdev __P((int, int, struct device **)); -int sd_getdev __P((int, int, int, int, char **)); -int ra_getdev __P((int, int, int, char **)); -int bdevtomaj __P((int)); -void dumpconf __P((void)); -void dumpsys __P((void)); -void swapconf __P((void)); -void disk_printtype __P((int, int)); -void disk_reallymapin __P((struct buf *, struct pte *, int, int)); -vaddr_t vax_map_physmem __P((paddr_t, int)); -void vax_unmap_physmem __P((vaddr_t, int)); -void ioaccess __P((vaddr_t, paddr_t, int)); -void iounaccess __P((vaddr_t, int)); -void findcpu __P((void)); +int badaddr(caddr_t, int); +void cpu_swapin(struct proc *); +int hp_getdev(int, int, struct device **); +int sd_getdev(int, int, int, int, char **); +int ra_getdev(int, int, int, char **); +int bdevtomaj(int); +void dumpconf(void); +void dumpsys(void); +void swapconf(void); +void disk_printtype(int, int); +void disk_reallymapin(struct buf *, struct pte *, int, int); +vaddr_t vax_map_physmem(paddr_t, int); +void vax_unmap_physmem(vaddr_t, int); +void ioaccess(vaddr_t, paddr_t, int); +void iounaccess(vaddr_t, int); +void findcpu(void); #ifdef DDB -int kdbrint __P((int)); +int kdbrint(int); #endif #endif /* _KERNEL */ #endif /* _VAX_CPU_H_ */ diff --git a/sys/arch/vax/include/db_machdep.h b/sys/arch/vax/include/db_machdep.h index de9d48ce7a4..aec47bb74d5 100644 --- a/sys/arch/vax/include/db_machdep.h +++ b/sys/arch/vax/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.8 2001/11/06 19:53:17 miod Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.9 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: db_machdep.h,v 1.6 1998/08/10 14:33:33 ragge Exp $ */ /* @@ -73,7 +73,7 @@ db_regs_t ddb_regs; /* register state */ #define inst_store(ins) 0 /* Prototypes */ -void kdb_trap __P((struct trapframe *)); +void kdb_trap(struct trapframe *); /* * We use a.out symbols in DDB. diff --git a/sys/arch/vax/include/ka820.h b/sys/arch/vax/include/ka820.h index 3eaa3a73920..8498a3f673e 100644 --- a/sys/arch/vax/include/ka820.h +++ b/sys/arch/vax/include/ka820.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ka820.h,v 1.3 2000/04/26 03:08:41 bjc Exp $ */ +/* $OpenBSD: ka820.h,v 1.4 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: ka820.h,v 1.3 2000/01/24 02:40:32 matt Exp $ */ /* * Copyright (c) 1988 Regents of the University of California. @@ -140,5 +140,5 @@ struct ka820clock { u_short csr3; }; -void crxintr __P((void *arg)); +void crxintr(void *arg); #endif diff --git a/sys/arch/vax/include/macros.h b/sys/arch/vax/include/macros.h index d17c437903a..aeb2e365714 100644 --- a/sys/arch/vax/include/macros.h +++ b/sys/arch/vax/include/macros.h @@ -1,4 +1,4 @@ -/* $OpenBSD: macros.h,v 1.8 2000/04/26 03:08:41 bjc Exp $ */ +/* $OpenBSD: macros.h,v 1.9 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: macros.h,v 1.17 1998/11/07 17:22:58 ragge Exp $ */ /* @@ -100,7 +100,7 @@ bcopy(const void *from, void *toe, u_int len) } #endif -void blkclr __P((void *, u_int)); +void blkclr(void *, u_int); static __inline__ void * memset(void *block, int c, size_t len) diff --git a/sys/arch/vax/include/param.h b/sys/arch/vax/include/param.h index 2cc57f257d8..ec5c128ed04 100644 --- a/sys/arch/vax/include/param.h +++ b/sys/arch/vax/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.21 2001/12/05 01:57:15 provos Exp $ */ +/* $OpenBSD: param.h,v 1.22 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: param.h,v 1.39 1999/10/22 21:14:34 ragge Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -213,7 +213,7 @@ #ifndef _LOCORE #include <machine/cpu.h> -void delay __P((int)); +void delay(int); /* inline macros used inside kernel */ #include <machine/macros.h> #endif diff --git a/sys/arch/vax/include/pmap.h b/sys/arch/vax/include/pmap.h index 50cbca23400..84b4a37ca3b 100644 --- a/sys/arch/vax/include/pmap.h +++ b/sys/arch/vax/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.15 2001/12/04 23:22:42 art Exp $ */ +/* $OpenBSD: pmap.h,v 1.16 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: pmap.h,v 1.37 1999/08/01 13:48:07 ragge Exp $ */ /* @@ -142,9 +142,9 @@ extern struct pmap kernel_pmap_store; :: "r"(phys): "r0","r1","r2","r3","r4","r5"); /* Prototypes */ -void pmap_bootstrap __P((void)); -vaddr_t pmap_map __P((vm_offset_t, vm_offset_t, vm_offset_t, int)); -void pmap_pinit __P((pmap_t)); +void pmap_bootstrap(void); +vaddr_t pmap_map(vm_offset_t, vm_offset_t, vm_offset_t, int); +void pmap_pinit(pmap_t); #endif /* _KERNEL */ diff --git a/sys/arch/vax/include/rpb.h b/sys/arch/vax/include/rpb.h index cdd956d5d31..5e90a6c1752 100644 --- a/sys/arch/vax/include/rpb.h +++ b/sys/arch/vax/include/rpb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rpb.h,v 1.7 2000/10/09 23:11:56 bjc Exp $ */ +/* $OpenBSD: rpb.h,v 1.8 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: rpb.h,v 1.6 1998/07/01 09:37:11 ragge Exp $ */ /* * Copyright (c) 1995 Ludd, University of Lule}, Sweden. @@ -40,8 +40,7 @@ struct rpb { /* size description */ struct rpb *rpb_base; /* 4 physical base address of block */ - void (*rpb_restart)/* 4 physical address of restart routine */ - __P((void)); + void (*rpb_restart)/* 4 physical address of restart routine */(void); long rpb_chksum;/* 4 checksum of first 31 longwords of restart */ long rpb_rstflg; /* 4 Restart in progress flag */ long rpb_haltpc; /* 4 PC at HALT/restart */ diff --git a/sys/arch/vax/include/sgmap.h b/sys/arch/vax/include/sgmap.h index 43042d05a7b..52d1f68cd57 100644 --- a/sys/arch/vax/include/sgmap.h +++ b/sys/arch/vax/include/sgmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sgmap.h,v 1.4 2001/02/06 04:27:44 hugh Exp $ */ +/* $OpenBSD: sgmap.h,v 1.5 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: sgmap.h,v 1.3 2000/05/17 21:22:18 matt Exp $ */ /*- @@ -63,26 +63,26 @@ struct vax_sgmap { unsigned int aps_flags; /* flags */ }; -void vax_sgmap_init __P((bus_dma_tag_t, struct vax_sgmap *, - const char *, bus_addr_t, bus_size_t, struct pte *, bus_size_t)); +void vax_sgmap_init(bus_dma_tag_t, struct vax_sgmap *, + const char *, bus_addr_t, bus_size_t, struct pte *, bus_size_t); -int vax_sgmap_alloc __P((bus_dmamap_t, bus_size_t, - struct vax_sgmap *, int)); -void vax_sgmap_free __P((bus_dmamap_t, struct vax_sgmap *)); +int vax_sgmap_alloc(bus_dmamap_t, bus_size_t, + struct vax_sgmap *, int); +void vax_sgmap_free(bus_dmamap_t, struct vax_sgmap *); -int vax_sgmap_load __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int, struct vax_sgmap *)); +int vax_sgmap_load(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int, struct vax_sgmap *); -int vax_sgmap_load_mbuf __P((bus_dma_tag_t, bus_dmamap_t, - struct mbuf *, int, struct vax_sgmap *)); +int vax_sgmap_load_mbuf(bus_dma_tag_t, bus_dmamap_t, + struct mbuf *, int, struct vax_sgmap *); -int vax_sgmap_load_uio __P((bus_dma_tag_t, bus_dmamap_t, - struct uio *, int, struct vax_sgmap *)); +int vax_sgmap_load_uio(bus_dma_tag_t, bus_dmamap_t, + struct uio *, int, struct vax_sgmap *); -int vax_sgmap_load_raw __P((bus_dma_tag_t, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int, struct vax_sgmap *)); +int vax_sgmap_load_raw(bus_dma_tag_t, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int, struct vax_sgmap *); -void vax_sgmap_unload __P(( bus_dma_tag_t, bus_dmamap_t, - struct vax_sgmap *)); +void vax_sgmap_unload( bus_dma_tag_t, bus_dmamap_t, + struct vax_sgmap *); #endif /* _VAX_COMMON_SGMAPVAR_H */ diff --git a/sys/arch/vax/include/vsbus.h b/sys/arch/vax/include/vsbus.h index 2b99b7d7758..91d58a21ca1 100644 --- a/sys/arch/vax/include/vsbus.h +++ b/sys/arch/vax/include/vsbus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vsbus.h,v 1.6 2001/08/25 13:33:36 hugh Exp $ */ +/* $OpenBSD: vsbus.h,v 1.7 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: vsbus.h,v 1.13 2000/06/25 16:00:46 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -88,7 +88,7 @@ struct vsbus_attach_args { vaddr_t va_addr; /* virtual CSR address */ paddr_t va_paddr; /* physical CSR address */ - void (*va_ivec) __P((void *)); /* Interrupt routine */ + void (*va_ivec)(void *); /* Interrupt routine */ void *va_vecarg; /* Interrupt routine argument */ short va_br; /* Interrupt level */ diff --git a/sys/arch/vax/mba/hp.c b/sys/arch/vax/mba/hp.c index 962b2c689ee..3d8b3f74d43 100644 --- a/sys/arch/vax/mba/hp.c +++ b/sys/arch/vax/mba/hp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hp.c,v 1.10 2000/04/27 03:14:44 bjc Exp $ */ +/* $OpenBSD: hp.c,v 1.11 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: hp.c,v 1.22 2000/02/12 16:09:33 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -74,19 +74,19 @@ struct hp_softc { int sc_physnr; /* Physical disk number */ }; -int hpmatch __P((struct device *, struct cfdata *, void *)); -void hpattach __P((struct device *, struct device *, void *)); -void hpstrategy __P((struct buf *)); -void hpstart __P((struct mba_device *)); -int hpattn __P((struct mba_device *)); -enum xfer_action hpfinish __P((struct mba_device *, int, int *)); -int hpopen __P((dev_t, int, int)); -int hpclose __P((dev_t, int, int)); -int hpioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); -int hpdump __P((dev_t, caddr_t, caddr_t, size_t)); -int hpread __P((dev_t, struct uio *)); -int hpwrite __P((dev_t, struct uio *)); -int hpsize __P((dev_t)); +int hpmatch(struct device *, struct cfdata *, void *); +void hpattach(struct device *, struct device *, void *); +void hpstrategy(struct buf *); +void hpstart(struct mba_device *); +int hpattn(struct mba_device *); +enum xfer_action hpfinish(struct mba_device *, int, int *); +int hpopen(dev_t, int, int); +int hpclose(dev_t, int, int); +int hpioctl(dev_t, u_long, caddr_t, int, struct proc *); +int hpdump(dev_t, caddr_t, caddr_t, size_t); +int hpread(dev_t, struct uio *); +int hpwrite(dev_t, struct uio *); +int hpsize(dev_t); struct cfattach hp_ca = { sizeof(struct hp_softc), hpmatch, hpattach diff --git a/sys/arch/vax/mba/mba.c b/sys/arch/vax/mba/mba.c index 7e6a056eb0e..fa1a9f5a379 100644 --- a/sys/arch/vax/mba/mba.c +++ b/sys/arch/vax/mba/mba.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mba.c,v 1.8 2001/11/06 19:53:17 miod Exp $ */ +/* $OpenBSD: mba.c,v 1.9 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: mba.c,v 1.18 2000/01/24 02:40:36 matt Exp $ */ /* * Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden. @@ -70,13 +70,13 @@ struct mbaunit mbaunit[] = { {0, 0, 0} }; -int mbamatch __P((struct device *, struct cfdata *, void *)); -void mbaattach __P((struct device *, struct device *, void *)); -void mbaintr __P((void *)); -int mbaprint __P((void *, const char *)); -void mbaqueue __P((struct mba_device *)); -void mbastart __P((struct mba_softc *)); -void mbamapregs __P((struct mba_softc *)); +int mbamatch(struct device *, struct cfdata *, void *); +void mbaattach(struct device *, struct device *, void *); +void mbaintr(void *); +int mbaprint(void *, const char *); +void mbaqueue(struct mba_device *); +void mbastart(struct mba_softc *); +void mbamapregs(struct mba_softc *); struct cfattach mba_cmi_ca = { sizeof(struct mba_softc), mbamatch, mbaattach diff --git a/sys/arch/vax/mba/mbavar.h b/sys/arch/vax/mba/mbavar.h index cc1c59a5706..d1b51450027 100644 --- a/sys/arch/vax/mba/mbavar.h +++ b/sys/arch/vax/mba/mbavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mbavar.h,v 1.4 2000/04/27 03:14:45 bjc Exp $ */ +/* $OpenBSD: mbavar.h,v 1.5 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: mbavar.h,v 1.5 2000/01/21 23:39:56 thorpej Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden @@ -91,11 +91,11 @@ struct mba_attach_args { struct mba_device { struct mba_device *md_back; /* linked list of runnable devices */ /* Start routine to be called by mbastart. */ - void (*md_start) __P((struct mba_device *)); + void (*md_start)(struct mba_device *); /* Routine to be called after attn intr */ - int (*md_attn)__P((struct mba_device *)); + int (*md_attn)(struct mba_device *); /* Call after xfer finish */ - enum xfer_action (*md_finish) __P((struct mba_device *, int, int *)); + enum xfer_action (*md_finish)(struct mba_device *, int, int *); void *md_softc; /* Backpointer to this units softc. */ struct mba_softc *md_mba; struct buf_queue md_q; /* queue of I/O requests */ @@ -118,5 +118,5 @@ struct mbaunit { }; /* Common prototypes */ -void mbaqueue __P((struct mba_device *)); +void mbaqueue(struct mba_device *); diff --git a/sys/arch/vax/mscp/mscp_disk.c b/sys/arch/vax/mscp/mscp_disk.c index 6d7ab2c5729..a4fdc8649f4 100644 --- a/sys/arch/vax/mscp/mscp_disk.c +++ b/sys/arch/vax/mscp/mscp_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mscp_disk.c,v 1.9 2001/12/05 03:04:38 hugh Exp $ */ +/* $OpenBSD: mscp_disk.c,v 1.10 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: mscp_disk.c,v 1.30 2001/11/13 07:38:28 lukem Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -100,23 +100,23 @@ struct ra_softc { #define rx_softc ra_softc -void rxattach __P((struct device *, struct device *, void *)); -int rx_putonline __P((struct rx_softc *)); -void rrmakelabel __P((struct disklabel *, long)); +void rxattach(struct device *, struct device *, void *); +int rx_putonline(struct rx_softc *); +void rrmakelabel(struct disklabel *, long); #if NRA -int ramatch __P((struct device *, struct cfdata *, void *)); -void raattach __P((struct device *, struct device *, void *)); -int raopen __P((dev_t, int, int, struct proc *)); -int raclose __P((dev_t, int, int, struct proc *)); -void rastrategy __P((struct buf *)); -int raread __P((dev_t, struct uio *)); -int rawrite __P((dev_t, struct uio *)); -int raioctl __P((dev_t, int, caddr_t, int, struct proc *)); -int radump __P((dev_t, daddr_t, caddr_t, size_t)); -int rasize __P((dev_t)); -int ra_putonline __P((struct ra_softc *)); +int ramatch(struct device *, struct cfdata *, void *); +void raattach(struct device *, struct device *, void *); +int raopen(dev_t, int, int, struct proc *); +int raclose(dev_t, int, int, struct proc *); +void rastrategy(struct buf *); +int raread(dev_t, struct uio *); +int rawrite(dev_t, struct uio *); +int raioctl(dev_t, int, caddr_t, int, struct proc *); +int radump(dev_t, daddr_t, caddr_t, size_t); +int rasize(dev_t); +int ra_putonline(struct ra_softc *); struct cfattach ra_ca = { sizeof(struct ra_softc), (cfmatch_t)ramatch, rxattach @@ -528,15 +528,15 @@ int ra_getdev(adaptor, controller, unit, uname) #if NRX -int rxmatch __P((struct device *, struct cfdata *, void *)); -int rxopen __P((dev_t, int, int, struct proc *)); -int rxclose __P((dev_t, int, int, struct proc *)); -void rxstrategy __P((struct buf *)); -int rxread __P((dev_t, struct uio *)); -int rxwrite __P((dev_t, struct uio *)); -int rxioctl __P((dev_t, int, caddr_t, int, struct proc *)); -int rxdump __P((dev_t, daddr_t, caddr_t, size_t)); -int rxsize __P((dev_t)); +int rxmatch(struct device *, struct cfdata *, void *); +int rxopen(dev_t, int, int, struct proc *); +int rxclose(dev_t, int, int, struct proc *); +void rxstrategy(struct buf *); +int rxread(dev_t, struct uio *); +int rxwrite(dev_t, struct uio *); +int rxioctl(dev_t, int, caddr_t, int, struct proc *); +int rxdump(dev_t, daddr_t, caddr_t, size_t); +int rxsize(dev_t); struct cfattach rx_ca = { sizeof(struct rx_softc), (cfmatch_t)rxmatch, rxattach @@ -820,14 +820,14 @@ rxsize(dev) #endif /* NRX */ -void rrdgram __P((struct device *, struct mscp *, struct mscp_softc *)); -void rriodone __P((struct device *, struct buf *)); -int rronline __P((struct device *, struct mscp *)); -int rrgotstatus __P((struct device *, struct mscp *)); -void rrreplace __P((struct device *, struct mscp *)); -int rrioerror __P((struct device *, struct mscp *, struct buf *)); -void rrfillin __P((struct buf *, struct mscp *)); -void rrbb __P((struct device *, struct mscp *, struct buf *)); +void rrdgram(struct device *, struct mscp *, struct mscp_softc *); +void rriodone(struct device *, struct buf *); +int rronline(struct device *, struct mscp *); +int rrgotstatus(struct device *, struct mscp *); +void rrreplace(struct device *, struct mscp *); +int rrioerror(struct device *, struct mscp *, struct buf *); +void rrfillin(struct buf *, struct mscp *); +void rrbb(struct device *, struct mscp *, struct buf *); struct mscp_device ra_device = { diff --git a/sys/arch/vax/mscp/mscp_subr.c b/sys/arch/vax/mscp/mscp_subr.c index 15f8a4a9d22..00c4a798cdd 100644 --- a/sys/arch/vax/mscp/mscp_subr.c +++ b/sys/arch/vax/mscp/mscp_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mscp_subr.c,v 1.4 2001/12/05 03:04:38 hugh Exp $ */ +/* $OpenBSD: mscp_subr.c,v 1.5 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: mscp_subr.c,v 1.18 2001/11/13 07:38:28 lukem Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -63,12 +63,12 @@ #define b_forw b_hash.le_next -int mscp_match __P((struct device *, struct cfdata *, void *)); -void mscp_attach __P((struct device *, struct device *, void *)); -void mscp_start __P((struct mscp_softc *)); -int mscp_init __P((struct mscp_softc *)); -void mscp_initds __P((struct mscp_softc *)); -int mscp_waitstep __P((struct mscp_softc *, int, int)); +int mscp_match(struct device *, struct cfdata *, void *); +void mscp_attach(struct device *, struct device *, void *); +void mscp_start(struct mscp_softc *); +int mscp_init(struct mscp_softc *); +void mscp_initds(struct mscp_softc *); +int mscp_waitstep(struct mscp_softc *, int, int); struct cfattach mscpbus_ca = { sizeof(struct mscp_softc), (cfmatch_t)mscp_match, mscp_attach diff --git a/sys/arch/vax/mscp/mscp_tape.c b/sys/arch/vax/mscp/mscp_tape.c index bdc5bf58a1d..4b88d804d67 100644 --- a/sys/arch/vax/mscp/mscp_tape.c +++ b/sys/arch/vax/mscp/mscp_tape.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mscp_tape.c,v 1.6 2001/12/05 03:04:38 hugh Exp $ */ +/* $OpenBSD: mscp_tape.c,v 1.7 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: mscp_tape.c,v 1.16 2001/11/13 07:38:28 lukem Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -77,24 +77,24 @@ struct mt_softc { #define MT_OFFLINE 0 #define MT_ONLINE 1 -int mtmatch __P((struct device *, struct cfdata *, void *)); -void mtattach __P((struct device *, struct device *, void *)); -void mtdgram __P((struct device *, struct mscp *, struct mscp_softc *)); -void mtiodone __P((struct device *, struct buf *)); -int mtonline __P((struct device *, struct mscp *)); -int mtgotstatus __P((struct device *, struct mscp *)); -int mtioerror __P((struct device *, struct mscp *, struct buf *)); -void mtfillin __P((struct buf *, struct mscp *)); -int mtopen __P((dev_t, int, int, struct proc *)); -int mtclose __P((dev_t, int, int, struct proc *)); -void mtstrategy __P((struct buf *)); -int mtread __P((dev_t, struct uio *)); -int mtwrite __P((dev_t, struct uio *)); -int mtioctl __P((dev_t, int, caddr_t, int, struct proc *)); -int mtdump __P((dev_t, daddr_t, caddr_t, size_t)); -int mtcmd __P((struct mt_softc *, int, int, int)); -void mtcmddone __P((struct device *, struct mscp *)); -int mt_putonline __P((struct mt_softc *)); +int mtmatch(struct device *, struct cfdata *, void *); +void mtattach(struct device *, struct device *, void *); +void mtdgram(struct device *, struct mscp *, struct mscp_softc *); +void mtiodone(struct device *, struct buf *); +int mtonline(struct device *, struct mscp *); +int mtgotstatus(struct device *, struct mscp *); +int mtioerror(struct device *, struct mscp *, struct buf *); +void mtfillin(struct buf *, struct mscp *); +int mtopen(dev_t, int, int, struct proc *); +int mtclose(dev_t, int, int, struct proc *); +void mtstrategy(struct buf *); +int mtread(dev_t, struct uio *); +int mtwrite(dev_t, struct uio *); +int mtioctl(dev_t, int, caddr_t, int, struct proc *); +int mtdump(dev_t, daddr_t, caddr_t, size_t); +int mtcmd(struct mt_softc *, int, int, int); +void mtcmddone(struct device *, struct mscp *); +int mt_putonline(struct mt_softc *); struct mscp_device mt_device = { mtdgram, diff --git a/sys/arch/vax/mscp/mscpvar.h b/sys/arch/vax/mscp/mscpvar.h index 0e0654be62b..e51901ec482 100644 --- a/sys/arch/vax/mscp/mscpvar.h +++ b/sys/arch/vax/mscp/mscpvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mscpvar.h,v 1.3 2000/04/27 03:14:46 bjc Exp $ */ +/* $OpenBSD: mscpvar.h,v 1.4 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: mscpvar.h,v 1.7 1999/06/06 19:16:18 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -81,35 +81,23 @@ struct mscp_xi { }; struct mscp_ctlr { - void (*mc_ctlrdone) /* controller operation complete */ - __P((struct device *)); - void (*mc_go) /* device-specific start routine */ - __P((struct device *, struct mscp_xi *)); - void (*mc_saerror) /* ctlr error handling */ - __P((struct device *, int)); + void (*mc_ctlrdone) /* controller operation complete */(struct device *); + void (*mc_go) /* device-specific start routine */(struct device *, struct mscp_xi *); + void (*mc_saerror) /* ctlr error handling */(struct device *, int); }; struct mscp_softc; struct mscp_device { - void (*me_dgram) /* error datagram */ - __P((struct device *, struct mscp *, struct mscp_softc *)); - void (*me_iodone) /* normal I/O is done */ - __P((struct device *, struct buf *)); - int (*me_online) /* drive on line */ - __P((struct device *, struct mscp *)); - int (*me_gotstatus) /* got unit status */ - __P((struct device *, struct mscp *)); - void (*me_replace) /* replace done */ - __P((struct device *, struct mscp *)); - int (*me_ioerr) /* read or write failed */ - __P((struct device *, struct mscp *, struct buf *)); - void (*me_bb) /* B_BAD io done */ - __P((struct device *, struct mscp *, struct buf *)); - void (*me_fillin) /* Fill in mscp info for this drive */ - __P((struct buf *,struct mscp *)); - void (*me_cmddone) /* Non-data transfer operation is done */ - __P((struct device *, struct mscp *)); + void (*me_dgram) /* error datagram */(struct device *, struct mscp *, struct mscp_softc *); + void (*me_iodone) /* normal I/O is done */(struct device *, struct buf *); + int (*me_online) /* drive on line */(struct device *, struct mscp *); + int (*me_gotstatus) /* got unit status */(struct device *, struct mscp *); + void (*me_replace) /* replace done */(struct device *, struct mscp *); + int (*me_ioerr) /* read or write failed */(struct device *, struct mscp *, struct buf *); + void (*me_bb) /* B_BAD io done */(struct device *, struct mscp *, struct buf *); + void (*me_fillin) /* Fill in mscp info for this drive */(struct buf *,struct mscp *); + void (*me_cmddone) /* Non-data transfer operation is done */(struct device *, struct mscp *); }; /* @@ -236,16 +224,16 @@ struct mscp_softc { } /* Prototypes */ -struct mscp *mscp_getcp __P((struct mscp_softc *, int)); -void mscp_printevent __P((struct mscp *)); -void mscp_go __P((struct mscp_softc *, struct mscp *, int)); -void mscp_requeue __P((struct mscp_softc *)); -void mscp_dorsp __P((struct mscp_softc *)); -int mscp_decodeerror __P((char *, struct mscp *, struct mscp_softc *)); -int mscp_print __P((void *, const char *)); -void mscp_hexdump __P((struct mscp *)); -void mscp_strategy __P((struct buf *, struct device *)); -void mscp_printtype __P((int, int)); -int mscp_waitstep __P((struct mscp_softc *, int, int)); -void mscp_dgo __P((struct mscp_softc *, struct mscp_xi *)); -void mscp_intr __P((struct mscp_softc *)); +struct mscp *mscp_getcp(struct mscp_softc *, int); +void mscp_printevent(struct mscp *); +void mscp_go(struct mscp_softc *, struct mscp *, int); +void mscp_requeue(struct mscp_softc *); +void mscp_dorsp(struct mscp_softc *); +int mscp_decodeerror(char *, struct mscp *, struct mscp_softc *); +int mscp_print(void *, const char *); +void mscp_hexdump(struct mscp *); +void mscp_strategy(struct buf *, struct device *); +void mscp_printtype(int, int); +int mscp_waitstep(struct mscp_softc *, int, int); +void mscp_dgo(struct mscp_softc *, struct mscp_xi *); +void mscp_intr(struct mscp_softc *); diff --git a/sys/arch/vax/qbus/dhu.c b/sys/arch/vax/qbus/dhu.c index dcdff248727..9b300742c22 100644 --- a/sys/arch/vax/qbus/dhu.c +++ b/sys/arch/vax/qbus/dhu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhu.c,v 1.3 2002/02/15 20:45:30 nordin Exp $ */ +/* $OpenBSD: dhu.c,v 1.4 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: dhu.c,v 1.17 2000/01/24 02:40:28 matt Exp $ */ /* * Copyright (c) 1996 Ken C. Wellsch. All rights reserved. @@ -131,21 +131,21 @@ static struct speedtab dhuspeedtab[] = { { -1, -1 } }; -static int dhu_match __P((struct device *, struct cfdata *, void *)); -static void dhu_attach __P((struct device *, struct device *, void *)); -static void dhurint __P((void *)); -static void dhuxint __P((void *)); -static void dhustart __P((struct tty *)); -static int dhuparam __P((struct tty *, struct termios *)); -static int dhuiflow __P((struct tty *, int)); -static unsigned dhumctl __P((struct dhu_softc *,int, int, int)); - int dhuopen __P((dev_t, int, int, struct proc *)); - int dhuclose __P((dev_t, int, int, struct proc *)); - int dhuread __P((dev_t, struct uio *, int)); - int dhuwrite __P((dev_t, struct uio *, int)); - int dhuioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); - void dhustop __P((struct tty *, int)); -struct tty * dhutty __P((dev_t)); +static int dhu_match(struct device *, struct cfdata *, void *); +static void dhu_attach(struct device *, struct device *, void *); +static void dhurint(void *); +static void dhuxint(void *); +static void dhustart(struct tty *); +static int dhuparam(struct tty *, struct termios *); +static int dhuiflow(struct tty *, int); +static unsigned dhumctl(struct dhu_softc *,int, int, int); + int dhuopen(dev_t, int, int, struct proc *); + int dhuclose(dev_t, int, int, struct proc *); + int dhuread(dev_t, struct uio *, int); + int dhuwrite(dev_t, struct uio *, int); + int dhuioctl(dev_t, u_long, caddr_t, int, struct proc *); + void dhustop(struct tty *, int); +struct tty * dhutty(dev_t); struct cfattach dhu_ca = { sizeof(struct dhu_softc), (cfmatch_t)dhu_match, dhu_attach diff --git a/sys/arch/vax/qbus/dl.c b/sys/arch/vax/qbus/dl.c index 1663a559601..d398c06f17d 100644 --- a/sys/arch/vax/qbus/dl.c +++ b/sys/arch/vax/qbus/dl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dl.c,v 1.2 2002/01/16 20:50:17 miod Exp $ */ +/* $OpenBSD: dl.c,v 1.3 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: dl.c,v 1.11 2000/01/24 02:40:29 matt Exp $ */ /*- @@ -107,20 +107,20 @@ struct dl_softc { struct tty *sc_tty; }; -static int dl_match __P((struct device *, struct cfdata *, void *)); -static void dl_attach __P((struct device *, struct device *, void *)); -static void dlrint __P((void *)); -static void dlxint __P((void *)); -static void dlstart __P((struct tty *)); -static int dlparam __P((struct tty *, struct termios *)); -static void dlbrk __P((struct dl_softc *, int)); -struct tty * dltty __P((dev_t)); - int dlopen __P((dev_t, int, int, struct proc *)); - int dlclose __P((dev_t, int, int, struct proc *)); - int dlread __P((dev_t, struct uio *, int)); - int dlwrite __P((dev_t, struct uio *, int)); - int dlioctl __P((dev_t, int, caddr_t, int, struct proc *)); - void dlstop __P((struct tty *, int)); +static int dl_match(struct device *, struct cfdata *, void *); +static void dl_attach(struct device *, struct device *, void *); +static void dlrint(void *); +static void dlxint(void *); +static void dlstart(struct tty *); +static int dlparam(struct tty *, struct termios *); +static void dlbrk(struct dl_softc *, int); +struct tty * dltty(dev_t); + int dlopen(dev_t, int, int, struct proc *); + int dlclose(dev_t, int, int, struct proc *); + int dlread(dev_t, struct uio *, int); + int dlwrite(dev_t, struct uio *, int); + int dlioctl(dev_t, int, caddr_t, int, struct proc *); + void dlstop(struct tty *, int); struct cfattach dl_ca = { sizeof(struct dl_softc), (cfmatch_t)dl_match, dl_attach diff --git a/sys/arch/vax/qbus/dz_uba.c b/sys/arch/vax/qbus/dz_uba.c index a1869c06f5d..b0b8168a17b 100644 --- a/sys/arch/vax/qbus/dz_uba.c +++ b/sys/arch/vax/qbus/dz_uba.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dz_uba.c,v 1.3 2002/01/16 20:50:17 miod Exp $ */ +/* $OpenBSD: dz_uba.c,v 1.4 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: dz_uba.c,v 1.11 2000/06/04 06:17:02 matt Exp $ */ /* * Copyright (c) 1998 Ludd, University of Lule}, Sweden. All rights reserved. @@ -54,8 +54,8 @@ #include <arch/vax/qbus/dzreg.h> #include <arch/vax/qbus/dzvar.h> -static int dz_uba_match __P((struct device *, struct cfdata *, void *)); -static void dz_uba_attach __P((struct device *, struct device *, void *)); +static int dz_uba_match(struct device *, struct cfdata *, void *); +static void dz_uba_attach(struct device *, struct device *, void *); struct cfattach dz_uba_ca = { sizeof(struct dz_softc), (cfmatch_t)dz_uba_match, dz_uba_attach diff --git a/sys/arch/vax/qbus/qd.c b/sys/arch/vax/qbus/qd.c index ec0543d173b..993c8332674 100644 --- a/sys/arch/vax/qbus/qd.c +++ b/sys/arch/vax/qbus/qd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qd.c,v 1.2 2001/11/06 19:53:17 miod Exp $ */ +/* $OpenBSD: qd.c,v 1.3 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: qd.c,v 1.17 2000/01/24 02:40:29 matt Exp $ */ /*- @@ -240,12 +240,12 @@ int QDlast_DMAtype; /* type of the last DMA operation */ */ #define TOY ((time.tv_sec * 100) + (time.tv_usec / 10000)) -void qd_attach __P((struct device *, struct device *, void *)); -static int qd_match __P((struct device *, struct cfdata *, void *)); +void qd_attach(struct device *, struct device *, void *); +static int qd_match(struct device *, struct cfdata *, void *); -static void qddint __P((void *)); /* DMA gate array intrpt service */ -static void qdaint __P((void *)); /* Dragon ADDER intrpt service */ -static void qdiint __P((void *)); +static void qddint(void *); /* DMA gate array intrpt service */ +static void qdaint(void *); /* Dragon ADDER intrpt service */ +static void qdiint(void *); #define QDPRIOR (PZERO-1) /* must be negative */ #define FALSE 0 @@ -330,17 +330,17 @@ extern char *q_special[]; extern struct cdevsw *consops; cons_decl(qd); cdev_decl(qd); -void setup_dragon __P((int)); -void init_shared __P((int)); -void clear_qd_screen __P((int)); -void ldfont __P((int)); -void ldcursor __P((int, short *)); -void setup_input __P((int)); -void blitc __P((int, u_char)); -void scroll_up __P((volatile struct adder *)); -void write_ID __P((volatile struct adder *, short, short)); -int wait_status __P((volatile struct adder *, int)); -void led_control __P((int, int, int)); +void setup_dragon(int); +void init_shared(int); +void clear_qd_screen(int); +void ldfont(int); +void ldcursor(int, short *); +void setup_input(int); +void blitc(int, u_char); +void scroll_up(volatile struct adder *); +void write_ID(volatile struct adder *, short, short); +int wait_status(volatile struct adder *, int); +void led_control(int, int, int); void qdstart(struct tty *); void qdearly(void); int qdpolling = 0; diff --git a/sys/arch/vax/qbus/ubavar.h b/sys/arch/vax/qbus/ubavar.h index 90a086a003d..cc401eb8acd 100644 --- a/sys/arch/vax/qbus/ubavar.h +++ b/sys/arch/vax/qbus/ubavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ubavar.h,v 1.2 2001/08/25 13:33:37 hugh Exp $ */ +/* $OpenBSD: ubavar.h,v 1.3 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: ubavar.h,v 1.29 2000/06/04 06:17:04 matt Exp $ */ /* @@ -74,11 +74,11 @@ struct uba_softc { SIMPLEQ_HEAD(, uba_unit) uh_resq; /* resource wait chain */ SIMPLEQ_HEAD(, uba_reset) uh_resetq; /* ubareset queue */ int uh_lastiv; /* last free interrupt vector */ - int (*uh_errchk) __P((struct uba_softc *)); - void (*uh_beforescan) __P((struct uba_softc *)); - void (*uh_afterscan) __P((struct uba_softc *)); - void (*uh_ubainit) __P((struct uba_softc *)); - void (*uh_ubapurge) __P((struct uba_softc *, int)); + int (*uh_errchk)(struct uba_softc *); + void (*uh_beforescan)(struct uba_softc *); + void (*uh_afterscan)(struct uba_softc *); + void (*uh_ubainit)(struct uba_softc *); + void (*uh_ubapurge)(struct uba_softc *, int); short uh_nr; /* Unibus sequential number */ bus_space_tag_t uh_iot; /* Tag for this Unibus */ bus_space_handle_t uh_ioh; /* Handle for I/O space */ @@ -95,7 +95,7 @@ struct uba_unit { SIMPLEQ_ENTRY(uba_unit) uu_resq;/* Queue while waiting for resources */ void *uu_softc; /* Pointer to units softc */ int uu_bdp; /* for controllers that hang on to bdp's */ - int (*uu_ready) __P((struct uba_unit *)); + int (*uu_ready)(struct uba_unit *); void *uu_ref; /* Buffer this is related to */ short uu_xclu; /* want exclusive use of bdp's */ short uu_keepbdp; /* hang on to bdp's once allocated */ diff --git a/sys/arch/vax/qbus/uda.c b/sys/arch/vax/qbus/uda.c index 791e5c03dee..71bc3a648b0 100644 --- a/sys/arch/vax/qbus/uda.c +++ b/sys/arch/vax/qbus/uda.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uda.c,v 1.2 2001/08/25 13:33:37 hugh Exp $ */ +/* $OpenBSD: uda.c,v 1.3 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: uda.c,v 1.36 2000/06/04 06:17:05 matt Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -78,15 +78,15 @@ struct uda_softc { int sc_inq; }; -static int udamatch __P((struct device *, struct cfdata *, void *)); -static void udaattach __P((struct device *, struct device *, void *)); +static int udamatch(struct device *, struct cfdata *, void *); +static void udaattach(struct device *, struct device *, void *); static void udareset(struct device *); -static void udaintr __P((void *)); -int udaready __P((struct uba_unit *)); -void udactlrdone __P((struct device *)); -int udaprint __P((void *, const char *)); -void udasaerror __P((struct device *, int)); -void udago __P((struct device *, struct mscp_xi *)); +static void udaintr(void *); +int udaready(struct uba_unit *); +void udactlrdone(struct device *); +int udaprint(void *, const char *); +void udasaerror(struct device *, int); +void udago(struct device *, struct mscp_xi *); struct cfattach mtc_ca = { sizeof(struct uda_softc), (cfmatch_t)udamatch, udaattach diff --git a/sys/arch/vax/stand/boot/consio.c b/sys/arch/vax/stand/boot/consio.c index 78c50c89472..39775324c5b 100644 --- a/sys/arch/vax/stand/boot/consio.c +++ b/sys/arch/vax/stand/boot/consio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: consio.c,v 1.2 2000/10/04 04:38:08 bjc Exp $ */ +/* $OpenBSD: consio.c,v 1.3 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: consio.c,v 1.11 2000/07/19 00:58:24 matt Exp $ */ /* * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden. @@ -44,31 +44,31 @@ #include "data.h" -void setup __P((void)); +void setup(void); unsigned *bootregs; extern struct rpb *rpb; struct bqo *bqo; -static int (*put_fp) __P((int)) = NULL; -static int (*get_fp) __P((void)) = NULL; -static int (*test_fp) __P((void)) = NULL; +static int (*put_fp)(int) = NULL; +static int (*get_fp)(void) = NULL; +static int (*test_fp)(void) = NULL; /* Also added such a thing for KA53 - MK-991208 */ unsigned char *ka53_conspage; -void ka53_consinit __P((void)); +void ka53_consinit(void); -int ka53_rom_putchar __P((int c)); -int ka53_rom_getchar __P((void)); -int ka53_rom_testchar __P((void)); +int ka53_rom_putchar(int c); +int ka53_rom_getchar(void); +int ka53_rom_testchar(void); -int pr_putchar __P((int c)); /* putchar() using mtpr/mfpr */ -int pr_getchar __P((void)); -int pr_testchar __P((void)); +int pr_putchar(int c); /* putchar() using mtpr/mfpr */ +int pr_getchar(void); +int pr_testchar(void); -int rom_putchar __P((int c)); /* putchar() using ROM routines */ -int rom_getchar __P((void)); -int rom_testchar __P((void)); +int rom_putchar(int c); /* putchar() using ROM routines */ +int rom_getchar(void); +int rom_testchar(void); static int rom_putc; /* ROM-address of put-routine */ static int rom_getc; /* ROM-address of get-routine */ @@ -88,11 +88,11 @@ static int rom_getc; /* ROM-address of get-routine */ /* Pointer to KA630 console page, initialized by ka630_consinit */ unsigned char *ka630_conspage; /* Function that initializes things for KA630 ROM console I/O */ -void ka630_consinit __P((void)); +void ka630_consinit(void); /* Functions that use KA630 ROM for console I/O */ -int ka630_rom_putchar __P((int c)); -int ka630_rom_getchar __P((void)); -int ka630_rom_testchar __P((void)); +int ka630_rom_putchar(int c); +int ka630_rom_getchar(void); +int ka630_rom_testchar(void); putchar(c) int c; diff --git a/sys/arch/vax/stand/boot/ctu.c b/sys/arch/vax/stand/boot/ctu.c index 3f2c9afb891..acdd35a7c70 100644 --- a/sys/arch/vax/stand/boot/ctu.c +++ b/sys/arch/vax/stand/boot/ctu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ctu.c,v 1.1 2000/04/27 02:26:25 bjc Exp $ */ +/* $OpenBSD: ctu.c,v 1.2 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: ctu.c,v 1.1 1996/02/17 18:23:20 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -59,8 +59,8 @@ volatile struct tu_softc { int sc_bbytes; /* Number of xfer'd bytes this block */ } tu_sc; -void ctutintr __P((void)); -void cturintr __P((void)); +void ctutintr(void); +void cturintr(void); int ctuopen(f, adapt, ctlr, unit, part) diff --git a/sys/arch/vax/stand/boot/netio.c b/sys/arch/vax/stand/boot/netio.c index f458f57d710..116e28f2c9c 100644 --- a/sys/arch/vax/stand/boot/netio.c +++ b/sys/arch/vax/stand/boot/netio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netio.c,v 1.2 2001/04/10 12:27:54 bjc Exp $ */ +/* $OpenBSD: netio.c,v 1.3 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: netio.c,v 1.4 1999/06/30 18:38:03 ragge Exp $ */ /*- @@ -111,7 +111,7 @@ int netio_ask = 0; /* default to bootparam, can override */ static char input_line[100]; -int netmountroot __P((struct open_file *, char *)); +int netmountroot(struct open_file *, char *); /* * Called by devopen after it sets f->f_dev to our devsw entry. diff --git a/sys/arch/vax/stand/xxboot/bootxx.c b/sys/arch/vax/stand/xxboot/bootxx.c index 62673d86b53..e91679f2a9e 100644 --- a/sys/arch/vax/stand/xxboot/bootxx.c +++ b/sys/arch/vax/stand/xxboot/bootxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bootxx.c,v 1.2 2000/10/04 04:16:40 bjc Exp $ */ +/* $OpenBSD: bootxx.c,v 1.3 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: bootxx.c,v 1.2 1999/10/23 14:40:38 ragge Exp $ */ /*- * Copyright (c) 1982, 1986 The Regents of the University of California. @@ -64,8 +64,8 @@ struct rom_softc { int unit; } rom_softc; -int romstrategy __P((void *, int, daddr_t, size_t, void *, size_t *)); -int romopen __P((struct open_file *, int, int, int, int)); +int romstrategy(void *, int, daddr_t, size_t, void *, size_t *); +int romopen(struct open_file *, int, int, int, int); struct fs_ops file_system[] = { { ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek, ufs_stat } @@ -77,7 +77,7 @@ struct devsw devsw[] = { }; int ndevs = (sizeof(devsw)/sizeof(devsw[0])); -int command __P((int cmd, int arg)); +int command(int cmd, int arg); /* * Boot program... argume passed in r10 and r11 determine whether boot diff --git a/sys/arch/vax/uba/ts.c b/sys/arch/vax/uba/ts.c index 6af1c7de714..97db187bf21 100644 --- a/sys/arch/vax/uba/ts.c +++ b/sys/arch/vax/uba/ts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ts.c,v 1.6 2002/02/15 20:45:30 nordin Exp $ */ +/* $OpenBSD: ts.c,v 1.7 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: ts.c,v 1.11 1997/01/11 11:34:43 ragge Exp $ */ /*- @@ -179,25 +179,25 @@ struct ts_softc { short sc_ipl; /* interrupt priority, Q-bus */ }; -void tsintr __P((int)); -int tsinit __P((struct ts_softc *)); -void tscommand __P((dev_t, int, int)); -int tsstatus __P((int)); -int tsexec __P((int, int)); -int tsstart __P((struct ts_softc *, struct buf *)); -int tswchar __P((int)); -void tsreset __P((int)); -void tsxstatus __P((struct tsmsg *)); -int tsmatch __P((struct device *, void *, void *)); -void tsattach __P((struct device *, struct device *, void *)); -void tsstrategy __P((struct buf *)); - -int tsopen __P((dev_t, int, int, struct proc *)); -int tsclose __P((dev_t, int, int, struct proc *)); -int tsioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); -int tsread __P((dev_t, struct uio *)); -int tswrite __P((dev_t, struct uio *)); -int tsdump __P((dev_t, daddr_t, caddr_t, size_t)); +void tsintr(int); +int tsinit(struct ts_softc *); +void tscommand(dev_t, int, int); +int tsstatus(int); +int tsexec(int, int); +int tsstart(struct ts_softc *, struct buf *); +int tswchar(int); +void tsreset(int); +void tsxstatus(struct tsmsg *); +int tsmatch(struct device *, void *, void *); +void tsattach(struct device *, struct device *, void *); +void tsstrategy(struct buf *); + +int tsopen(dev_t, int, int, struct proc *); +int tsclose(dev_t, int, int, struct proc *); +int tsioctl(dev_t, u_long, caddr_t, int, struct proc *); +int tsread(dev_t, struct uio *); +int tswrite(dev_t, struct uio *); +int tsdump(dev_t, daddr_t, caddr_t, size_t); struct cfdriver ts_cd = { NULL, "ts", DV_DULL diff --git a/sys/arch/vax/uba/uba.c b/sys/arch/vax/uba/uba.c index a26fca24888..b11a8236aef 100644 --- a/sys/arch/vax/uba/uba.c +++ b/sys/arch/vax/uba/uba.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uba.c,v 1.14 2002/01/18 02:09:27 miod Exp $ */ +/* $OpenBSD: uba.c,v 1.15 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: uba.c,v 1.43 2000/01/24 02:40:36 matt Exp $ */ /* * Copyright (c) 1996 Jonathan Stone. @@ -68,12 +68,12 @@ volatile int /* rbr, rcvec,*/ svec; -static int ubasearch __P((struct device *, struct cfdata *, void *)); -static int ubaprint __P((void *, const char *)); +static int ubasearch(struct device *, struct cfdata *, void *); +static int ubaprint(void *, const char *); #if 0 -static void ubastray __P((int)); +static void ubastray(int); #endif -static void ubainitmaps __P((struct uba_softc *)); +static void ubainitmaps(struct uba_softc *); extern struct cfdriver uba_cd; @@ -81,7 +81,7 @@ extern struct cfdriver uba_cd; #if defined(DW780) || defined(DW750) -int dw_match __P((struct device *, struct cfdata *, void *)); +int dw_match(struct device *, struct cfdata *, void *); int dw_match(parent, cf, aux) @@ -109,14 +109,14 @@ dw_match(parent, cf, aux) /* * The DW780 are directly connected to the SBI on 11/780 and 8600. */ -void dw780_attach __P((struct device *, struct device *, void *)); -void dw780_beforescan __P((struct uba_softc *)); -void dw780_afterscan __P((struct uba_softc *)); -int dw780_errchk __P((struct uba_softc *)); -void dw780_init __P((struct uba_softc *)); -void dw780_purge __P((struct uba_softc *, int)); -void uba_dw780int __P((int)); -static void ubaerror __P((struct uba_softc *, int *, int *)); +void dw780_attach(struct device *, struct device *, void *); +void dw780_beforescan(struct uba_softc *); +void dw780_afterscan(struct uba_softc *); +int dw780_errchk(struct uba_softc *); +void dw780_init(struct uba_softc *); +void dw780_purge(struct uba_softc *, int); +void uba_dw780int(int); +static void ubaerror(struct uba_softc *, int *, int *); struct cfattach uba_sbi_ca = { sizeof(struct uba_softc), dw_match, dw780_attach @@ -318,9 +318,9 @@ ubaerror(uh, ipl, uvec) * and bus status/command registers, the latter are (partly) IPR's * on 750. */ -void dw750_attach __P((struct device *, struct device *, void *)); -void dw750_init __P((struct uba_softc *)); -void dw750_purge __P((struct uba_softc *, int)); +void dw750_attach(struct device *, struct device *, void *); +void dw750_init(struct uba_softc *); +void dw750_purge(struct uba_softc *, int); struct cfattach uba_cmi_ca = { sizeof(struct uba_softc), dw_match, dw750_attach @@ -377,10 +377,10 @@ dw750_purge(sc, bdp) * This driver can only handle map registers up to 1MB due to map info * storage, but that should be enough for normal purposes. */ -int qba_match __P((struct device *, struct cfdata *, void *)); -void qba_attach __P((struct device *, struct device *, void *)); -void qba_beforescan __P((struct uba_softc*)); -void qba_init __P((struct uba_softc*)); +int qba_match(struct device *, struct cfdata *, void *); +void qba_attach(struct device *, struct device *, void *); +void qba_beforescan(struct uba_softc*); +void qba_init(struct uba_softc*); struct cfattach uba_mainbus_ca = { sizeof(struct uba_softc), qba_match, qba_attach diff --git a/sys/arch/vax/uba/uba_cmi.c b/sys/arch/vax/uba/uba_cmi.c index 22ce4ee8897..de8f78a15d3 100644 --- a/sys/arch/vax/uba/uba_cmi.c +++ b/sys/arch/vax/uba/uba_cmi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uba_cmi.c,v 1.1 2000/04/27 03:14:51 bjc Exp $ */ +/* $OpenBSD: uba_cmi.c,v 1.2 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: uba_cmi.c,v 1.2 1999/08/14 11:31:48 ragge Exp $ */ /* * Copyright (c) 1996 Jonathan Stone. @@ -64,11 +64,11 @@ * and bus status/command registers, the latter are (partly) IPR's * on 750. */ -static int dw750_match __P((struct device *, struct cfdata *, void *)); -static void dw750_attach __P((struct device *, struct device *, void *)); -static void dw750_init __P((struct uba_softc*)); +static int dw750_match(struct device *, struct cfdata *, void *); +static void dw750_attach(struct device *, struct device *, void *); +static void dw750_init(struct uba_softc*); #ifdef notyet -static void dw750_purge __P((struct uba_softc *, int)); +static void dw750_purge(struct uba_softc *, int); #endif struct cfattach uba_cmi_ca = { diff --git a/sys/arch/vax/uba/uba_common.h b/sys/arch/vax/uba/uba_common.h index deafdd2cf20..564657d2d42 100644 --- a/sys/arch/vax/uba/uba_common.h +++ b/sys/arch/vax/uba/uba_common.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uba_common.h,v 1.1 2000/04/27 03:14:51 bjc Exp $ */ +/* $OpenBSD: uba_common.h,v 1.2 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: uba_common.h,v 1.2 1999/06/21 16:23:01 ragge Exp $ */ /*- * Copyright (c) 1982, 1986 The Regents of the University of California. @@ -85,4 +85,4 @@ struct uba_regs { int pad3[UBAIOPAGES]; /* no maps for device address space */ }; -void uba_dma_init __P((struct uba_vsoftc *)); +void uba_dma_init(struct uba_vsoftc *); diff --git a/sys/arch/vax/uba/uba_dma.c b/sys/arch/vax/uba/uba_dma.c index eaa15da03f1..b188e78f1fb 100644 --- a/sys/arch/vax/uba/uba_dma.c +++ b/sys/arch/vax/uba/uba_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uba_dma.c,v 1.2 2001/11/06 19:53:17 miod Exp $ */ +/* $OpenBSD: uba_dma.c,v 1.3 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: uba_dma.c,v 1.2 1999/06/20 00:59:55 ragge Exp $ */ /*- @@ -55,27 +55,27 @@ #include <arch/vax/uba/uba_common.h> -int uba_bus_dmamap_create_sgmap __P((bus_dma_tag_t, bus_size_t, int, - bus_size_t, bus_size_t, int, bus_dmamap_t *)); +int uba_bus_dmamap_create_sgmap(bus_dma_tag_t, bus_size_t, int, + bus_size_t, bus_size_t, int, bus_dmamap_t *); -void uba_bus_dmamap_destroy_sgmap __P((bus_dma_tag_t, bus_dmamap_t)); +void uba_bus_dmamap_destroy_sgmap(bus_dma_tag_t, bus_dmamap_t); -int uba_bus_dmamap_load_sgmap __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); +int uba_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int); -int uba_bus_dmamap_load_mbuf_sgmap __P((bus_dma_tag_t, bus_dmamap_t, - struct mbuf *, int)); +int uba_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t, + struct mbuf *, int); -int uba_bus_dmamap_load_uio_sgmap __P((bus_dma_tag_t, bus_dmamap_t, - struct uio *, int)); +int uba_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t, + struct uio *, int); -int uba_bus_dmamap_load_raw_sgmap __P((bus_dma_tag_t, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int)); +int uba_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int); -void uba_bus_dmamap_unload_sgmap __P((bus_dma_tag_t, bus_dmamap_t)); +void uba_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t); -void uba_bus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t, bus_addr_t, - bus_size_t, int)); +void uba_bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t, + bus_size_t, int); void uba_dma_init(sc) diff --git a/sys/arch/vax/uba/uba_ibus.c b/sys/arch/vax/uba/uba_ibus.c index 3b118e1caa1..bdd009d4514 100644 --- a/sys/arch/vax/uba/uba_ibus.c +++ b/sys/arch/vax/uba/uba_ibus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uba_ibus.c,v 1.1 2000/04/27 03:14:51 bjc Exp $ */ +/* $OpenBSD: uba_ibus.c,v 1.2 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: uba_ibus.c,v 1.1 1999/08/07 10:36:47 ragge Exp $ */ /* * Copyright (c) 1996 Jonathan Stone. @@ -63,10 +63,10 @@ * It has an address space of 4MB (22 address bits), therefore the name, * and is hardware compatible with all 16 and 18 bits Q-bus devices. */ -static int qba_match __P((struct device *, struct cfdata *, void *)); -static void qba_attach __P((struct device *, struct device *, void *)); -static void qba_beforescan __P((struct uba_softc*)); -static void qba_init __P((struct uba_softc*)); +static int qba_match(struct device *, struct cfdata *, void *); +static void qba_attach(struct device *, struct device *, void *); +static void qba_beforescan(struct uba_softc*); +static void qba_init(struct uba_softc*); struct cfattach uba_ibus_ca = { sizeof(struct uba_vsoftc), (cfmatch_t)qba_match, qba_attach diff --git a/sys/arch/vax/uba/uba_mainbus.c b/sys/arch/vax/uba/uba_mainbus.c index c5f6daa57bd..b4b7d7173cc 100644 --- a/sys/arch/vax/uba/uba_mainbus.c +++ b/sys/arch/vax/uba/uba_mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uba_mainbus.c,v 1.1 2000/04/27 03:14:51 bjc Exp $ */ +/* $OpenBSD: uba_mainbus.c,v 1.2 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: uba_mainbus.c,v 1.2 1999/06/06 19:00:53 ragge Exp $ */ /* * Copyright (c) 1996 Jonathan Stone. @@ -63,10 +63,10 @@ * It has an address space of 4MB (22 address bits), therefore the name, * and is hardware compatible with all 16 and 18 bits Q-bus devices. */ -static int qba_match __P((struct device *, struct cfdata *, void *)); -static void qba_attach __P((struct device *, struct device *, void *)); -static void qba_beforescan __P((struct uba_softc*)); -static void qba_init __P((struct uba_softc*)); +static int qba_match(struct device *, struct cfdata *, void *); +static void qba_attach(struct device *, struct device *, void *); +static void qba_beforescan(struct uba_softc*); +static void qba_init(struct uba_softc*); struct cfattach uba_mainbus_ca = { sizeof(struct uba_vsoftc), qba_match, qba_attach diff --git a/sys/arch/vax/uba/uba_sbi.c b/sys/arch/vax/uba/uba_sbi.c index 6941e261e52..90d46bbaadf 100644 --- a/sys/arch/vax/uba/uba_sbi.c +++ b/sys/arch/vax/uba/uba_sbi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uba_sbi.c,v 1.1 2000/04/27 03:14:51 bjc Exp $ */ +/* $OpenBSD: uba_sbi.c,v 1.2 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: uba_sbi.c,v 1.1 1999/06/21 16:23:01 ragge Exp $ */ /* * Copyright (c) 1996 Jonathan Stone. @@ -85,16 +85,16 @@ char ubasr_bits[] = UBASR_BITS; /* * The DW780 are directly connected to the SBI on 11/780 and 8600. */ -static int dw780_match __P((struct device *, struct cfdata *, void *)); -static void dw780_attach __P((struct device *, struct device *, void *)); -static void dw780_init __P((struct uba_softc*)); -static void dw780_beforescan __P((struct uba_softc *)); -static void dw780_afterscan __P((struct uba_softc *)); -static int dw780_errchk __P((struct uba_softc *)); -static void uba_dw780int __P((int)); -static void ubaerror __P((struct uba_softc *, int *, int *)); +static int dw780_match(struct device *, struct cfdata *, void *); +static void dw780_attach(struct device *, struct device *, void *); +static void dw780_init(struct uba_softc*); +static void dw780_beforescan(struct uba_softc *); +static void dw780_afterscan(struct uba_softc *); +static int dw780_errchk(struct uba_softc *); +static void uba_dw780int(int); +static void ubaerror(struct uba_softc *, int *, int *); #ifdef notyet -static void dw780_purge __P((struct uba_softc *, int)); +static void dw780_purge(struct uba_softc *, int); #endif struct cfattach uba_sbi_ca = { @@ -212,7 +212,7 @@ uba_dw780int(uba) int br, vec, arg; struct uba_vsoftc *vc = uba_cd.cd_devs[uba]; struct uba_regs *ur = vc->uv_uba; - void (*func) __P((int)); + void (*func)(int); br = mfpr(PR_IPL); vec = ur->uba_brrvr[br - 0x14]; diff --git a/sys/arch/vax/uba/ubavar.h b/sys/arch/vax/uba/ubavar.h index f479dd3ec65..a397a841486 100644 --- a/sys/arch/vax/uba/ubavar.h +++ b/sys/arch/vax/uba/ubavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ubavar.h,v 1.10 2002/01/18 02:09:27 miod Exp $ */ +/* $OpenBSD: ubavar.h,v 1.11 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: ubavar.h,v 1.21 1999/01/19 21:04:48 ragge Exp $ */ /* @@ -79,7 +79,7 @@ struct uba_softc { struct pte *uh_mr; /* start of page map */ int uh_memsize; /* size of uba memory, pages */ caddr_t uh_iopage; /* start of uba io page */ - void (**uh_reset) __P((int));/* UBA reset function array */ + void (**uh_reset)(int);/* UBA reset function array */ int *uh_resarg; /* array of ubareset args */ int uh_resno; /* Number of devices to reset */ short uh_mrwant; /* someone is waiting for map reg */ @@ -94,11 +94,11 @@ struct uba_softc { int uh_lastmem; /* limit of any unibus memory */ struct extent *uh_ext; /* register free map */ char *uh_extspace; /* storage space for uh_ext */ - int (*uh_errchk) __P((struct uba_softc *)); - void (*uh_beforescan) __P((struct uba_softc *)); - void (*uh_afterscan) __P((struct uba_softc *)); - void (*uh_ubainit) __P((struct uba_softc *)); - void (*uh_ubapurge) __P((struct uba_softc *, int)); + int (*uh_errchk)(struct uba_softc *); + void (*uh_beforescan)(struct uba_softc *); + void (*uh_afterscan)(struct uba_softc *); + void (*uh_ubainit)(struct uba_softc *); + void (*uh_ubapurge)(struct uba_softc *, int); short uh_nr; /* Unibus sequential number */ short uh_nbdp; /* # of BDP's */ int uh_ibase; /* Base address for vectors */ @@ -117,7 +117,7 @@ struct uba_unit { void *uu_softc; /* Pointer to units softc */ int uu_ubinfo; /* save unibus registers, etc */ int uu_bdp; /* for controllers that hang on to bdp's */ - int (*uu_ready) __P((struct uba_unit *)); + int (*uu_ready)(struct uba_unit *); short uu_xclu; /* want exclusive use of bdp's */ short uu_keepbdp; /* hang on to bdp's once allocated */ }; @@ -129,9 +129,9 @@ struct uba_unit { struct uba_attach_args { caddr_t ua_addr; /* Pointer to int routine, filled in by probe*/ - void (*ua_ivec) __P((int)); + void (*ua_ivec)(int); /* UBA reset routine, filled in by probe */ - void (*ua_reset) __P((int)); + void (*ua_reset)(int); int ua_iaddr; int ua_br; int ua_cvec; @@ -175,13 +175,13 @@ struct ubinfo { #define ubago(ui) ubaqueue(ui) #define b_forw b_hash.le_next /* Nice to have when handling uba queues */ -void uba_attach __P((struct uba_softc *, unsigned long)); -int uballoc __P((struct uba_softc *, caddr_t, int, int)); -void ubarelse __P((struct uba_softc *, int *)); -int ubaqueue __P((struct uba_unit *, struct buf *)); -void ubadone __P((struct uba_unit *)); -void ubareset __P((int)); -int ubasetup __P((struct uba_softc *, struct buf *, int)); +void uba_attach(struct uba_softc *, unsigned long); +int uballoc(struct uba_softc *, caddr_t, int, int); +void ubarelse(struct uba_softc *, int *); +int ubaqueue(struct uba_unit *, struct buf *); +void ubadone(struct uba_unit *); +void ubareset(int); +int ubasetup(struct uba_softc *, struct buf *, int); #endif /* _KERNEL */ #endif /* !_LOCORE */ diff --git a/sys/arch/vax/uba/uda.c b/sys/arch/vax/uba/uda.c index 6129b401fb0..fceb9dbeb74 100644 --- a/sys/arch/vax/uba/uda.c +++ b/sys/arch/vax/uba/uda.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uda.c,v 1.9 1997/09/12 09:28:14 maja Exp $ */ +/* $OpenBSD: uda.c,v 1.10 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: uda.c,v 1.25 1997/07/04 13:26:02 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -89,19 +89,19 @@ struct uda_softc { int sc_wticks; /* watchdog timer ticks */ }; -static int udamatch __P((struct device *, void *, void *)); -static void udaattach __P((struct device *, struct device *, void *)); -static void udareset __P((int)); -static void mtcreset __P((int)); -static void reset __P((struct uda_softc *)); -static void udaintr __P((int)); -static void mtcintr __P((int)); -static void intr __P((struct uda_softc *)); -int udaready __P((struct uba_unit *)); -void udactlrdone __P((struct device *, int)); -int udaprint __P((void *, const char *)); -void udasaerror __P((struct device *, int)); -int udago __P((struct device *, struct buf *)); +static int udamatch(struct device *, void *, void *); +static void udaattach(struct device *, struct device *, void *); +static void udareset(int); +static void mtcreset(int); +static void reset(struct uda_softc *); +static void udaintr(int); +static void mtcintr(int); +static void intr(struct uda_softc *); +int udaready(struct uba_unit *); +void udactlrdone(struct device *, int); +int udaprint(void *, const char *); +void udasaerror(struct device *, int); +int udago(struct device *, struct buf *); struct cfdriver mtc_cd = { NULL, "mtc", DV_DULL diff --git a/sys/arch/vax/vax/autoconf.c b/sys/arch/vax/vax/autoconf.c index d231cf91a8b..f2410fd171c 100644 --- a/sys/arch/vax/vax/autoconf.c +++ b/sys/arch/vax/vax/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.15 2001/11/06 19:53:17 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.16 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: autoconf.c,v 1.45 1999/10/23 14:56:05 ragge Exp $ */ /* @@ -59,9 +59,9 @@ #include <vax/bi/bireg.h> -void cpu_dumpconf __P((void)); /* machdep.c */ -void gencnslask __P((void)); -void setroot __P((void)); /* rootfil.c */ +void cpu_dumpconf(void); /* machdep.c */ +void gencnslask(void); +void setroot(void); /* rootfil.c */ struct cpu_dep *dep_call; int mastercpu; /* chief of the system */ @@ -100,9 +100,9 @@ cpu_configure() (*dep_call->cpu_clrf)(); } -int mainbus_print __P((void *, const char *)); -int mainbus_match __P((struct device *, struct cfdata *, void *)); -void mainbus_attach __P((struct device *, struct device *, void *)); +int mainbus_print(void *, const char *); +int mainbus_match(struct device *, struct cfdata *, void *); +void mainbus_attach(struct device *, struct device *, void *); int mainbus_print(aux, hej) diff --git a/sys/arch/vax/vax/bus_dma.c b/sys/arch/vax/vax/bus_dma.c index 0a00fe0d71a..52a49d7f042 100644 --- a/sys/arch/vax/vax/bus_dma.c +++ b/sys/arch/vax/vax/bus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_dma.c,v 1.9 2002/01/16 20:50:17 miod Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.10 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: bus_dma.c,v 1.5 1999/11/13 00:32:20 thorpej Exp $ */ /*- @@ -65,11 +65,11 @@ extern vaddr_t avail_start, avail_end, virtual_avail; -int _bus_dmamap_load_buffer __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int, vm_offset_t *, int *, int)); -int _bus_dma_inrange __P((bus_dma_segment_t *, int, bus_addr_t)); -int _bus_dmamem_alloc_range __P((bus_dma_tag_t, bus_size_t, bus_size_t, - bus_size_t, bus_dma_segment_t*, int, int *, int, vaddr_t, vaddr_t)); +int _bus_dmamap_load_buffer(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int, vm_offset_t *, int *, int); +int _bus_dma_inrange(bus_dma_segment_t *, int, bus_addr_t); +int _bus_dmamem_alloc_range(bus_dma_tag_t, bus_size_t, bus_size_t, + bus_size_t, bus_dma_segment_t*, int, int *, int, vaddr_t, vaddr_t); /* * Common function for DMA map creation. May be called by bus-specific * DMA map creation functions. diff --git a/sys/arch/vax/vax/cfl.c b/sys/arch/vax/vax/cfl.c index 3818797ad9a..4ad1b69e5f4 100644 --- a/sys/arch/vax/vax/cfl.c +++ b/sys/arch/vax/vax/cfl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cfl.c,v 1.2 2000/04/27 01:10:11 bjc Exp $ */ +/* $OpenBSD: cfl.c,v 1.3 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: cfl.c,v 1.2 1998/04/13 12:10:26 ragge Exp $ */ /*- * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -87,11 +87,11 @@ struct { #define CFL_FINISH 6 #define CFL_GETIN 7 -static void cflstart __P((void)); +static void cflstart(void); -int cflopen __P((dev_t, int, struct proc *)); -int cflclose __P((dev_t, int, struct proc *)); -int cflrw __P((dev_t, struct uio *, int)); +int cflopen(dev_t, int, struct proc *); +int cflclose(dev_t, int, struct proc *); +int cflrw(dev_t, struct uio *, int); /*ARGSUSED*/ int @@ -200,7 +200,7 @@ cflstart() #endif } -void cfltint __P((int)); +void cfltint(int); void cfltint(arg) @@ -234,7 +234,7 @@ cfltint(arg) } } -void cflrint __P((int)); +void cflrint(int); void cflrint(ch) diff --git a/sys/arch/vax/vax/clock.c b/sys/arch/vax/vax/clock.c index bccec3885ff..217daee4a82 100644 --- a/sys/arch/vax/vax/clock.c +++ b/sys/arch/vax/vax/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.13 2001/11/14 21:35:50 miod Exp $ */ +/* $OpenBSD: clock.c,v 1.14 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: clock.c,v 1.35 2000/06/04 06:16:58 matt Exp $ */ /* * Copyright (c) 1995 Ludd, University of Lule}, Sweden. @@ -44,8 +44,8 @@ #include <machine/cpu.h> #include <machine/uvax.h> -int yeartonum __P((int)); -int numtoyear __P((int)); +int yeartonum(int); +int numtoyear(int); struct evcnt clock_intrcnt; diff --git a/sys/arch/vax/vax/cmi.c b/sys/arch/vax/vax/cmi.c index 21dc53f3070..ec7182df536 100644 --- a/sys/arch/vax/vax/cmi.c +++ b/sys/arch/vax/vax/cmi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmi.c,v 1.1 2000/04/27 01:10:10 bjc Exp $ */ +/* $OpenBSD: cmi.c,v 1.2 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: cmi.c,v 1.2 1999/08/14 11:30:48 ragge Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. @@ -40,9 +40,9 @@ #include <machine/sid.h> #include <machine/ka750.h> -static int cmi_print __P((void *, const char *)); -static int cmi_match __P((struct device *, struct cfdata *, void *)); -static void cmi_attach __P((struct device *, struct device *, void*)); +static int cmi_print(void *, const char *); +static int cmi_match(struct device *, struct cfdata *, void *); +static void cmi_attach(struct device *, struct device *, void*); struct cfattach cmi_ca = { sizeof(struct device), cmi_match, cmi_attach diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c index de1f076231a..2ad52c41d5e 100644 --- a/sys/arch/vax/vax/conf.c +++ b/sys/arch/vax/vax/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.32 2001/12/13 09:20:47 hugh Exp $ */ +/* $OpenBSD: conf.c,v 1.33 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: conf.c,v 1.44 1999/10/27 16:38:54 ragge Exp $ */ /*- @@ -244,7 +244,7 @@ struct consdev constab[]={ }; /* Special for console storage */ -#define dev_type_rw(n) int n __P((dev_t, int, int, struct proc *)) +#define dev_type_rw(n) int n(dev_t, int, int, struct proc *) /* plotters - open, close, write, ioctl, select*/ #define cdev_plotter_init(c,n) { \ diff --git a/sys/arch/vax/vax/crl.c b/sys/arch/vax/vax/crl.c index efb49a37655..012b2d09cd3 100644 --- a/sys/arch/vax/vax/crl.c +++ b/sys/arch/vax/vax/crl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crl.c,v 1.4 2000/04/27 01:10:11 bjc Exp $ */ +/* $OpenBSD: crl.c,v 1.5 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: crl.c,v 1.6 2000/01/24 02:40:33 matt Exp $ */ /*- * Copyright (c) 1982, 1986 The Regents of the University of California. @@ -67,13 +67,13 @@ struct { int crl_ds; /* saved drive status */ } crlstat; -void crlintr __P((void *)); -void crlattach __P((void)); -static void crlstart __P((void)); +void crlintr(void *); +void crlattach(void); +static void crlstart(void); -int crlopen __P((dev_t, int, struct proc *)); -int crlclose __P((dev_t, int, struct proc *)); -int crlrw __P((dev_t, struct uio *, int)); +int crlopen(dev_t, int, struct proc *); +int crlclose(dev_t, int, struct proc *); +int crlrw(dev_t, struct uio *, int); struct ivec_dsp crl_intr; diff --git a/sys/arch/vax/vax/crx.c b/sys/arch/vax/vax/crx.c index 96b937389e9..12c01a86aaf 100644 --- a/sys/arch/vax/vax/crx.c +++ b/sys/arch/vax/vax/crx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crx.c,v 1.1 2000/04/27 01:10:10 bjc Exp $ */ +/* $OpenBSD: crx.c,v 1.2 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: crx.c,v 1.4 2000/01/24 02:40:33 matt Exp $ */ /* * Copyright (c) 1988 Regents of the University of California. @@ -129,7 +129,7 @@ crxclose(dev, flags, fmt, p) /* * Perform a read (uio->uio_rw==UIO_READ) or write (uio->uio_rw==UIO_WRITE). */ -int crxrw __P((dev_t, struct uio *, int)); +int crxrw(dev_t, struct uio *, int); int crxrw(dev, uio, flags) dev_t dev; diff --git a/sys/arch/vax/vax/ctu.c b/sys/arch/vax/vax/ctu.c index 25089a2d7e3..1b558eed1f7 100644 --- a/sys/arch/vax/vax/ctu.c +++ b/sys/arch/vax/vax/ctu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ctu.c,v 1.4 2000/04/27 01:10:11 bjc Exp $ */ +/* $OpenBSD: ctu.c,v 1.5 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: ctu.c,v 1.10 2000/03/23 06:46:44 thorpej Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -87,18 +87,18 @@ struct tu_softc { struct ivec_dsp tu_recv, tu_xmit; -void ctutintr __P((void *)); -void cturintr __P((void *)); -void ctuattach __P((void)); -void ctustart __P((struct buf *)); -void ctuwatch __P((void *)); -short ctu_cksum __P((unsigned short *, int)); - -int ctuopen __P((dev_t, int, int, struct proc *)); -int ctuclose __P((dev_t, int, int, struct proc *)); -void ctustrategy __P((struct buf *)); -int ctuioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); -int ctudump __P((dev_t, daddr_t, caddr_t, size_t)); +void ctutintr(void *); +void cturintr(void *); +void ctuattach(void); +void ctustart(struct buf *); +void ctuwatch(void *); +short ctu_cksum(unsigned short *, int); + +int ctuopen(dev_t, int, int, struct proc *); +int ctuclose(dev_t, int, int, struct proc *); +void ctustrategy(struct buf *); +int ctuioctl(dev_t, u_long, caddr_t, int, struct proc *); +int ctudump(dev_t, daddr_t, caddr_t, size_t); static struct callout ctu_watch_ch = CALLOUT_INITIALIZER; diff --git a/sys/arch/vax/vax/db_disasm.c b/sys/arch/vax/vax/db_disasm.c index 7425c411b11..9045e326d56 100644 --- a/sys/arch/vax/vax/db_disasm.c +++ b/sys/arch/vax/vax/db_disasm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_disasm.c,v 1.9 2001/04/01 20:16:47 hugh Exp $ */ +/* $OpenBSD: db_disasm.c,v 1.10 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: db_disasm.c,v 1.10 1998/04/13 12:10:27 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -116,20 +116,20 @@ typedef struct { #define ITYPE_BRANCH 1 #define ITYPE_CALL 2 -int get_byte __P((inst_buffer * ib)); -int get_word __P((inst_buffer * ib)); -int get_long __P((inst_buffer * ib)); +int get_byte(inst_buffer * ib); +int get_word(inst_buffer * ib); +int get_long(inst_buffer * ib); -int get_opcode __P((inst_buffer * ib)); -int get_operands __P((inst_buffer * ib)); -int get_operand __P((inst_buffer * ib, int size)); +int get_opcode(inst_buffer * ib); +int get_operands(inst_buffer * ib); +int get_operand(inst_buffer * ib, int size); -void add_char __P((inst_buffer * ib, int c)); -void add_str __P((inst_buffer * ib, char *s)); -void add_int __P((inst_buffer * ib, int i)); -void add_xint __P((inst_buffer * ib, int i)); -void add_sym __P((inst_buffer * ib, int i)); -void add_off __P((inst_buffer * ib, int i)); +void add_char(inst_buffer * ib, int c); +void add_str(inst_buffer * ib, char *s); +void add_int(inst_buffer * ib, int i); +void add_xint(inst_buffer * ib, int i); +void add_sym(inst_buffer * ib, int i); +void add_off(inst_buffer * ib, int i); #define err_print printf diff --git a/sys/arch/vax/vax/db_machdep.c b/sys/arch/vax/vax/db_machdep.c index ab4c3ddf0f9..931038f0829 100644 --- a/sys/arch/vax/vax/db_machdep.c +++ b/sys/arch/vax/vax/db_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.c,v 1.10 2001/11/06 19:53:17 miod Exp $ */ +/* $OpenBSD: db_machdep.c,v 1.11 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: db_machdep.c,v 1.17 1999/06/20 00:58:23 ragge Exp $ */ /* @@ -63,7 +63,7 @@ extern label_t *db_recover; -void kdbprinttrap __P((int, int)); +void kdbprinttrap(int, int); int db_active = 0; diff --git a/sys/arch/vax/vax/disksubr.c b/sys/arch/vax/vax/disksubr.c index dae5a7b9926..efacafeabf3 100644 --- a/sys/arch/vax/vax/disksubr.c +++ b/sys/arch/vax/vax/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.16 2002/01/25 01:20:39 miod Exp $ */ +/* $OpenBSD: disksubr.c,v 1.17 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1999/06/30 18:48:06 ragge Exp $ */ /* @@ -120,7 +120,7 @@ bad: char * readdisklabel(dev, strat, lp, osdep, spoofonly) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); register struct disklabel *lp; struct cpu_disklabel *osdep; int spoofonly; @@ -241,7 +241,7 @@ setdisklabel(olp, nlp, openmask, osdep) int writedisklabel(dev, strat, lp, osdep) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); register struct disklabel *lp; struct cpu_disklabel *osdep; { diff --git a/sys/arch/vax/vax/dzcons.c b/sys/arch/vax/vax/dzcons.c index 8160e35445c..bb97d781b16 100644 --- a/sys/arch/vax/vax/dzcons.c +++ b/sys/arch/vax/vax/dzcons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dzcons.c,v 1.3 1997/09/10 12:04:44 maja Exp $ */ +/* $OpenBSD: dzcons.c,v 1.4 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: dzcons.c,v 1.5 1997/03/22 12:51:01 ragge Exp $ */ /* * Copyright (c) 1994 Gordon W. Ross @@ -103,7 +103,7 @@ struct tty *dzcn_tty[1]; int dzcnparam(); void dzcnstart(); -int ka410_consintr_enable __P((void)); +int ka410_consintr_enable(void); int dzcnopen(dev, flag, mode, p) diff --git a/sys/arch/vax/vax/gencons.c b/sys/arch/vax/vax/gencons.c index ec41eac6342..3ee281922fb 100644 --- a/sys/arch/vax/vax/gencons.c +++ b/sys/arch/vax/vax/gencons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gencons.c,v 1.13 2002/01/31 11:42:51 hugh Exp $ */ +/* $OpenBSD: gencons.c,v 1.14 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: gencons.c,v 1.22 2000/01/24 02:40:33 matt Exp $ */ /* @@ -67,8 +67,8 @@ static int pr_rxdb[4] = {PR_RXDB, PR_RXDB1, PR_RXDB2, PR_RXDB3}; cons_decl(gen); cdev_decl(gencn); -static int gencnparam __P((struct tty *, struct termios *)); -static void gencnstart __P((struct tty *)); +static int gencnparam(struct tty *, struct termios *); +static void gencnstart(struct tty *); int gencnopen(dev, flag, mode, p) diff --git a/sys/arch/vax/vax/gencons.h b/sys/arch/vax/vax/gencons.h index b33b435b9f0..f85625ef45e 100644 --- a/sys/arch/vax/vax/gencons.h +++ b/sys/arch/vax/vax/gencons.h @@ -1,4 +1,4 @@ -/* $OpenBSD: gencons.h,v 1.4 2000/04/27 01:10:12 bjc Exp $ */ +/* $OpenBSD: gencons.h,v 1.5 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: gencons.h,v 1.9 2000/01/20 00:07:49 matt Exp $ */ /* @@ -69,4 +69,4 @@ #define SCB_G3T 0xdc /* Prototypes */ -void gencnputc __P((dev_t, int)); +void gencnputc(dev_t, int); diff --git a/sys/arch/vax/vax/ka410.c b/sys/arch/vax/vax/ka410.c index 28b26a84635..39f01fb07ed 100644 --- a/sys/arch/vax/vax/ka410.c +++ b/sys/arch/vax/vax/ka410.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka410.c,v 1.8 2001/11/06 19:53:17 miod Exp $ */ +/* $OpenBSD: ka410.c,v 1.9 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: ka410.c,v 1.21 1999/09/06 19:52:53 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -53,13 +53,13 @@ #include <machine/clock.h> #include <machine/vsbus.h> -static void ka410_conf __P((void)); -static void ka410_memerr __P((void)); -static int ka410_mchk __P((caddr_t)); -static void ka410_halt __P((void)); -static void ka410_reboot __P((int)); -static void ka41_cache_enable __P((void)); -static void ka410_clrf __P((void)); +static void ka410_conf(void); +static void ka410_memerr(void); +static int ka410_mchk(caddr_t); +static void ka410_halt(void); +static void ka410_reboot(int); +static void ka41_cache_enable(void); +static void ka410_clrf(void); static caddr_t l2cache; /* mapped in address */ static long *cacr; /* l2csche ctlr reg */ diff --git a/sys/arch/vax/vax/ka43.c b/sys/arch/vax/vax/ka43.c index 7002144dabc..9c57da6bda2 100644 --- a/sys/arch/vax/vax/ka43.c +++ b/sys/arch/vax/vax/ka43.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka43.c,v 1.7 2001/11/06 19:53:17 miod Exp $ */ +/* $OpenBSD: ka43.c,v 1.8 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: ka43.c,v 1.19 1999/09/06 19:52:53 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -52,22 +52,22 @@ #include <machine/ka43.h> #include <machine/clock.h> -static void ka43_conf __P((void)); -static void ka43_steal_pages __P((void)); +static void ka43_conf(void); +static void ka43_steal_pages(void); -static int ka43_mchk __P((caddr_t)); -static void ka43_memerr __P((void)); +static int ka43_mchk(caddr_t); +static void ka43_memerr(void); #if 0 -static void ka43_clear_errors __P((void)); +static void ka43_clear_errors(void); #endif -static int ka43_cache_init __P((void)); /* "int mapen" as argument? */ -static int ka43_cache_reset __P((void)); -static int ka43_cache_enable __P((void)); -static int ka43_cache_disable __P((void)); -static int ka43_cache_invalidate __P((void)); -static void ka43_halt __P((void)); -static void ka43_reboot __P((int)); -static void ka43_clrf __P((void)); +static int ka43_cache_init(void); /* "int mapen" as argument? */ +static int ka43_cache_reset(void); +static int ka43_cache_enable(void); +static int ka43_cache_disable(void); +static int ka43_cache_invalidate(void); +static void ka43_halt(void); +static void ka43_reboot(int); +static void ka43_clrf(void); struct cpu_dep ka43_calls = { diff --git a/sys/arch/vax/vax/ka46.c b/sys/arch/vax/vax/ka46.c index 06b1ffcadfe..505a377aa3c 100644 --- a/sys/arch/vax/vax/ka46.c +++ b/sys/arch/vax/vax/ka46.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka46.c,v 1.5 2001/11/06 19:53:17 miod Exp $ */ +/* $OpenBSD: ka46.c,v 1.6 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: ka46.c,v 1.12 2000/03/04 07:27:49 matt Exp $ */ /* * Copyright (c) 1998 Ludd, University of Lule}, Sweden. @@ -54,13 +54,13 @@ #include <machine/clock.h> #include <machine/vsbus.h> -static void ka46_conf __P((void)); -static void ka46_steal_pages __P((void)); -static void ka46_memerr __P((void)); -static int ka46_mchk __P((caddr_t)); -static void ka46_halt __P((void)); -static void ka46_reboot __P((int)); -static void ka46_cache_enable __P((void)); +static void ka46_conf(void); +static void ka46_steal_pages(void); +static void ka46_memerr(void); +static int ka46_mchk(caddr_t); +static void ka46_halt(void); +static void ka46_reboot(int); +static void ka46_cache_enable(void); struct vs_cpu *ka46_cpu; diff --git a/sys/arch/vax/vax/ka48.c b/sys/arch/vax/vax/ka48.c index 13426dde1a5..e2369e1d9e1 100644 --- a/sys/arch/vax/vax/ka48.c +++ b/sys/arch/vax/vax/ka48.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka48.c,v 1.6 2001/11/06 19:53:17 miod Exp $ */ +/* $OpenBSD: ka48.c,v 1.7 2002/03/14 01:26:48 millert Exp $ */ /* * Copyright (c) 1998 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -55,13 +55,13 @@ #include <machine/clock.h> #include <machine/vsbus.h> -static void ka48_conf __P((void)); -static void ka48_steal_pages __P((void)); -static void ka48_memerr __P((void)); -static int ka48_mchk __P((caddr_t)); -static void ka48_halt __P((void)); -static void ka48_reboot __P((int)); -static void ka48_cache_enable __P((void)); +static void ka48_conf(void); +static void ka48_steal_pages(void); +static void ka48_memerr(void); +static int ka48_mchk(caddr_t); +static void ka48_halt(void); +static void ka48_reboot(int); +static void ka48_cache_enable(void); struct vs_cpu *ka48_cpu; diff --git a/sys/arch/vax/vax/ka49.c b/sys/arch/vax/vax/ka49.c index 3887d37b821..6cce9856707 100644 --- a/sys/arch/vax/vax/ka49.c +++ b/sys/arch/vax/vax/ka49.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka49.c,v 1.3 2001/08/25 13:33:37 hugh Exp $ */ +/* $OpenBSD: ka49.c,v 1.4 2002/03/14 01:26:48 millert Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -39,16 +39,16 @@ #include <machine/cpu.h> #include <machine/scb.h> -static void ka49_conf __P((void)); -static void ka49_memerr __P((void)); -static int ka49_mchk __P((caddr_t)); -static void ka49_halt __P((void)); -static void ka49_reboot __P((int)); -static void ka49_softmem __P((void *)); -static void ka49_hardmem __P((void *)); -static void ka49_steal_pages __P((void)); -static void ka49_cache_enable __P((void)); -static void ka49_halt __P((void)); +static void ka49_conf(void); +static void ka49_memerr(void); +static int ka49_mchk(caddr_t); +static void ka49_halt(void); +static void ka49_reboot(int); +static void ka49_softmem(void *); +static void ka49_hardmem(void *); +static void ka49_steal_pages(void); +static void ka49_cache_enable(void); +static void ka49_halt(void); /* * Declaration of 49-specific calls. diff --git a/sys/arch/vax/vax/ka630.c b/sys/arch/vax/vax/ka630.c index ef575cdf3ed..3d49bdf033e 100644 --- a/sys/arch/vax/vax/ka630.c +++ b/sys/arch/vax/vax/ka630.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka630.c,v 1.7 2001/11/06 19:53:17 miod Exp $ */ +/* $OpenBSD: ka630.c,v 1.8 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: ka630.c,v 1.17 1999/09/06 19:52:52 ragge Exp $ */ /*- * Copyright (c) 1982, 1988, 1990, 1993 @@ -52,12 +52,12 @@ static struct uvaxIIcpu *uvaxIIcpu_ptr; -static void ka630_conf __P((void)); -static void ka630_memerr __P((void)); -static int ka630_mchk __P((caddr_t)); -static void ka630_halt __P((void)); -static void ka630_reboot __P((int)); -static void ka630_clrf __P((void)); +static void ka630_conf(void); +static void ka630_memerr(void); +static int ka630_mchk(caddr_t); +static void ka630_halt(void); +static void ka630_reboot(int); +static void ka630_clrf(void); struct cpu_dep ka630_calls = { 0, diff --git a/sys/arch/vax/vax/ka650.c b/sys/arch/vax/vax/ka650.c index 78634ca82fd..0261ee415cb 100644 --- a/sys/arch/vax/vax/ka650.c +++ b/sys/arch/vax/vax/ka650.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka650.c,v 1.10 2001/11/06 19:53:17 miod Exp $ */ +/* $OpenBSD: ka650.c,v 1.11 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: ka650.c,v 1.25 2001/04/27 15:02:37 ragge Exp $ */ /* * Copyright (c) 1988 The Regents of the University of California. @@ -65,12 +65,12 @@ int *KA650_CACHE_ptr; #define CACHEOFF 0 #define CACHEON 1 -static void ka650setcache __P((int)); -static void ka650_halt __P((void)); -static void ka650_reboot __P((int)); -static void uvaxIII_conf __P((void)); -static void uvaxIII_memerr __P((void)); -static int uvaxIII_mchk __P((caddr_t)); +static void ka650setcache(int); +static void ka650_halt(void); +static void ka650_reboot(int); +static void uvaxIII_conf(void); +static void uvaxIII_memerr(void); +static int uvaxIII_mchk(caddr_t); struct cpu_dep ka650_calls = { 0, /* No special page stealing anymore */ diff --git a/sys/arch/vax/vax/ka670.c b/sys/arch/vax/vax/ka670.c index 4a5bac7b26a..69d08c9a4e5 100644 --- a/sys/arch/vax/vax/ka670.c +++ b/sys/arch/vax/vax/ka670.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka670.c,v 1.3 2001/11/06 19:53:17 miod Exp $ */ +/* $OpenBSD: ka670.c,v 1.4 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: ka670.c,v 1.4 2000/03/13 23:52:35 soren Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. @@ -52,13 +52,13 @@ #include <machine/ka670.h> #include <machine/clock.h> -static void ka670_conf __P((void)); +static void ka670_conf(void); -static int ka670_mchk __P((caddr_t)); -static void ka670_memerr __P((void)); -static int ka670_cache_init __P((void)); /* "int mapen" as argument? */ -static void ka670_halt __P((void)); -static void ka670_reboot __P((int)); +static int ka670_mchk(caddr_t); +static void ka670_memerr(void); +static int ka670_cache_init(void); /* "int mapen" as argument? */ +static void ka670_halt(void); +static void ka670_reboot(int); struct cpu_dep ka670_calls = { 0, diff --git a/sys/arch/vax/vax/ka680.c b/sys/arch/vax/vax/ka680.c index 685d9a31285..957b28f6950 100644 --- a/sys/arch/vax/vax/ka680.c +++ b/sys/arch/vax/vax/ka680.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka680.c,v 1.7 2002/01/31 11:42:52 hugh Exp $ */ +/* $OpenBSD: ka680.c,v 1.8 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: ka680.c,v 1.3 2001/01/28 21:01:53 ragge Exp $ */ /* * Copyright (c) 2000 Ludd, University of Lule}, Sweden. @@ -50,15 +50,15 @@ #include <machine/clock.h> #include <machine/scb.h> -static void ka680_conf __P((void)); -static void ka680_cache_enable __P((void)); -static void ka680_softmem __P((void *)); -static void ka680_hardmem __P((void *)); -static void ka680_steal_pages __P((void)); -static void ka680_memerr __P((void)); -static int ka680_mchk __P((caddr_t)); -static void ka680_halt __P((void)); -static void ka680_reboot __P((int)); +static void ka680_conf(void); +static void ka680_cache_enable(void); +static void ka680_softmem(void *); +static void ka680_hardmem(void *); +static void ka680_steal_pages(void); +static void ka680_memerr(void); +static int ka680_mchk(caddr_t); +static void ka680_halt(void); +static void ka680_reboot(int); /* * KA680-specific IPRs. KA680 has the funny habit to control all caches diff --git a/sys/arch/vax/vax/ka750.c b/sys/arch/vax/vax/ka750.c index 10a03e81ab1..07a15d480c2 100644 --- a/sys/arch/vax/vax/ka750.c +++ b/sys/arch/vax/vax/ka750.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka750.c,v 1.8 2000/04/27 01:10:12 bjc Exp $ */ +/* $OpenBSD: ka750.c,v 1.9 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: ka750.c,v 1.30 1999/08/14 11:30:48 ragge Exp $ */ /* * Copyright (c) 1982, 1986, 1988 The Regents of the University of California. @@ -49,11 +49,11 @@ #include <vax/vax/gencons.h> -void ctuattach __P((void)); -static void ka750_clrf __P((void)); -static void ka750_conf __P((void)); -static void ka750_memerr __P((void)); -static int ka750_mchk __P((caddr_t)); +void ctuattach(void); +static void ka750_clrf(void); +static void ka750_conf(void); +static void ka750_memerr(void); +static int ka750_mchk(caddr_t); struct cpu_dep ka750_calls = { @@ -92,8 +92,8 @@ ka750_conf() ctuattach(); } -int ka750_memmatch __P((struct device *, struct cfdata *, void *)); -void ka750_memenable __P((struct device *, struct device *, void *)); +int ka750_memmatch(struct device *, struct cfdata *, void *); +void ka750_memenable(struct device *, struct device *, void *); struct cfattach mem_cmi_ca = { sizeof(struct device), ka750_memmatch, ka750_memenable diff --git a/sys/arch/vax/vax/ka780.c b/sys/arch/vax/vax/ka780.c index 4a933f7e601..346ca3b23a7 100644 --- a/sys/arch/vax/vax/ka780.c +++ b/sys/arch/vax/vax/ka780.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka780.c,v 1.6 2001/08/12 12:03:03 heko Exp $ */ +/* $OpenBSD: ka780.c,v 1.7 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: ka780.c,v 1.14 1999/08/07 10:36:49 ragge Exp $ */ /*- * Copyright (c) 1982, 1986, 1988 The Regents of the University of California. @@ -48,11 +48,11 @@ #include <machine/cpu.h> #include <machine/clock.h> -static void ka780_memerr __P((void)); -static int ka780_mchk __P((caddr_t)); -static void ka780_conf __P((void)); -static int mem_sbi_match __P((struct device *, struct cfdata *, void *)); -static void mem_sbi_attach __P((struct device *, struct device *, void*)); +static void ka780_memerr(void); +static int ka780_mchk(caddr_t); +static void ka780_conf(void); +static int mem_sbi_match(struct device *, struct cfdata *, void *); +static void mem_sbi_attach(struct device *, struct device *, void*); struct cfattach mem_sbi_ca = { sizeof(struct mem_softc), mem_sbi_match, mem_sbi_attach diff --git a/sys/arch/vax/vax/ka820.c b/sys/arch/vax/vax/ka820.c index e692f87c126..d1a994ef821 100644 --- a/sys/arch/vax/vax/ka820.c +++ b/sys/arch/vax/vax/ka820.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka820.c,v 1.7 2001/11/06 19:53:17 miod Exp $ */ +/* $OpenBSD: ka820.c,v 1.8 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: ka820.c,v 1.22 2000/06/04 02:19:27 matt Exp $ */ /* * Copyright (c) 1988 Regents of the University of California. @@ -68,14 +68,14 @@ struct ka820port *ka820port_ptr; struct rx50device *rx50device_ptr; static volatile struct ka820clock *ka820_clkpage; -static int ka820_match __P((struct device *, struct cfdata *, void *)); -static void ka820_attach __P((struct device *, struct device *, void*)); -static void ka820_memerr __P((void)); -static void ka820_conf __P((void)); -static int ka820_mchk __P((caddr_t)); +static int ka820_match(struct device *, struct cfdata *, void *); +static void ka820_attach(struct device *, struct device *, void*); +static void ka820_memerr(void); +static void ka820_conf(void); +static int ka820_mchk(caddr_t); static int ka820_clkread(time_t base); static void ka820_clkwrite(void); -static void rxcdintr __P((void *)); +static void rxcdintr(void *); static void vaxbierr(void *); struct cpu_dep ka820_calls = { @@ -227,8 +227,8 @@ struct ms820regs { #define MS2_INTLVADDR 0x00000100 /* error was in bank 1 (ro) */ #define MS2_SYN 0x0000007f /* error syndrome (ro, rw diag) */ -static int ms820_match __P((struct device *, struct cfdata *, void *)); -static void ms820_attach __P((struct device *, struct device *, void*)); +static int ms820_match(struct device *, struct cfdata *, void *); +static void ms820_attach(struct device *, struct device *, void*); struct mem_bi_softc { struct device sc_dev; diff --git a/sys/arch/vax/vax/ka860.c b/sys/arch/vax/vax/ka860.c index 8c37d93693b..ab6349893dc 100644 --- a/sys/arch/vax/vax/ka860.c +++ b/sys/arch/vax/vax/ka860.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka860.c,v 1.5 2000/04/27 01:10:13 bjc Exp $ */ +/* $OpenBSD: ka860.c,v 1.6 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: ka860.c,v 1.15 1999/08/07 10:36:49 ragge Exp $ */ /* * Copyright (c) 1986, 1988 Regents of the University of California. @@ -53,13 +53,13 @@ #include <vax/vax/gencons.h> -static void ka86_memerr __P((void)); -static int ka86_mchk __P((caddr_t)); -static void ka86_reboot __P((int)); -static void ka86_clrf __P((void)); -static void ka860_init __P((struct device *)); +static void ka86_memerr(void); +static int ka86_mchk(caddr_t); +static void ka86_reboot(int); +static void ka86_clrf(void); +static void ka860_init(struct device *); -void crlattach __P((void)); +void crlattach(void); struct cpu_dep ka860_calls = { 0, @@ -337,9 +337,9 @@ ka86_reboot(howto) asm("halt"); } -static int abus_print __P((void *, const char *)); -static int abus_match __P((struct device *, struct cfdata *, void *)); -static void abus_attach __P((struct device *, struct device *, void*)); +static int abus_print(void *, const char *); +static int abus_match(struct device *, struct cfdata *, void *); +static void abus_attach(struct device *, struct device *, void*); struct cfattach abus_ca = { sizeof(struct device), abus_match, abus_attach diff --git a/sys/arch/vax/vax/locore.c b/sys/arch/vax/vax/locore.c index bd9698a076b..2709576b53d 100644 --- a/sys/arch/vax/vax/locore.c +++ b/sys/arch/vax/vax/locore.c @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.c,v 1.22 2002/01/31 11:44:53 hugh Exp $ */ +/* $OpenBSD: locore.c,v 1.23 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: locore.c,v 1.43 2000/03/26 11:39:45 ragge Exp $ */ /* * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden. @@ -50,8 +50,8 @@ #include <machine/pmap.h> #include <machine/nexus.h> -void start __P((void)); -void main __P((void)); +void start(void); +void main(void); extern paddr_t avail_end; paddr_t esym; diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c index 5ba63f36e73..7c7ef2d476d 100644 --- a/sys/arch/vax/vax/machdep.c +++ b/sys/arch/vax/vax/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.54 2002/03/14 00:42:24 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.55 2002/03/14 01:26:48 millert Exp $ */ /* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $ */ /* @@ -121,7 +121,7 @@ #include "smg.h" -caddr_t allocsys __P((caddr_t)); +caddr_t allocsys(caddr_t); #ifndef BUFCACHEPERCENT #define BUFCACHEPERCENT 5 diff --git a/sys/arch/vax/vax/mem.c b/sys/arch/vax/vax/mem.c index b9b1dc06272..f2864c38de2 100644 --- a/sys/arch/vax/vax/mem.c +++ b/sys/arch/vax/vax/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.10 2001/11/06 19:53:17 miod Exp $ */ +/* $OpenBSD: mem.c,v 1.11 2002/03/14 01:26:49 millert Exp $ */ /* $NetBSD: mem.c,v 1.15 1999/03/24 05:51:17 mrg Exp $ */ /* @@ -61,10 +61,10 @@ extern unsigned int avail_end; caddr_t zeropage; -int mmopen __P((dev_t, int, int)); -int mmclose __P((dev_t, int, int)); -int mmrw __P((dev_t, struct uio *, int)); -paddr_t mmmmap __P((dev_t, off_t, int)); +int mmopen(dev_t, int, int); +int mmclose(dev_t, int, int); +int mmrw(dev_t, struct uio *, int); +paddr_t mmmmap(dev_t, off_t, int); /*ARGSUSED*/ diff --git a/sys/arch/vax/vax/pmap.c b/sys/arch/vax/vax/pmap.c index a85ace5b233..d5b5e8b36f1 100644 --- a/sys/arch/vax/vax/pmap.c +++ b/sys/arch/vax/vax/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.29 2001/12/22 12:01:53 hugh Exp $ */ +/* $OpenBSD: pmap.c,v 1.30 2002/03/14 01:26:49 millert Exp $ */ /* $NetBSD: pmap.c,v 1.74 1999/11/13 21:32:25 matt Exp $ */ /* * Copyright (c) 1994, 1998, 1999 Ludd, University of Lule}, Sweden. @@ -106,21 +106,21 @@ int startpmapdebug = 0; #ifndef DEBUG static inline #endif -void pmap_decpteref __P((struct pmap *, struct pte *)); +void pmap_decpteref(struct pmap *, struct pte *); #ifndef PMAPDEBUG static inline #endif -void rensa __P((int, struct pte *)); +void rensa(int, struct pte *); vaddr_t avail_start, avail_end; vaddr_t virtual_avail, virtual_end; /* Available virtual memory */ -void pmap_pinit __P((pmap_t)); -void pmap_release __P((pmap_t)); -struct pv_entry *get_pventry __P((void)); -void free_pventry __P((struct pv_entry *)); -void more_pventries __P((void)); +void pmap_pinit(pmap_t); +void pmap_release(pmap_t); +struct pv_entry *get_pventry(void); +void free_pventry(struct pv_entry *); +void more_pventries(void); /* * pmap_bootstrap(). diff --git a/sys/arch/vax/vax/sbi.c b/sys/arch/vax/vax/sbi.c index 9b9c3767415..9e8a487e58c 100644 --- a/sys/arch/vax/vax/sbi.c +++ b/sys/arch/vax/vax/sbi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbi.c,v 1.8 2000/04/27 01:10:13 bjc Exp $ */ +/* $OpenBSD: sbi.c,v 1.9 2002/03/14 01:26:49 millert Exp $ */ /* $NetBSD: sbi.c,v 1.20 1999/08/07 10:36:50 ragge Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden. @@ -43,9 +43,9 @@ #include <machine/cpu.h> #include <machine/nexus.h> -static int sbi_print __P((void *, const char *)); -static int sbi_match __P((struct device *, struct cfdata *, void *)); -static void sbi_attach __P((struct device *, struct device *, void*)); +static int sbi_print(void *, const char *); +static int sbi_match(struct device *, struct cfdata *, void *); +static void sbi_attach(struct device *, struct device *, void*); int sbi_print(aux, name) diff --git a/sys/arch/vax/vax/scb.c b/sys/arch/vax/vax/scb.c index f7884dcedb8..b8a627efe51 100644 --- a/sys/arch/vax/vax/scb.c +++ b/sys/arch/vax/vax/scb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scb.c,v 1.3 2001/08/25 13:33:37 hugh Exp $ */ +/* $OpenBSD: scb.c,v 1.4 2002/03/14 01:26:49 millert Exp $ */ /* $NetBSD: scb.c,v 1.12 2000/06/04 06:16:59 matt Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. @@ -49,7 +49,7 @@ struct scb *scb; struct ivec_dsp *scb_vec; -static void scb_stray __P((void *)); +static void scb_stray(void *); static volatile int vector, ipl, gotintr; /* diff --git a/sys/arch/vax/vax/swapgeneric.c b/sys/arch/vax/vax/swapgeneric.c index af82ffe0a5c..4ab3cf9ce6c 100644 --- a/sys/arch/vax/vax/swapgeneric.c +++ b/sys/arch/vax/vax/swapgeneric.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapgeneric.c,v 1.9 2001/09/29 18:40:33 miod Exp $ */ +/* $OpenBSD: swapgeneric.c,v 1.10 2002/03/14 01:26:49 millert Exp $ */ /* $NetBSD: swapgeneric.c,v 1.13 1996/10/13 03:36:01 christos Exp $ */ /*- @@ -43,7 +43,7 @@ #include <sys/param.h> #include <sys/conf.h> -int (*mountroot) __P((void)) = NULL; +int (*mountroot)(void) = NULL; dev_t rootdev = NODEV; dev_t dumpdev = NODEV; diff --git a/sys/arch/vax/vax/trap.c b/sys/arch/vax/vax/trap.c index 94a27d5228d..4755e6f168b 100644 --- a/sys/arch/vax/vax/trap.c +++ b/sys/arch/vax/vax/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.20 2001/11/28 16:13:29 art Exp $ */ +/* $OpenBSD: trap.c,v 1.21 2002/03/14 01:26:49 millert Exp $ */ /* $NetBSD: trap.c,v 1.47 1999/08/21 19:26:20 matt Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden. @@ -61,10 +61,10 @@ volatile int startsysc = 0, faultdebug = 0; #endif -static __inline void userret __P((struct proc *, struct trapframe *, u_quad_t)); +static __inline void userret(struct proc *, struct trapframe *, u_quad_t); -void arithflt __P((struct trapframe *)); -void syscall __P((struct trapframe *)); +void arithflt(struct trapframe *); +void syscall(struct trapframe *); char *traptypes[]={ "reserved addressing", diff --git a/sys/arch/vax/vax/uvaxII.c b/sys/arch/vax/vax/uvaxII.c index ec9246b5ca8..74d478dbdd1 100644 --- a/sys/arch/vax/vax/uvaxII.c +++ b/sys/arch/vax/vax/uvaxII.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvaxII.c,v 1.9 2001/11/06 19:53:17 miod Exp $ */ +/* $OpenBSD: uvaxII.c,v 1.10 2002/03/14 01:26:49 millert Exp $ */ /* $NetBSD: uvaxII.c,v 1.10 1996/10/13 03:36:04 christos Exp $ */ /*- @@ -56,8 +56,8 @@ struct uvaxIIcpu *uvaxIIcpu_ptr; #if VAX630 struct ka630clock *ka630clk_ptr; -static time_t ka630_clkread __P((int *)); -static void ka630_clkwrite __P((time_t)); +static time_t ka630_clkread(int *); +static void ka630_clkwrite(time_t); struct watclk { u_short wat_sec; diff --git a/sys/arch/vax/vsa/dc.c b/sys/arch/vax/vsa/dc.c index 746b206d73c..5904be8291c 100644 --- a/sys/arch/vax/vsa/dc.c +++ b/sys/arch/vax/vsa/dc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dc.c,v 1.6 2002/02/15 20:45:31 nordin Exp $ */ +/* $OpenBSD: dc.c,v 1.7 2002/03/14 01:26:49 millert Exp $ */ /* $NetBSD: dc.c,v 1.4 1996/10/13 03:36:10 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -127,11 +127,11 @@ struct dc_softc { * Use the statically-allocated softc until old autoconfig code and * config.old are completely gone. */ -int dcmatch __P((struct device * parent, void *cfdata, void *aux)); -void dcattach __P((struct device *parent, struct device *self, void *aux)); +int dcmatch(struct device * parent, void *cfdata, void *aux); +void dcattach(struct device *parent, struct device *self, void *aux); -int dc_doprobe __P((void *addr, int unit, int flags, int pri)); -int dcintr __P((void * xxxunit)); +int dc_doprobe(void *addr, int unit, int flags, int pri); +int dcintr(void * xxxunit); struct cfdriver dc_cd = { NULL, "dc", DV_TTY @@ -143,12 +143,12 @@ struct cfattach dc_ca = { #define NDCLINE (NDC*4) -void dcstart __P((struct tty *)); -void dcxint __P((struct tty *)); -void dcPutc __P((dev_t, int)); -void dcscan __P((void *)); -int dcGetc __P((dev_t)); -int dcparam __P((struct tty *, struct termios *)); +void dcstart(struct tty *); +void dcxint(struct tty *); +void dcPutc(dev_t, int); +void dcscan(void *); +int dcGetc(dev_t); +int dcparam(struct tty *, struct termios *); struct tty *dc_tty[NDCLINE]; int dc_cnt = NDCLINE; diff --git a/sys/arch/vax/vsa/dz_ibus.c b/sys/arch/vax/vsa/dz_ibus.c index a667814ce2d..34dbf058c43 100644 --- a/sys/arch/vax/vsa/dz_ibus.c +++ b/sys/arch/vax/vsa/dz_ibus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dz_ibus.c,v 1.9 2001/10/01 13:05:07 hugh Exp $ */ +/* $OpenBSD: dz_ibus.c,v 1.10 2002/03/14 01:26:49 millert Exp $ */ /* $NetBSD: dz_ibus.c,v 1.15 1999/08/27 17:50:42 ragge Exp $ */ /* * Copyright (c) 1998 Ludd, University of Lule}, Sweden. @@ -88,7 +88,7 @@ static volatile struct ss_dz {/* base address of DZ-controller: 0x200A0000 */ cons_decl(dz); cdev_decl(dz); -extern int getmajor __P((void *)); /* conf.c */ +extern int getmajor(void *); /* conf.c */ #if 0 #if NDZKBD > 0 || NDZMS > 0 diff --git a/sys/arch/vax/vsa/hdc9224.c b/sys/arch/vax/vsa/hdc9224.c index 76011fc75ee..0cc15e94874 100644 --- a/sys/arch/vax/vsa/hdc9224.c +++ b/sys/arch/vax/vsa/hdc9224.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hdc9224.c,v 1.6 2002/01/16 20:50:17 miod Exp $ */ +/* $OpenBSD: hdc9224.c,v 1.7 2002/03/14 01:26:49 millert Exp $ */ /* $NetBSD: hdc9224.c,v 1.6 1997/03/15 16:32:22 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -178,9 +178,9 @@ struct hdcsoftc { /* * Device definition for (new) autoconfiguration. */ -int hdcmatch __P((struct device *parent, void *cfdata, void *aux)); -void hdcattach __P((struct device *parent, struct device *self, void *aux)); -int hdcprint __P((void *aux, const char *name)); +int hdcmatch(struct device *parent, void *cfdata, void *aux); +void hdcattach(struct device *parent, struct device *self, void *aux); +int hdcprint(void *aux, const char *name); struct cfdriver hdc_cd = { NULL, "hdc", DV_DULL @@ -189,10 +189,10 @@ struct cfattach hdc_ca = { sizeof(struct hdcsoftc), hdcmatch, hdcattach }; -int hdmatch __P((struct device *parent, void *cfdata, void *aux)); -void hdattach __P((struct device *parent, struct device *self, void *aux)); -int hdprint __P((void *aux, const char *name)); -void hdstrategy __P((struct buf *bp)); +int hdmatch(struct device *parent, void *cfdata, void *aux); +void hdattach(struct device *parent, struct device *self, void *aux); +int hdprint(void *aux, const char *name); +void hdstrategy(struct buf *bp); struct cfdriver hd_cd = { NULL, "hd", DV_DISK @@ -206,14 +206,14 @@ struct dkdriver hddkdriver = { hdstrategy }; /* * prototypes for (almost) all the internal routines */ -int hdc_reset __P((struct hdcsoftc *sc)); -int hdc_select __P((struct hdcsoftc *sc, int drive)); -int hdc_command __P((struct hdcsoftc *sc, int cmd)); +int hdc_reset(struct hdcsoftc *sc); +int hdc_select(struct hdcsoftc *sc, int drive); +int hdc_command(struct hdcsoftc *sc, int cmd); -int hdc_getdata __P((struct hdcsoftc *hdc, struct hdsoftc *hd, int drive)); -int hdc_getlabel __P((struct hdcsoftc *hdc, struct hdsoftc *hd, int drive)); +int hdc_getdata(struct hdcsoftc *hdc, struct hdsoftc *hd, int drive); +int hdc_getlabel(struct hdcsoftc *hdc, struct hdsoftc *hd, int drive); -void hdgetlabel __P((struct hdsoftc *sc)); +void hdgetlabel(struct hdsoftc *sc); /* * new-config's hdcmatch() is similiar to old-config's hdcprobe(), diff --git a/sys/arch/vax/vsa/if_le_vsbus.c b/sys/arch/vax/vsa/if_le_vsbus.c index 82fa233db61..939bc40ce76 100644 --- a/sys/arch/vax/vsa/if_le_vsbus.c +++ b/sys/arch/vax/vsa/if_le_vsbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_vsbus.c,v 1.6 2001/11/06 19:53:17 miod Exp $ */ +/* $OpenBSD: if_le_vsbus.c,v 1.7 2002/03/14 01:26:49 millert Exp $ */ /* $NetBSD: if_le_vsbus.c,v 1.10 2000/06/29 07:14:18 mrg Exp $ */ /*- @@ -111,10 +111,10 @@ struct le_softc { volatile u_short *sc_rdp; }; -static int le_vsbus_match __P((struct device *, struct cfdata *, void *)); -static void le_vsbus_attach __P((struct device *, struct device *, void *)); -static void lewrcsr __P((struct am7990_softc *, u_int16_t, u_int16_t)); -static u_int16_t lerdcsr __P((struct am7990_softc *, u_int16_t)); +static int le_vsbus_match(struct device *, struct cfdata *, void *); +static void le_vsbus_attach(struct device *, struct device *, void *); +static void lewrcsr(struct am7990_softc *, u_int16_t, u_int16_t); +static u_int16_t lerdcsr(struct am7990_softc *, u_int16_t); struct cfattach le_vsbus_ca = { sizeof(struct le_softc), (cfmatch_t)le_vsbus_match, le_vsbus_attach diff --git a/sys/arch/vax/vsa/lk201.c b/sys/arch/vax/vsa/lk201.c index 10e232ef076..c57dc8e9d09 100644 --- a/sys/arch/vax/vsa/lk201.c +++ b/sys/arch/vax/vsa/lk201.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lk201.c,v 1.3 1999/01/11 05:12:09 millert Exp $ */ +/* $OpenBSD: lk201.c,v 1.4 2002/03/14 01:26:49 millert Exp $ */ /* * The LK201 keycode mapping routine is here, along with initialization @@ -17,7 +17,7 @@ /* Exported functions */ -extern int kbdMapChar __P((int keycode)); +extern int kbdMapChar(int keycode); extern void KBDReset __P(( dev_t dev, void (*putc) (dev_t, int) )); @@ -195,7 +195,7 @@ static u_char kbdInitString[] = { void KBDReset(kbddev, putc) dev_t kbddev; - void (*putc) __P((dev_t, int)); + void (*putc)(dev_t, int); { register int i; static int inKBDReset; @@ -292,7 +292,7 @@ done: } -static int (*raw_kbd_getc) __P((dev_t dev)) = NULL; +static int (*raw_kbd_getc)(dev_t dev) = NULL; static dev_t lk_in_dev = NODEV; /* @@ -300,7 +300,7 @@ static dev_t lk_in_dev = NODEV; */ void lk_divert(getfn, in_dev) - int (*getfn) __P ((dev_t dev)) ; + int (*getfn)(dev_t dev) ; dev_t in_dev; { raw_kbd_getc = getfn; @@ -356,8 +356,8 @@ LKgetc(dev) void MouseInit(mdev, putc, getc) dev_t mdev; - void (*putc) __P((dev_t, int)); - int (*getc) __P((dev_t)); + void (*putc)(dev_t, int); + int (*getc)(dev_t); { int id_byte1, id_byte2, id_byte3, id_byte4; diff --git a/sys/arch/vax/vsa/smg.c b/sys/arch/vax/vsa/smg.c index 1ef15e69995..9d0019311c1 100644 --- a/sys/arch/vax/vsa/smg.c +++ b/sys/arch/vax/vsa/smg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smg.c,v 1.6 2002/01/03 19:49:02 miod Exp $ */ +/* $OpenBSD: smg.c,v 1.7 2002/03/14 01:26:49 millert Exp $ */ /* $NetBSD: smg.c,v 1.21 2000/03/23 06:46:44 thorpej Exp $ */ /* * Copyright (c) 1998 Ludd, University of Lule}, Sweden. @@ -201,7 +201,7 @@ static struct smg_screen *curscr; static struct timeout smg_blink_timeout; -extern int getmajor __P((void *)); /* conf.c */ +extern int getmajor(void *); /* conf.c */ int smg_match(struct device *parent, struct cfdata *match, void *aux) @@ -577,7 +577,7 @@ smgcninit(cndev) { extern void lkccninit(struct consdev *); extern int lkccngetc(dev_t); - extern int dz_vsbus_lk201_cnattach __P((int)); + extern int dz_vsbus_lk201_cnattach(int); /* Clear screen */ memset(sm_addr, 0, 128*864); |