diff options
| author | obrien <obrien@FreeBSD.org> | 2002-03-20 18:58:47 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2002-03-20 18:58:47 +0000 |
| commit | a11b0bc7ef9aa0716078fb29c8eeb46df0f454bf (patch) | |
| tree | aa4a8b1f00274b707255148923fbee6b3b0e8414 /sys | |
| parent | 37ff43589ebd29f29200833b6772e1ea25901790 (diff) | |
| download | FreeBSD-src-a11b0bc7ef9aa0716078fb29c8eeb46df0f454bf.zip FreeBSD-src-a11b0bc7ef9aa0716078fb29c8eeb46df0f454bf.tar.gz | |
Remove __P(). This was tested on the GENERIC kernel.
Diffstat (limited to 'sys')
63 files changed, 664 insertions, 666 deletions
diff --git a/sys/alpha/alpha/api_up1000.c b/sys/alpha/alpha/api_up1000.c index 1d0a774..8631b5f 100644 --- a/sys/alpha/alpha/api_up1000.c +++ b/sys/alpha/alpha/api_up1000.c @@ -52,12 +52,12 @@ #endif static int comcnrate = CONSPEED; -void api_up1000_init __P((void)); -static void api_up1000_cons_init __P((void)); +void api_up1000_init(void); +static void api_up1000_cons_init(void); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); void api_up1000_init() diff --git a/sys/alpha/alpha/autoconf.c b/sys/alpha/alpha/autoconf.c index 0ccab41..de55fe5 100644 --- a/sys/alpha/alpha/autoconf.c +++ b/sys/alpha/alpha/autoconf.c @@ -58,11 +58,11 @@ #include <cam/cam_xpt_sim.h> #include <cam/cam_debug.h> -static void configure __P((void *)); +static void configure(void *); SYSINIT(configure, SI_SUB_CONFIGURE, SI_ORDER_THIRD, configure, NULL) -static void configure_finish __P((void)); -static void configure_start __P((void)); +static void configure_finish(void); +static void configure_start(void); #ifdef DEV_ISA #include <isa/isavar.h> diff --git a/sys/alpha/alpha/clock.c b/sys/alpha/alpha/clock.c index 3bc0ce0..cc6bb7b 100644 --- a/sys/alpha/alpha/clock.c +++ b/sys/alpha/alpha/clock.c @@ -286,7 +286,7 @@ cpu_initclocks() } stathz = hz / 8; - platform.clockintr = (void (*) __P((void *))) handleclock; + platform.clockintr = (void (*)(void *)) handleclock; /* * Get the clock started. diff --git a/sys/alpha/alpha/cpuconf.c b/sys/alpha/alpha/cpuconf.c index e3f5dfa..89b4142 100644 --- a/sys/alpha/alpha/cpuconf.c +++ b/sys/alpha/alpha/cpuconf.c @@ -40,91 +40,91 @@ #include "opt_cpu.h" #ifdef DEC_3000_500 -extern void dec_3000_500_init __P((int)); +extern void dec_3000_500_init(int); #else #define dec_3000_500_init platform_not_configured #endif #ifdef DEC_3000_300 -extern void dec_3000_300_init __P((int)); +extern void dec_3000_300_init(int); #else #define dec_3000_300_init platform_not_configured #endif #ifdef DEC_AXPPCI_33 -extern void dec_axppci_33_init __P((int)); +extern void dec_axppci_33_init(int); #else #define dec_axppci_33_init platform_not_configured #endif #ifdef DEC_KN8AE -extern void dec_kn8ae_init __P((int)); +extern void dec_kn8ae_init(int); #else #define dec_kn8ae_init platform_not_configured #endif #ifdef DEC_2100_A50 -extern void dec_2100_a50_init __P((int)); +extern void dec_2100_a50_init(int); #else #define dec_2100_a50_init platform_not_configured #endif #ifdef DEC_KN20AA -extern void dec_kn20aa_init __P((int)); +extern void dec_kn20aa_init(int); #else #define dec_kn20aa_init platform_not_configured #endif #ifdef DEC_EB64PLUS -extern void dec_eb64plus_init __P((int)); +extern void dec_eb64plus_init(int); #else #define dec_eb64plus_init platform_not_configured #endif #ifdef DEC_EB164 -extern void dec_eb164_init __P((int)); +extern void dec_eb164_init(int); #else #define dec_eb164_init platform_not_configured #endif #ifdef DEC_KN300 -extern void dec_kn300_init __P((int)); +extern void dec_kn300_init(int); #else #define dec_kn300_init platform_not_configured #endif #ifdef AVALON_A12 -extern void avalon_a12_init __P((int)); +extern void avalon_a12_init(int); #else #define avalon_a12_init platform_not_configured #endif #ifdef DEC_ST550 -extern void st550_init __P((int)); +extern void st550_init(int); #else #define st550_init platform_not_configured #endif #ifdef DEC_ST6600 -extern void st6600_init __P((int)); +extern void st6600_init(int); #else #define st6600_init platform_not_configured #endif #ifdef DEC_1000A -extern void dec_1000a_init __P((int)); +extern void dec_1000a_init(int); #else #define dec_1000a_init platform_not_configured #endif #ifdef DEC_2100_A500 -extern void dec_2100_a500_init __P((int)); +extern void dec_2100_a500_init(int); #else #define dec_2100_a500_init platform_not_configured #endif #ifdef API_UP1000 -extern void api_up1000_init __P((int)); +extern void api_up1000_init(int); #else #define api_up1000_init platform_not_configured #endif diff --git a/sys/alpha/alpha/db_disasm.c b/sys/alpha/alpha/db_disasm.c index b596678..5cdfc18 100644 --- a/sys/alpha/alpha/db_disasm.c +++ b/sys/alpha/alpha/db_disasm.c @@ -188,7 +188,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) @@ -244,7 +244,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; @@ -285,7 +285,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; @@ -334,7 +334,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; @@ -364,7 +364,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; @@ -389,7 +389,7 @@ static const char *special_opname[8] = { "drain_t", 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; @@ -424,7 +424,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; @@ -445,7 +445,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) @@ -795,7 +795,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) @@ -816,7 +816,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/alpha/alpha/db_interface.c b/sys/alpha/alpha/db_interface.c index 041b0b9..ccb07b7 100644 --- a/sys/alpha/alpha/db_interface.c +++ b/sys/alpha/alpha/db_interface.c @@ -81,7 +81,7 @@ static jmp_buf *db_nofault = 0; extern jmp_buf db_jmpbuf; -extern void gdb_handle_exception __P((db_regs_t *, int, int)); +extern void gdb_handle_exception(db_regs_t *, int, int); #if 0 extern char *trap_type[]; @@ -90,8 +90,8 @@ extern int trap_types; int db_active; -void ddbprinttrap __P((unsigned long, unsigned long, unsigned long, - unsigned long)); +void ddbprinttrap(unsigned long, unsigned long, unsigned long, + unsigned long); struct db_variable db_regs[] = { { "v0", &ddb_regs.tf_regs[FRAME_V0], FCN_NULL }, diff --git a/sys/alpha/alpha/db_trace.c b/sys/alpha/alpha/db_trace.c index 2844da4..f84d1b9 100644 --- a/sys/alpha/alpha/db_trace.c +++ b/sys/alpha/alpha/db_trace.c @@ -97,9 +97,9 @@ static struct special_symbol { }; -int db_md_set_watchpoint __P((db_expr_t addr, db_expr_t size)); -int db_md_clr_watchpoint __P((db_expr_t addr, db_expr_t size)); -void db_md_list_watchpoints __P((void)); +int db_md_set_watchpoint(db_expr_t addr, db_expr_t size); +int db_md_clr_watchpoint(db_expr_t addr, db_expr_t size); +void db_md_list_watchpoints(void); /* diff --git a/sys/alpha/alpha/dec_1000a.c b/sys/alpha/alpha/dec_1000a.c index 3103f54..4060847 100644 --- a/sys/alpha/alpha/dec_1000a.c +++ b/sys/alpha/alpha/dec_1000a.c @@ -99,23 +99,23 @@ #endif static int comcnrate = CONSPEED; -void dec_1000a_init __P((int)); -static void dec_1000a_cons_init __P((void)); +void dec_1000a_init(int); +static void dec_1000a_cons_init(void); -static void dec_1000_intr_map __P((void *)); -static void dec_1000_intr_disable __P((int)); -static void dec_1000_intr_enable __P((int)); -static void dec_1000_intr_init __P((void)); +static void dec_1000_intr_map(void *); +static void dec_1000_intr_disable(int); +static void dec_1000_intr_enable(int); +static void dec_1000_intr_init(void); -static void dec_1000a_intr_map __P((void *)); -static void dec_1000a_intr_disable __P((int)); -static void dec_1000a_intr_enable __P((int)); -static void dec_1000a_intr_init __P((void)); +static void dec_1000a_intr_map(void *); +static void dec_1000a_intr_disable(int); +static void dec_1000a_intr_enable(int); +static void dec_1000a_intr_init(void); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); static const struct alpha_variation_table dec_1000_variations[] = { diff --git a/sys/alpha/alpha/dec_2100_a50.c b/sys/alpha/alpha/dec_2100_a50.c index fb09008..340274c 100644 --- a/sys/alpha/alpha/dec_2100_a50.c +++ b/sys/alpha/alpha/dec_2100_a50.c @@ -56,16 +56,16 @@ #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_intr_map __P((void *)); -void sio_intr_establish __P((int)); -void sio_intr_disestablish __P((int)); -void sio_intr_setup __P((void)); - -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +void dec_2100_a50_init(void); +static void dec_2100_a50_cons_init(void); +static void dec_2100_a50_intr_map(void *); +void sio_intr_establish(int); +void sio_intr_disestablish(int); +void sio_intr_setup(void); + +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); const struct alpha_variation_table dec_2100_a50_variations[] = { { SV_ST_AVANTI, "AlphaStation 400 4/233 (\"Avanti\")" }, diff --git a/sys/alpha/alpha/dec_2100_a500.c b/sys/alpha/alpha/dec_2100_a500.c index 1cc80e9..3bcf22f 100644 --- a/sys/alpha/alpha/dec_2100_a500.c +++ b/sys/alpha/alpha/dec_2100_a500.c @@ -49,13 +49,13 @@ #endif static int comcnrate = CONSPEED; -void dec_2100_a500_init __P((int)); -static void dec_2100_a500_cons_init __P((void)); -static void dec_2100_a500_intr_init __P((void )); +void dec_2100_a500_init(int); +static void dec_2100_a500_cons_init(void); +static void dec_2100_a500_intr_init(void ); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); void dec_2100_a500_init(cputype) diff --git a/sys/alpha/alpha/dec_axppci_33.c b/sys/alpha/alpha/dec_axppci_33.c index 0888a6c..27a16d8 100644 --- a/sys/alpha/alpha/dec_axppci_33.c +++ b/sys/alpha/alpha/dec_axppci_33.c @@ -53,13 +53,13 @@ #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_intr_map __P((void *)); +void dec_axppci_33_init(void); +static void dec_axppci_33_cons_init(void); +static void dec_axppci_33_intr_map(void *); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); const struct alpha_variation_table dec_axppci_33_variations[] = { { 0, "Alpha PC AXPpci33 (\"NoName\")" }, diff --git a/sys/alpha/alpha/dec_eb164.c b/sys/alpha/alpha/dec_eb164.c index fe779aa..01c3264 100644 --- a/sys/alpha/alpha/dec_eb164.c +++ b/sys/alpha/alpha/dec_eb164.c @@ -52,17 +52,17 @@ #endif static int comcnrate = CONSPEED; -void dec_eb164_init __P((void)); -static void dec_eb164_cons_init __P((void)); +void dec_eb164_init(void); +static void dec_eb164_cons_init(void); static void eb164_intr_init(void); extern void eb164_intr_enable(int irq); extern void eb164_intr_disable(int irq); extern void eb164_intr_enable_icsr(int irq); extern void eb164_intr_disable_icsr(int irq); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); void dec_eb164_init() diff --git a/sys/alpha/alpha/dec_eb64plus.c b/sys/alpha/alpha/dec_eb64plus.c index 4571457..44c8f66 100644 --- a/sys/alpha/alpha/dec_eb64plus.c +++ b/sys/alpha/alpha/dec_eb64plus.c @@ -73,9 +73,9 @@ #endif static int comcnrate = CONSPEED; -void dec_eb64plus_init __P((void)); -static void dec_eb64plus_cons_init __P((void)); -static void dec_eb64plus_intr_init __P((void)); +void dec_eb64plus_init(void); +static void dec_eb64plus_cons_init(void); +static void dec_eb64plus_intr_init(void); extern void eb64plus_intr_enable(int irq); /* ../pci/pci_eb64plus_intr.s */ extern void eb64plus_intr_disable(int irq); /* ../pci/pci_eb64plus_intr.s */ @@ -83,8 +83,8 @@ extern void eb64plus_intr_disable(int irq); /* ../pci/pci_eb64plus_intr.s */ extern const char * bootdev_protocol(void); extern int bootdev_boot_dev_type(void); -extern int siocnattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int sccnattach(void); const struct alpha_variation_table dec_eb64plus_variations[] = { { 0, "DEC EB64-plus" }, diff --git a/sys/alpha/alpha/dec_kn20aa.c b/sys/alpha/alpha/dec_kn20aa.c index 2906024..a4c63b9 100644 --- a/sys/alpha/alpha/dec_kn20aa.c +++ b/sys/alpha/alpha/dec_kn20aa.c @@ -54,19 +54,19 @@ #endif static int comcnrate = CONSPEED; -void dec_kn20aa_init __P((void)); -static void dec_kn20aa_cons_init __P((void)); -static void dec_kn20aa_intr_init __P((void)); -static void dec_kn20aa_intr_map __P((void *)); -static void dec_kn20aa_intr_disable __P((int)); -static void dec_kn20aa_intr_enable __P((int)); +void dec_kn20aa_init(void); +static void dec_kn20aa_cons_init(void); +static void dec_kn20aa_intr_init(void); +static void dec_kn20aa_intr_map(void *); +static void dec_kn20aa_intr_disable(int); +static void dec_kn20aa_intr_enable(int); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); #if 0 -static void dec_kn20aa_device_register __P((struct device *, void *)); +static void dec_kn20aa_device_register(struct device *, void *); #endif const struct alpha_variation_table dec_kn20aa_variations[] = { diff --git a/sys/alpha/alpha/dec_kn300.c b/sys/alpha/alpha/dec_kn300.c index 052d565e..dc697e4 100644 --- a/sys/alpha/alpha/dec_kn300.c +++ b/sys/alpha/alpha/dec_kn300.c @@ -62,8 +62,8 @@ #endif static int comcnrate = CONSPEED; -void dec_kn300_init __P((void)); -void dec_kn300_cons_init __P((void)); +void dec_kn300_init(void); +void dec_kn300_cons_init(void); #define ALPHASERVER_4100 "AlphaServer 4100" @@ -73,9 +73,9 @@ const struct alpha_variation_table dec_kn300_variations[] = { }; -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); void dec_kn300_init() diff --git a/sys/alpha/alpha/dec_st550.c b/sys/alpha/alpha/dec_st550.c index 13a5fb6..564c3bf 100644 --- a/sys/alpha/alpha/dec_st550.c +++ b/sys/alpha/alpha/dec_st550.c @@ -59,20 +59,20 @@ #endif static int comcnrate = CONSPEED; -void st550_init __P((void)); -static void st550_cons_init __P((void)); -static void st550_intr_init __P((void)); -static void pyxis_intr_enable __P((int)); -static void pyxis_intr_disable __P((int)); -static void st550_intr_enable __P((int)); -static void st550_intr_disable __P((int)); -static void st550_intr_map __P((void *)); +void st550_init(void); +static void st550_cons_init(void); +static void st550_intr_init(void); +static void pyxis_intr_enable(int); +static void pyxis_intr_disable(int); +static void st550_intr_enable(int); +static void st550_intr_disable(int); +static void st550_intr_map(void *); #define ST550_PCI_IRQ_BEGIN 8 #define ST550_PCI_MAX_IRQ 47 -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); void st550_init() diff --git a/sys/alpha/alpha/dec_st6600.c b/sys/alpha/alpha/dec_st6600.c index 09ab72a..e39c4fb 100644 --- a/sys/alpha/alpha/dec_st6600.c +++ b/sys/alpha/alpha/dec_st6600.c @@ -51,16 +51,16 @@ #endif static int comcnrate = CONSPEED; -void st6600_init __P((void)); -static void st6600_cons_init __P((void)); -static void st6600_intr_init __P((void)); +void st6600_init(void); +static void st6600_cons_init(void); +static void st6600_intr_init(void); #define ST6600_PCI_IRQ_BEGIN 8 #define ST6600_PCI_MAX_IRQ 63 -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); void st6600_init() diff --git a/sys/alpha/alpha/interrupt.c b/sys/alpha/alpha/interrupt.c index b2320ce..870053d 100644 --- a/sys/alpha/alpha/interrupt.c +++ b/sys/alpha/alpha/interrupt.c @@ -169,7 +169,7 @@ interrupt(a0, a1, a2, framep) void set_iointr(niointr) - void (*niointr) __P((void *, unsigned long)); + void (*niointr)(void *, unsigned long); { if (platform.iointr) panic("set iointr twice"); diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c index 5a0d8c0..4edf5e0 100644 --- a/sys/alpha/alpha/machdep.c +++ b/sys/alpha/alpha/machdep.c @@ -186,7 +186,7 @@ SYSCTL_INT(_machdep, CPU_UNALIGNED_FIX, unaligned_fix, SYSCTL_INT(_machdep, CPU_UNALIGNED_SIGBUS, unaligned_sigbus, CTLFLAG_RW, &alpha_unaligned_sigbus, 0, ""); -static void cpu_startup __P((void *)); +static void cpu_startup(void *); SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL) struct msgbuf *msgbufp=0; @@ -233,7 +233,7 @@ SYSCTL_INT(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0, ""); void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code); #endif -static void identifycpu __P((void)); +static void identifycpu(void); struct kva_md_info kmi; diff --git a/sys/alpha/alpha/pmap.c b/sys/alpha/alpha/pmap.c index 12d151b..37ac2a5 100644 --- a/sys/alpha/alpha/pmap.c +++ b/sys/alpha/alpha/pmap.c @@ -326,31 +326,30 @@ static struct vm_object pvzone_obj; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; static int pmap_pagedaemon_waken = 0; -static PMAP_INLINE void free_pv_entry __P((pv_entry_t pv)); -static pv_entry_t get_pv_entry __P((void)); -static void alpha_protection_init __P((void)); -static void pmap_changebit __P((vm_page_t m, int bit, boolean_t setem)); - -static void pmap_remove_all __P((vm_page_t m)); -static vm_page_t pmap_enter_quick __P((pmap_t pmap, vm_offset_t va, - vm_page_t m, vm_page_t mpte)); -static int pmap_remove_pte __P((pmap_t pmap, pt_entry_t* ptq, vm_offset_t sva)); -static void pmap_remove_page __P((struct pmap *pmap, vm_offset_t va)); -static int pmap_remove_entry __P((struct pmap *pmap, vm_page_t m, - vm_offset_t va)); -static void pmap_insert_entry __P((pmap_t pmap, vm_offset_t va, - vm_page_t mpte, vm_page_t m)); - -static vm_page_t pmap_allocpte __P((pmap_t pmap, vm_offset_t va)); - -static int pmap_release_free_page __P((pmap_t pmap, vm_page_t p)); -static vm_page_t _pmap_allocpte __P((pmap_t pmap, unsigned ptepindex)); -static vm_page_t pmap_page_lookup __P((vm_object_t object, vm_pindex_t pindex)); -static int pmap_unuse_pt __P((pmap_t, vm_offset_t, vm_page_t)); +static PMAP_INLINE void free_pv_entry(pv_entry_t pv); +static pv_entry_t get_pv_entry(void); +static void alpha_protection_init(void); +static void pmap_changebit(vm_page_t m, int bit, boolean_t setem); + +static void pmap_remove_all(vm_page_t m); +static vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, + vm_page_t m, vm_page_t mpte); +static int pmap_remove_pte(pmap_t pmap, pt_entry_t* ptq, vm_offset_t sva); +static void pmap_remove_page(struct pmap *pmap, vm_offset_t va); +static int pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va); +static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, + vm_page_t mpte, vm_page_t m); + +static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va); + +static int pmap_release_free_page(pmap_t pmap, vm_page_t p); +static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex); +static vm_page_t pmap_page_lookup(vm_object_t object, vm_pindex_t pindex); +static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t); static void *pmap_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait); #ifdef SMP -static void pmap_invalidate_page_action __P((void *arg)); -static void pmap_invalidate_all_action __P((void *arg)); +static void pmap_invalidate_page_action(void *arg); +static void pmap_invalidate_all_action(void *arg); #endif @@ -3394,8 +3393,8 @@ pmap_pid_dump(int pid) #if defined(DEBUG) -static void pads __P((pmap_t pm)); -void pmap_pvdump __P((vm_offset_t pa)); +static void pads(pmap_t pm); +void pmap_pvdump(vm_offset_t pa); /* print address space of pmap*/ static void diff --git a/sys/alpha/alpha/prom.c b/sys/alpha/alpha/prom.c index b7449eb..ca9af2d 100644 --- a/sys/alpha/alpha/prom.c +++ b/sys/alpha/alpha/prom.c @@ -54,10 +54,10 @@ extern struct prom_vec prom_dispatch_v; int prom_mapped = 1; /* Is PROM still mapped? */ pt_entry_t rom_pte, saved_pte[1]; /* XXX */ -static pt_entry_t *rom_lev1map __P((void)); +static pt_entry_t *rom_lev1map(void); extern pt_entry_t* Lev1map; -static void prom_cache_sync __P((void)); +static void prom_cache_sync(void); static pt_entry_t * rom_lev1map() @@ -112,8 +112,8 @@ init_bootstrap_console() promcnattach(alpha_console); } -static critical_t enter_prom __P((void)); -static void leave_prom __P((critical_t)); +static critical_t enter_prom(void); +static void leave_prom(critical_t); /* diff --git a/sys/alpha/alpha/promcons.c b/sys/alpha/alpha/promcons.c index 04faaab..29a0919 100644 --- a/sys/alpha/alpha/promcons.c +++ b/sys/alpha/alpha/promcons.c @@ -85,10 +85,10 @@ static int polltime; static struct callout_handle promtimeouthandle = CALLOUT_HANDLE_INITIALIZER(&promtimeouthandle); -void promstart __P((struct tty *)); -void promtimeout __P((void *)); -int promparam __P((struct tty *, struct termios *)); -void promstop __P((struct tty *, int)); +void promstart(struct tty *); +void promtimeout(void *); +int promparam(struct tty *, struct termios *); +void promstop(struct tty *, int); int promopen(dev, flag, mode, td) diff --git a/sys/alpha/alpha/trap.c b/sys/alpha/alpha/trap.c index a09c91b..bbd1d5a 100644 --- a/sys/alpha/alpha/trap.c +++ b/sys/alpha/alpha/trap.c @@ -71,21 +71,21 @@ #endif #include <alpha/alpha/db_instruction.h> /* for handle_opdec() */ -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 thread *)); +int unaligned_fixup(unsigned long, unsigned long, + unsigned long, struct thread *); int handle_opdec(struct thread *td, 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); #ifdef WITNESS extern char *syscallnames[]; diff --git a/sys/alpha/alpha/vm_machdep.c b/sys/alpha/alpha/vm_machdep.c index e12267d..467f4fa 100644 --- a/sys/alpha/alpha/vm_machdep.c +++ b/sys/alpha/alpha/vm_machdep.c @@ -221,7 +221,7 @@ cpu_fork(td1, p2, td2, flags) void cpu_set_fork_handler(td, func, arg) struct thread *td; - void (*func) __P((void *)); + void (*func)(void *); void *arg; { /* diff --git a/sys/alpha/include/bootinfo.h b/sys/alpha/include/bootinfo.h index 86b7e7a..07484b2 100644 --- a/sys/alpha/include/bootinfo.h +++ b/sys/alpha/include/bootinfo.h @@ -50,9 +50,9 @@ struct bootinfo_v1 { char booted_kernel[64]; /* 80: name of booted kernel */ void *hwrpb; /* 144: hwrpb pointer (BEVA) */ u_long hwrpbsize; /* 152: size of hwrpb data */ - int (*cngetc) __P((void)); /* 160: console getc pointer */ - void (*cnputc) __P((int)); /* 168: console putc pointer */ - void (*cnpollc) __P((int)); /* 176: console pollc pointer */ + int (*cngetc)(void); /* 160: console getc pointer */ + void (*cnputc)(int); /* 168: console putc pointer */ + void (*cnpollc)(int); /* 176: console pollc pointer */ u_long pad[6]; /* 184: rsvd for future use */ char *envp; /* 232: start of environment */ u_long kernend; /* 240: end of kernel */ diff --git a/sys/alpha/include/clock.h b/sys/alpha/include/clock.h index 9e4ad71..b3f2e45 100644 --- a/sys/alpha/include/clock.h +++ b/sys/alpha/include/clock.h @@ -15,9 +15,9 @@ extern int disable_rtc_set; extern int wall_cmos_clock; extern int adjkerntz; -int sysbeep __P((int pitch, int period)); -int acquire_timer2 __P((int mode)); -int release_timer2 __P((void)); +int sysbeep(int pitch, int period); +int acquire_timer2(int mode); +int release_timer2(void); #endif diff --git a/sys/alpha/include/cpu.h b/sys/alpha/include/cpu.h index e5fd400..4abb738 100644 --- a/sys/alpha/include/cpu.h +++ b/sys/alpha/include/cpu.h @@ -107,42 +107,42 @@ struct trapframe; extern struct rpb *hwrpb; extern volatile int mc_expected, mc_received; -void XentArith __P((u_int64_t, u_int64_t, u_int64_t)); /* MAGIC */ -void XentIF __P((u_int64_t, u_int64_t, u_int64_t)); /* MAGIC */ -void XentInt __P((u_int64_t, u_int64_t, u_int64_t)); /* MAGIC */ -void XentMM __P((u_int64_t, u_int64_t, u_int64_t)); /* MAGIC */ -void XentRestart __P((void)); /* MAGIC */ -void XentSys __P((u_int64_t, u_int64_t, u_int64_t)); /* MAGIC */ -void XentUna __P((u_int64_t, u_int64_t, u_int64_t)); /* MAGIC */ -void alpha_init __P((u_long, u_long, u_long, u_long, u_long)); -int alpha_pa_access __P((u_long)); -void alpha_fpstate_check __P((struct thread *p)); -void alpha_fpstate_save __P((struct thread *p, int write)); -void alpha_fpstate_drop __P((struct thread *p)); -void alpha_fpstate_switch __P((struct thread *p)); -int badaddr __P((void *, size_t)); -int badaddr_read __P((void *, size_t, void *)); -u_int64_t console_restart __P((u_int64_t, u_int64_t, u_int64_t)); -void dumpconf __P((void)); -void exception_return __P((void)); /* MAGIC */ -void frametoreg __P((struct trapframe *, struct reg *)); -long fswintrberr __P((void)); /* MAGIC */ -void init_prom_interface __P((struct rpb*)); -void interrupt - __P((unsigned long, unsigned long, unsigned long, struct trapframe *)); -void machine_check - __P((unsigned long, struct trapframe *, unsigned long, unsigned long)); -u_int64_t hwrpb_checksum __P((void)); -void hwrpb_restart_setup __P((void)); -void regdump __P((struct trapframe *)); -void regtoframe __P((struct reg *, struct trapframe *)); -void savectx __P((struct pcb *)); -void set_iointr __P((void (*)(void *, unsigned long))); -void switch_exit __P((struct thread *)); /* MAGIC */ -void fork_trampoline __P((void)); /* MAGIC */ -void syscall __P((u_int64_t, struct trapframe *)); -void trap __P((unsigned long, unsigned long, unsigned long, unsigned long, - struct trapframe *)); +void XentArith(u_int64_t, u_int64_t, u_int64_t); /* MAGIC */ +void XentIF(u_int64_t, u_int64_t, u_int64_t); /* MAGIC */ +void XentInt(u_int64_t, u_int64_t, u_int64_t); /* MAGIC */ +void XentMM(u_int64_t, u_int64_t, u_int64_t); /* MAGIC */ +void XentRestart(void); /* MAGIC */ +void XentSys(u_int64_t, u_int64_t, u_int64_t); /* MAGIC */ +void XentUna(u_int64_t, u_int64_t, u_int64_t); /* MAGIC */ +void alpha_init(u_long, u_long, u_long, u_long, u_long); +int alpha_pa_access(u_long); +void alpha_fpstate_check(struct thread *p); +void alpha_fpstate_save(struct thread *p, int write); +void alpha_fpstate_drop(struct thread *p); +void alpha_fpstate_switch(struct thread *p); +int badaddr (void *, size_t); +int badaddr_read(void *, size_t, void *); +u_int64_t console_restart(u_int64_t, u_int64_t, u_int64_t); +void dumpconf(void); +void exception_return(void); /* MAGIC */ +void frametoreg(struct trapframe *, struct reg *); +long fswintrberr(void); /* MAGIC */ +void init_prom_interface(struct rpb*); +void interrupt(unsigned long, unsigned long, unsigned long, + struct trapframe *); +void machine_check(unsigned long, struct trapframe *, unsigned long, + unsigned long); +u_int64_t hwrpb_checksum(void); +void hwrpb_restart_setup(void); +void regdump(struct trapframe *); +void regtoframe(struct reg *, struct trapframe *); +void savectx(struct pcb *); +void set_iointr(void (*)(void *, unsigned long)); +void switch_exit(struct thread *); /* MAGIC */ +void fork_trampoline(void); /* MAGIC */ +void syscall(u_int64_t, struct trapframe *); +void trap(unsigned long, unsigned long, unsigned long, unsigned long, + struct trapframe *); /* * Return contents of in-cpu fast counter as a sort of "bogo-time" diff --git a/sys/alpha/include/cpuconf.h b/sys/alpha/include/cpuconf.h index c829730..6ca8daf 100644 --- a/sys/alpha/include/cpuconf.h +++ b/sys/alpha/include/cpuconf.h @@ -65,24 +65,24 @@ extern struct platform { * clockintr - Clock Interrupt Handler * mcheck_handler - Platform Specific Machine Check Handler */ - void (*cons_init) __P((void)); - void (*device_register) __P((struct device *, void *)); - void (*iointr) __P((void *, unsigned long)); - void (*clockintr) __P((void *)); - void (*mcheck_handler) __P((unsigned long, struct trapframe *, - unsigned long, unsigned long)); - void (*pci_intr_init) __P((void)); - void (*pci_intr_map) __P((void *)); - int (*pci_intr_route) __P((struct device *, struct device *, int)); - void (*pci_intr_disable) __P((int)); - void (*pci_intr_enable) __P((int)); - int (*pci_setup_ide_intr) __P((struct device *dev, + void (*cons_init)(void); + void (*device_register)(struct device *, void *); + void (*iointr)(void *, unsigned long); + void (*clockintr)(void *); + void (*mcheck_handler)(unsigned long, struct trapframe *, + unsigned long, unsigned long); + void (*pci_intr_init)(void); + void (*pci_intr_map)(void *); + int (*pci_intr_route)(struct device *, struct device *, int); + void (*pci_intr_disable)(int); + void (*pci_intr_enable)(int); + int (*pci_setup_ide_intr)(struct device *dev, struct device *child, - int chan, void (*fn)(void*), void *arg)); - int (*isa_setup_intr) __P((struct device *, struct device *, - struct resource *, int, void *, void *, void **)); - int (*isa_teardown_intr) __P((struct device *, struct device *, - struct resource *, void *)); + int chan, void (*fn)(void*), void *arg); + int (*isa_setup_intr)(struct device *, struct device *, + struct resource *, int, void *, void *, void **); + int (*isa_teardown_intr)(struct device *, struct device *, + struct resource *, void *); } platform; /* @@ -108,7 +108,7 @@ struct alpha_variation_table { */ struct cpuinit { - void (*init) __P((int)); + void (*init)(int); const char *option; }; @@ -118,17 +118,17 @@ struct cpuinit { /* * Misc. support routines. */ -const char *alpha_dsr_sysname __P((void)); -const char *alpha_variation_name __P((u_int64_t variation, - const struct alpha_variation_table *avtp)); -const char *alpha_unknown_sysname __P((void)); +const char *alpha_dsr_sysname(void); +const char *alpha_variation_name(u_int64_t variation, + const struct alpha_variation_table *avtp); +const char *alpha_unknown_sysname(void); extern struct cpuinit cpuinit[]; extern struct cpuinit api_cpuinit[]; extern int ncpuinit; extern int napi_cpuinit; -extern void platform_not_configured __P((int)); -extern void platform_not_supported __P((int)); +extern void platform_not_configured(int); +extern void platform_not_supported(int); #endif /* _KERNEL */ #endif /* !_ALPHA_CPUCONF_H */ diff --git a/sys/alpha/include/db_machdep.h b/sys/alpha/include/db_machdep.h index 786f271..6c57783 100644 --- a/sys/alpha/include/db_machdep.h +++ b/sys/alpha/include/db_machdep.h @@ -80,14 +80,14 @@ extern db_regs_t ddb_regs; /* register state */ * Functions needed for software single-stepping. */ -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)); -boolean_t db_inst_load __P((int inst)); -boolean_t 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)); +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); +boolean_t db_inst_load(int inst); +boolean_t 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); #define inst_trap_return(ins) db_inst_trap_return(ins) #define inst_return(ins) db_inst_return(ins) @@ -103,9 +103,9 @@ db_addr_t db_branch_taken __P((int inst, db_addr_t pc, db_regs_t *regs)); /* No delay slots on Alpha. */ #define next_instr_address(v, b) ((db_addr_t) ((b) ? (v) : ((v) + 4))) -u_long db_register_value __P((db_regs_t *, int)); -int kdb_trap __P((unsigned long, unsigned long, unsigned long, - unsigned long, struct trapframe *)); +u_long db_register_value(db_regs_t *, int); +int kdb_trap(unsigned long, unsigned long, unsigned long, + unsigned long, struct trapframe *); /* * Pretty arbitrary diff --git a/sys/alpha/include/float.h b/sys/alpha/include/float.h index 1a3d871..4d72b0e 100644 --- a/sys/alpha/include/float.h +++ b/sys/alpha/include/float.h @@ -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/alpha/include/md_var.h b/sys/alpha/include/md_var.h index 8a90433..b43db60 100644 --- a/sys/alpha/include/md_var.h +++ b/sys/alpha/include/md_var.h @@ -45,12 +45,12 @@ struct reg; struct cam_sim; struct pcicfg; -void busdma_swi __P((void)); -void cpu_halt __P((void)); -void cpu_reset __P((void)); -int is_physical_memory __P((vm_offset_t addr)); -void swi_vm __P((void *)); -void alpha_register_pci_scsi __P((int bus, int slot, struct cam_sim *sim)); +void busdma_swi(void); +void cpu_halt(void); +void cpu_reset(void); +int is_physical_memory(vm_offset_t addr); +void swi_vm(void *); +void alpha_register_pci_scsi(int bus, int slot, struct cam_sim *sim); #ifdef _SYS_BUS_H_ struct resource *alpha_platform_alloc_ide_intr(int chan); int alpha_platform_release_ide_intr(int chan, struct resource *res); diff --git a/sys/alpha/include/pmap.h b/sys/alpha/include/pmap.h index 1c258d9..e06902f 100644 --- a/sys/alpha/include/pmap.h +++ b/sys/alpha/include/pmap.h @@ -227,19 +227,19 @@ extern vm_offset_t virtual_end; struct vmspace; -vm_offset_t pmap_steal_memory __P((vm_size_t)); -void pmap_bootstrap __P((vm_offset_t, u_int)); -void pmap_setdevram __P((unsigned long long basea, vm_offset_t sizea)); -int pmap_uses_prom_console __P((void)); -pmap_t pmap_kernel __P((void)); -void *pmap_mapdev __P((vm_offset_t, vm_size_t)); -void pmap_unmapdev __P((vm_offset_t, vm_size_t)); -unsigned *pmap_pte __P((pmap_t, vm_offset_t)) __pure2; -vm_page_t pmap_use_pt __P((pmap_t, vm_offset_t)); -void pmap_set_opt __P((unsigned *)); -void pmap_set_opt_bsp __P((void)); -void pmap_deactivate __P((struct thread *td)); -void pmap_emulate_reference __P((struct vmspace *vm, vm_offset_t v, int user, int write)); +vm_offset_t pmap_steal_memory(vm_size_t); +void pmap_bootstrap(vm_offset_t, u_int); +void pmap_setdevram(unsigned long long basea, vm_offset_t sizea); +int pmap_uses_prom_console(void); +pmap_t pmap_kernel(void); +void *pmap_mapdev(vm_offset_t, vm_size_t); +void pmap_unmapdev(vm_offset_t, vm_size_t); +unsigned *pmap_pte(pmap_t, vm_offset_t) __pure2; +vm_page_t pmap_use_pt(pmap_t, vm_offset_t); +void pmap_set_opt (unsigned *); +void pmap_set_opt_bsp (void); +void pmap_deactivate(struct thread *td); +void pmap_emulate_reference(struct vmspace *vm, vm_offset_t v, int user, int write); #endif /* _KERNEL */ diff --git a/sys/alpha/include/profile.h b/sys/alpha/include/profile.h index 57fbb69..97d8113 100644 --- a/sys/alpha/include/profile.h +++ b/sys/alpha/include/profile.h @@ -223,10 +223,10 @@ LX98: ldgp $29,0($27); \ #ifdef GUPROF struct gmonparam; -void nullfunc_loop_profiled __P((void)); -void nullfunc_profiled __P((void)); -void startguprof __P((struct gmonparam *p)); -void stopguprof __P((struct gmonparam *p)); +void nullfunc_loop_profiled(void); +void nullfunc_profiled(void); +void startguprof(struct gmonparam *p); +void stopguprof(struct gmonparam *p); #else #define startguprof(p) #define stopguprof(p) diff --git a/sys/alpha/include/prom.h b/sys/alpha/include/prom.h index 537f9cf..b242f1d 100644 --- a/sys/alpha/include/prom.h +++ b/sys/alpha/include/prom.h @@ -49,13 +49,13 @@ typedef union { } prom_return_t; #ifdef STANDALONE -int getchar __P((void)); -int prom_open __P((char *, int)); -void putchar __P((int)); +int getchar(void); +int prom_open(char *, int); +void putchar(int); #endif -void prom_halt __P((int)) __attribute__((__noreturn__)); -int prom_getenv __P((int, char *, int)); +void prom_halt(int) __attribute__((__noreturn__)); +int prom_getenv(int, char *, int); #endif @@ -95,14 +95,14 @@ int prom_getenv __P((int, char *, int)); #ifndef ASSEMBLER #ifdef _KERNEL -void promcnattach __P((int)); -void promcndetach __P((void)); -void promcnputc __P((dev_t, int)); -int promcngetc __P((dev_t)); -int promcncheckc __P((dev_t)); +void promcnattach(int); +void promcndetach(void); +void promcnputc(dev_t, int); +int promcngetc(dev_t); +int promcncheckc(dev_t); -u_int64_t prom_dispatch __P((u_int64_t, u_int64_t, u_int64_t, u_int64_t, - u_int64_t)); -void init_bootstrap_console __P((void)); +u_int64_t prom_dispatch(u_int64_t, u_int64_t, u_int64_t, u_int64_t, + u_int64_t); +void init_bootstrap_console(void); #endif /* _KERNEL */ #endif /* ASSEMBLER */ diff --git a/sys/alpha/include/reg.h b/sys/alpha/include/reg.h index d71df0a..3ea6143 100644 --- a/sys/alpha/include/reg.h +++ b/sys/alpha/include/reg.h @@ -108,19 +108,19 @@ struct dbreg { }; #ifdef _KERNEL -void restorefpstate __P((struct fpreg *)); -void savefpstate __P((struct fpreg *)); +void restorefpstate(struct fpreg *); +void savefpstate(struct fpreg *); /* * XXX these interfaces are MI, so they should be declared in a MI place. */ -void setregs __P((struct thread *, u_long, u_long, u_long)); -int fill_regs __P((struct thread *, struct reg *)); -int set_regs __P((struct thread *, struct reg *)); -int fill_fpregs __P((struct thread *, struct fpreg *)); -int set_fpregs __P((struct thread *, struct fpreg *)); -int fill_dbregs __P((struct thread *, struct dbreg *)); -int set_dbregs __P((struct thread *, struct dbreg *)); +void setregs(struct thread *, u_long, u_long, u_long); +int fill_regs(struct thread *, struct reg *); +int set_regs(struct thread *, struct reg *); +int fill_fpregs(struct thread *, struct fpreg *); +int set_fpregs(struct thread *, struct fpreg *); +int fill_dbregs(struct thread *, struct dbreg *); +int set_dbregs(struct thread *, struct dbreg *); #endif #endif /* _ALPHA_REG_H_ */ diff --git a/sys/alpha/include/sysarch.h b/sys/alpha/include/sysarch.h index 93ff1ee..45313fc 100644 --- a/sys/alpha/include/sysarch.h +++ b/sys/alpha/include/sysarch.h @@ -51,7 +51,7 @@ union descriptor; __BEGIN_DECLS -int alpha_sethae __P((u_int64_t)); +int alpha_sethae(u_int64_t); __END_DECLS #endif diff --git a/sys/alpha/linux/linux_proto.h b/sys/alpha/linux/linux_proto.h index 6790d2b..a70c3f9 100644 --- a/sys/alpha/linux/linux_proto.h +++ b/sys/alpha/linux/linux_proto.h @@ -580,139 +580,139 @@ struct linux_getdents64_args { char dirent_l_[PADL_(void *)]; void * dirent; char dirent_r_[PADR_(void *)]; char count_l_[PADL_(l_uint)]; l_uint count; char count_r_[PADR_(l_uint)]; }; -int linux_fork __P((struct thread *, struct linux_fork_args *)); -int osf1_wait4 __P((struct thread *, struct osf1_wait4_args *)); -int linux_link __P((struct thread *, struct linux_link_args *)); -int linux_unlink __P((struct thread *, struct linux_unlink_args *)); -int linux_chdir __P((struct thread *, struct linux_chdir_args *)); -int linux_mknod __P((struct thread *, struct linux_mknod_args *)); -int linux_chmod __P((struct thread *, struct linux_chmod_args *)); -int linux_chown __P((struct thread *, struct linux_chown_args *)); -int linux_brk __P((struct thread *, struct linux_brk_args *)); -int linux_lseek __P((struct thread *, struct linux_lseek_args *)); -int linux_umount __P((struct thread *, struct linux_umount_args *)); -int linux_ptrace __P((struct thread *, struct linux_ptrace_args *)); -int linux_access __P((struct thread *, struct linux_access_args *)); -int linux_kill __P((struct thread *, struct linux_kill_args *)); -int linux_open __P((struct thread *, struct linux_open_args *)); -int osf1_sigprocmask __P((struct thread *, struct osf1_sigprocmask_args *)); -int linux_sigpending __P((struct thread *, struct linux_sigpending_args *)); -int linux_ioctl __P((struct thread *, struct linux_ioctl_args *)); -int linux_symlink __P((struct thread *, struct linux_symlink_args *)); -int linux_readlink __P((struct thread *, struct linux_readlink_args *)); -int linux_execve __P((struct thread *, struct linux_execve_args *)); -int linux_getpagesize __P((struct thread *, struct linux_getpagesize_args *)); -int linux_vfork __P((struct thread *, struct linux_vfork_args *)); -int linux_newstat __P((struct thread *, struct linux_newstat_args *)); -int linux_newlstat __P((struct thread *, struct linux_newlstat_args *)); -int linux_mmap __P((struct thread *, struct linux_mmap_args *)); -int linux_munmap __P((struct thread *, struct linux_munmap_args *)); -int linux_mprotect __P((struct thread *, struct linux_mprotect_args *)); -int linux_madvise __P((struct thread *, struct linux_madvise_args *)); -int linux_vhangup __P((struct thread *, struct linux_vhangup_args *)); -int linux_setgroups __P((struct thread *, struct linux_setgroups_args *)); -int linux_getgroups __P((struct thread *, struct linux_getgroups_args *)); -int osf1_setitimer __P((struct thread *, struct osf1_setitimer_args *)); -int linux_gethostname __P((struct thread *, struct linux_gethostname_args *)); -int linux_getdtablesize __P((struct thread *, struct linux_getdtablesize_args *)); -int linux_newfstat __P((struct thread *, struct linux_newfstat_args *)); -int linux_fcntl __P((struct thread *, struct linux_fcntl_args *)); -int osf1_select __P((struct thread *, struct osf1_select_args *)); -int osf1_socket __P((struct thread *, struct osf1_socket_args *)); -int linux_connect __P((struct thread *, struct linux_connect_args *)); -int osf1_sigreturn __P((struct thread *, struct osf1_sigreturn_args *)); -int osf1_sigsuspend __P((struct thread *, struct osf1_sigsuspend_args *)); -int linux_recvmsg __P((struct thread *, struct linux_recvmsg_args *)); -int linux_sendmsg __P((struct thread *, struct linux_sendmsg_args *)); -int osf1_gettimeofday __P((struct thread *, struct osf1_gettimeofday_args *)); -int osf1_getrusage __P((struct thread *, struct osf1_getrusage_args *)); -int linux_rename __P((struct thread *, struct linux_rename_args *)); -int linux_truncate __P((struct thread *, struct linux_truncate_args *)); -int osf1_sendto __P((struct thread *, struct osf1_sendto_args *)); -int linux_socketpair __P((struct thread *, struct linux_socketpair_args *)); -int linux_mkdir __P((struct thread *, struct linux_mkdir_args *)); -int linux_rmdir __P((struct thread *, struct linux_rmdir_args *)); -int linux_getrlimit __P((struct thread *, struct linux_getrlimit_args *)); -int linux_setrlimit __P((struct thread *, struct linux_setrlimit_args *)); -int linux_quotactl __P((struct thread *, struct linux_quotactl_args *)); -int osf1_sigaction __P((struct thread *, struct osf1_sigaction_args *)); -int linux_msgctl __P((struct thread *, struct linux_msgctl_args *)); -int linux_msgget __P((struct thread *, struct linux_msgget_args *)); -int linux_msgrcv __P((struct thread *, struct linux_msgrcv_args *)); -int linux_msgsnd __P((struct thread *, struct linux_msgsnd_args *)); -int linux_semctl __P((struct thread *, struct linux_semctl_args *)); -int linux_semget __P((struct thread *, struct linux_semget_args *)); -int linux_semop __P((struct thread *, struct linux_semop_args *)); -int linux_lchown __P((struct thread *, struct linux_lchown_args *)); -int linux_shmat __P((struct thread *, struct linux_shmat_args *)); -int linux_shmctl __P((struct thread *, struct linux_shmctl_args *)); -int linux_shmdt __P((struct thread *, struct linux_shmdt_args *)); -int linux_shmget __P((struct thread *, struct linux_shmget_args *)); -int linux_msync __P((struct thread *, struct linux_msync_args *)); -int linux_getsid __P((struct thread *, struct linux_getsid_args *)); -int linux_sigaltstack __P((struct thread *, struct linux_sigaltstack_args *)); -int osf1_sysinfo __P((struct thread *, struct osf1_sysinfo_args *)); -int linux_sysfs __P((struct thread *, struct linux_sysfs_args *)); -int osf1_getsysinfo __P((struct thread *, struct osf1_getsysinfo_args *)); -int osf1_setsysinfo __P((struct thread *, struct osf1_setsysinfo_args *)); -int linux_bdflush __P((struct thread *, struct linux_bdflush_args *)); -int linux_sethae __P((struct thread *, struct linux_sethae_args *)); -int linux_mount __P((struct thread *, struct linux_mount_args *)); -int linux_old_adjtimex __P((struct thread *, struct linux_old_adjtimex_args *)); -int linux_swapoff __P((struct thread *, struct linux_swapoff_args *)); -int linux_getdents __P((struct thread *, struct linux_getdents_args *)); -int linux_create_module __P((struct thread *, struct linux_create_module_args *)); -int linux_init_module __P((struct thread *, struct linux_init_module_args *)); -int linux_delete_module __P((struct thread *, struct linux_delete_module_args *)); -int linux_get_kernel_syms __P((struct thread *, struct linux_get_kernel_syms_args *)); -int linux_syslog __P((struct thread *, struct linux_syslog_args *)); -int linux_reboot __P((struct thread *, struct linux_reboot_args *)); -int linux_clone __P((struct thread *, struct linux_clone_args *)); -int linux_uselib __P((struct thread *, struct linux_uselib_args *)); -int linux_sysinfo __P((struct thread *, struct linux_sysinfo_args *)); -int linux_sysctl __P((struct thread *, struct linux_sysctl_args *)); -int linux_oldumount __P((struct thread *, struct linux_oldumount_args *)); -int linux_times __P((struct thread *, struct linux_times_args *)); -int linux_personality __P((struct thread *, struct linux_personality_args *)); -int linux_setfsuid __P((struct thread *, struct linux_setfsuid_args *)); -int linux_setfsgid __P((struct thread *, struct linux_setfsgid_args *)); -int linux_ustat __P((struct thread *, struct linux_ustat_args *)); -int linux_statfs __P((struct thread *, struct linux_statfs_args *)); -int linux_fstatfs __P((struct thread *, struct linux_fstatfs_args *)); -int linux_sched_setscheduler __P((struct thread *, struct linux_sched_setscheduler_args *)); -int linux_sched_getscheduler __P((struct thread *, struct linux_sched_getscheduler_args *)); -int linux_sched_get_priority_max __P((struct thread *, struct linux_sched_get_priority_max_args *)); -int linux_sched_get_priority_min __P((struct thread *, struct linux_sched_get_priority_min_args *)); -int linux_newuname __P((struct thread *, struct linux_newuname_args *)); -int linux_mremap __P((struct thread *, struct linux_mremap_args *)); -int linux_nfsservctl __P((struct thread *, struct linux_nfsservctl_args *)); -int linux_pciconfig_read __P((struct thread *, struct linux_pciconfig_read_args *)); -int linux_pciconfig_write __P((struct thread *, struct linux_pciconfig_write_args *)); -int linux_query_module __P((struct thread *, struct linux_query_module_args *)); -int linux_prctl __P((struct thread *, struct linux_prctl_args *)); -int linux_pread __P((struct thread *, struct linux_pread_args *)); -int linux_pwrite __P((struct thread *, struct linux_pwrite_args *)); -int linux_rt_sigreturn __P((struct thread *, struct linux_rt_sigreturn_args *)); -int linux_rt_sigaction __P((struct thread *, struct linux_rt_sigaction_args *)); -int linux_rt_sigprocmask __P((struct thread *, struct linux_rt_sigprocmask_args *)); -int linux_rt_sigpending __P((struct thread *, struct linux_rt_sigpending_args *)); -int linux_rt_sigtimedwait __P((struct thread *, struct linux_rt_sigtimedwait_args *)); -int linux_rt_sigqueueinfo __P((struct thread *, struct linux_rt_sigqueueinfo_args *)); -int linux_rt_sigsuspend __P((struct thread *, struct linux_rt_sigsuspend_args *)); -int linux_select __P((struct thread *, struct linux_select_args *)); -int linux_getitimer __P((struct thread *, struct linux_getitimer_args *)); -int linux_setitimer __P((struct thread *, struct linux_setitimer_args *)); -int linux_utimes __P((struct thread *, struct linux_utimes_args *)); -int linux_wait4 __P((struct thread *, struct linux_wait4_args *)); -int linux_adjtimex __P((struct thread *, struct linux_adjtimex_args *)); -int linux_getcwd __P((struct thread *, struct linux_getcwd_args *)); -int linux_capget __P((struct thread *, struct linux_capget_args *)); -int linux_capset __P((struct thread *, struct linux_capset_args *)); -int linux_sendfile __P((struct thread *, struct linux_sendfile_args *)); -int linux_pivot_root __P((struct thread *, struct linux_pivot_root_args *)); -int linux_mincore __P((struct thread *, struct linux_mincore_args *)); -int linux_pciconfig_iobase __P((struct thread *, struct linux_pciconfig_iobase_args *)); -int linux_getdents64 __P((struct thread *, struct linux_getdents64_args *)); +int linux_fork(struct thread *, struct linux_fork_args *); +int osf1_wait4(struct thread *, struct osf1_wait4_args *); +int linux_link(struct thread *, struct linux_link_args *); +int linux_unlink(struct thread *, struct linux_unlink_args *); +int linux_chdir(struct thread *, struct linux_chdir_args *); +int linux_mknod(struct thread *, struct linux_mknod_args *); +int linux_chmod(struct thread *, struct linux_chmod_args *); +int linux_chown(struct thread *, struct linux_chown_args *); +int linux_brk(struct thread *, struct linux_brk_args *); +int linux_lseek(struct thread *, struct linux_lseek_args *); +int linux_umount(struct thread *, struct linux_umount_args *); +int linux_ptrace(struct thread *, struct linux_ptrace_args *); +int linux_access(struct thread *, struct linux_access_args *); +int linux_kill(struct thread *, struct linux_kill_args *); +int linux_open(struct thread *, struct linux_open_args *); +int osf1_sigprocmask(struct thread *, struct osf1_sigprocmask_args *); +int linux_sigpending(struct thread *, struct linux_sigpending_args *); +int linux_ioctl(struct thread *, struct linux_ioctl_args *); +int linux_symlink(struct thread *, struct linux_symlink_args *); +int linux_readlink(struct thread *, struct linux_readlink_args *); +int linux_execve(struct thread *, struct linux_execve_args *); +int linux_getpagesize(struct thread *, struct linux_getpagesize_args *); +int linux_vfork(struct thread *, struct linux_vfork_args *); +int linux_newstat(struct thread *, struct linux_newstat_args *); +int linux_newlstat(struct thread *, struct linux_newlstat_args *); +int linux_mmap(struct thread *, struct linux_mmap_args *); +int linux_munmap(struct thread *, struct linux_munmap_args *); +int linux_mprotect(struct thread *, struct linux_mprotect_args *); +int linux_madvise(struct thread *, struct linux_madvise_args *); +int linux_vhangup(struct thread *, struct linux_vhangup_args *); +int linux_setgroups(struct thread *, struct linux_setgroups_args *); +int linux_getgroups(struct thread *, struct linux_getgroups_args *); +int osf1_setitimer(struct thread *, struct osf1_setitimer_args *); +int linux_gethostname(struct thread *, struct linux_gethostname_args *); +int linux_getdtablesize(struct thread *, struct linux_getdtablesize_args *); +int linux_newfstat(struct thread *, struct linux_newfstat_args *); +int linux_fcntl(struct thread *, struct linux_fcntl_args *); +int osf1_select(struct thread *, struct osf1_select_args *); +int osf1_socket(struct thread *, struct osf1_socket_args *); +int linux_connect(struct thread *, struct linux_connect_args *); +int osf1_sigreturn(struct thread *, struct osf1_sigreturn_args *); +int osf1_sigsuspend(struct thread *, struct osf1_sigsuspend_args *); +int linux_recvmsg(struct thread *, struct linux_recvmsg_args *); +int linux_sendmsg(struct thread *, struct linux_sendmsg_args *); +int osf1_gettimeofday(struct thread *, struct osf1_gettimeofday_args *); +int osf1_getrusage(struct thread *, struct osf1_getrusage_args *); +int linux_rename(struct thread *, struct linux_rename_args *); +int linux_truncate(struct thread *, struct linux_truncate_args *); +int osf1_sendto(struct thread *, struct osf1_sendto_args *); +int linux_socketpair(struct thread *, struct linux_socketpair_args *); +int linux_mkdir(struct thread *, struct linux_mkdir_args *); +int linux_rmdir(struct thread *, struct linux_rmdir_args *); +int linux_getrlimit(struct thread *, struct linux_getrlimit_args *); +int linux_setrlimit(struct thread *, struct linux_setrlimit_args *); +int linux_quotactl(struct thread *, struct linux_quotactl_args *); +int osf1_sigaction(struct thread *, struct osf1_sigaction_args *); +int linux_msgctl(struct thread *, struct linux_msgctl_args *); +int linux_msgget(struct thread *, struct linux_msgget_args *); +int linux_msgrcv(struct thread *, struct linux_msgrcv_args *); +int linux_msgsnd(struct thread *, struct linux_msgsnd_args *); +int linux_semctl(struct thread *, struct linux_semctl_args *); +int linux_semget(struct thread *, struct linux_semget_args *); +int linux_semop(struct thread *, struct linux_semop_args *); +int linux_lchown(struct thread *, struct linux_lchown_args *); +int linux_shmat(struct thread *, struct linux_shmat_args *); +int linux_shmctl(struct thread *, struct linux_shmctl_args *); +int linux_shmdt(struct thread *, struct linux_shmdt_args *); +int linux_shmget(struct thread *, struct linux_shmget_args *); +int linux_msync(struct thread *, struct linux_msync_args *); +int linux_getsid(struct thread *, struct linux_getsid_args *); +int linux_sigaltstack(struct thread *, struct linux_sigaltstack_args *); +int osf1_sysinfo(struct thread *, struct osf1_sysinfo_args *); +int linux_sysfs(struct thread *, struct linux_sysfs_args *); +int osf1_getsysinfo(struct thread *, struct osf1_getsysinfo_args *); +int osf1_setsysinfo(struct thread *, struct osf1_setsysinfo_args *); +int linux_bdflush(struct thread *, struct linux_bdflush_args *); +int linux_sethae(struct thread *, struct linux_sethae_args *); +int linux_mount(struct thread *, struct linux_mount_args *); +int linux_old_adjtimex(struct thread *, struct linux_old_adjtimex_args *); +int linux_swapoff(struct thread *, struct linux_swapoff_args *); +int linux_getdents(struct thread *, struct linux_getdents_args *); +int linux_create_module(struct thread *, struct linux_create_module_args *); +int linux_init_module(struct thread *, struct linux_init_module_args *); +int linux_delete_module(struct thread *, struct linux_delete_module_args *); +int linux_get_kernel_syms(struct thread *, struct linux_get_kernel_syms_args *); +int linux_syslog(struct thread *, struct linux_syslog_args *); +int linux_reboot(struct thread *, struct linux_reboot_args *); +int linux_clone(struct thread *, struct linux_clone_args *); +int linux_uselib(struct thread *, struct linux_uselib_args *); +int linux_sysinfo(struct thread *, struct linux_sysinfo_args *); +int linux_sysctl(struct thread *, struct linux_sysctl_args *); +int linux_oldumount(struct thread *, struct linux_oldumount_args *); +int linux_times(struct thread *, struct linux_times_args *); +int linux_personality(struct thread *, struct linux_personality_args *); +int linux_setfsuid(struct thread *, struct linux_setfsuid_args *); +int linux_setfsgid(struct thread *, struct linux_setfsgid_args *); +int linux_ustat(struct thread *, struct linux_ustat_args *); +int linux_statfs(struct thread *, struct linux_statfs_args *); +int linux_fstatfs(struct thread *, struct linux_fstatfs_args *); +int linux_sched_setscheduler(struct thread *, struct linux_sched_setscheduler_args *); +int linux_sched_getscheduler(struct thread *, struct linux_sched_getscheduler_args *); +int linux_sched_get_priority_max(struct thread *, struct linux_sched_get_priority_max_args *); +int linux_sched_get_priority_min(struct thread *, struct linux_sched_get_priority_min_args *); +int linux_newuname(struct thread *, struct linux_newuname_args *); +int linux_mremap(struct thread *, struct linux_mremap_args *); +int linux_nfsservctl(struct thread *, struct linux_nfsservctl_args *); +int linux_pciconfig_read(struct thread *, struct linux_pciconfig_read_args *); +int linux_pciconfig_write(struct thread *, struct linux_pciconfig_write_args *); +int linux_query_module(struct thread *, struct linux_query_module_args *); +int linux_prctl(struct thread *, struct linux_prctl_args *); +int linux_pread(struct thread *, struct linux_pread_args *); +int linux_pwrite(struct thread *, struct linux_pwrite_args *); +int linux_rt_sigreturn(struct thread *, struct linux_rt_sigreturn_args *); +int linux_rt_sigaction(struct thread *, struct linux_rt_sigaction_args *); +int linux_rt_sigprocmask(struct thread *, struct linux_rt_sigprocmask_args *); +int linux_rt_sigpending(struct thread *, struct linux_rt_sigpending_args *); +int linux_rt_sigtimedwait(struct thread *, struct linux_rt_sigtimedwait_args *); +int linux_rt_sigqueueinfo(struct thread *, struct linux_rt_sigqueueinfo_args *); +int linux_rt_sigsuspend(struct thread *, struct linux_rt_sigsuspend_args *); +int linux_select(struct thread *, struct linux_select_args *); +int linux_getitimer(struct thread *, struct linux_getitimer_args *); +int linux_setitimer(struct thread *, struct linux_setitimer_args *); +int linux_utimes(struct thread *, struct linux_utimes_args *); +int linux_wait4(struct thread *, struct linux_wait4_args *); +int linux_adjtimex(struct thread *, struct linux_adjtimex_args *); +int linux_getcwd(struct thread *, struct linux_getcwd_args *); +int linux_capget(struct thread *, struct linux_capget_args *); +int linux_capset(struct thread *, struct linux_capset_args *); +int linux_sendfile(struct thread *, struct linux_sendfile_args *); +int linux_pivot_root(struct thread *, struct linux_pivot_root_args *); +int linux_mincore(struct thread *, struct linux_mincore_args *); +int linux_pciconfig_iobase(struct thread *, struct linux_pciconfig_iobase_args *); +int linux_getdents64(struct thread *, struct linux_getdents64_args *); #ifdef COMPAT_43 diff --git a/sys/alpha/linux/linux_sysvec.c b/sys/alpha/linux/linux_sysvec.c index 0380d7d..596a1d9 100644 --- a/sys/alpha/linux/linux_sysvec.c +++ b/sys/alpha/linux/linux_sysvec.c @@ -81,9 +81,9 @@ SET_DECLARE(linux_ioctl_handler_set, struct linux_ioctl_handler); void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code); -static int elf_linux_fixup __P((long **stack_base, - struct image_params *iparams)); -static int exec_linux_imgact_try __P((struct image_params *iparams)); +static int elf_linux_fixup(long **stack_base, + struct image_params *iparams); +static int exec_linux_imgact_try(struct image_params *iparams); static int elf_linux_fixup(long **stack_base, struct image_params *imgp) diff --git a/sys/alpha/osf1/osf1_ioctl.c b/sys/alpha/osf1/osf1_ioctl.c index 5f3ede1..e4e230c 100644 --- a/sys/alpha/osf1/osf1_ioctl.c +++ b/sys/alpha/osf1/osf1_ioctl.c @@ -56,14 +56,14 @@ /*#define IOCTL_DEBUG*/ -int osf1_ioctl_i __P((struct thread *td, struct ioctl_args *nuap, - int cmd, int dir, int len)); -int osf1_ioctl_t __P((struct thread *td, struct ioctl_args *nuap, - int cmd, int dir, int len)); -int osf1_ioctl_f __P((struct thread *td, struct ioctl_args *nuap, - int cmd, int dir, int len)); -int osf1_ioctl_m __P((struct thread *td, struct ioctl_args *nuap, - int cmd, int dir, int len)); +int osf1_ioctl_i(struct thread *td, struct ioctl_args *nuap, + int cmd, int dir, int len); +int osf1_ioctl_t(struct thread *td, struct ioctl_args *nuap, + int cmd, int dir, int len); +int osf1_ioctl_f(struct thread *td, struct ioctl_args *nuap, + int cmd, int dir, int len); +int osf1_ioctl_m(struct thread *td, struct ioctl_args *nuap, + int cmd, int dir, int len); int osf1_ioctl(td, uap) diff --git a/sys/alpha/osf1/osf1_misc.c b/sys/alpha/osf1/osf1_misc.c index 235ba90..7c82947 100644 --- a/sys/alpha/osf1/osf1_misc.c +++ b/sys/alpha/osf1/osf1_misc.c @@ -90,8 +90,8 @@ #include <machine/fpu.h> #include <machine/rpb.h> -static void cvtstat2osf1 __P((struct stat *, struct osf1_stat *)); -static int osf2bsd_pathconf __P((int *)); +static void cvtstat2osf1(struct stat *, struct osf1_stat *); +static int osf2bsd_pathconf(int *); static const char osf1_emul_path[] = "/compat/osf1"; /* diff --git a/sys/alpha/osf1/osf1_mount.c b/sys/alpha/osf1/osf1_mount.c index 4244da3..faa9178 100644 --- a/sys/alpha/osf1/osf1_mount.c +++ b/sys/alpha/osf1/osf1_mount.c @@ -68,11 +68,11 @@ #include <alpha/osf1/osf1.h> -void bsd2osf_statfs __P((struct statfs *, struct osf1_statfs *)); -int osf1_mount_mfs __P((struct thread *, struct osf1_mount_args *, - struct mount_args *)); -int osf1_mount_nfs __P((struct thread *, struct osf1_mount_args *, - struct mount_args *)); +void bsd2osf_statfs(struct statfs *, struct osf1_statfs *); +int osf1_mount_mfs(struct thread *, struct osf1_mount_args *, + struct mount_args *); +int osf1_mount_nfs(struct thread *, struct osf1_mount_args *, + struct mount_args *); #ifdef notanymore static const char *fsnames[OSF1_MOUNT_MAXTYPE+2] = INITMOUNTNAMES; diff --git a/sys/alpha/osf1/osf1_proto.h b/sys/alpha/osf1/osf1_proto.h index 11784e7..a6f0d5c 100644 --- a/sys/alpha/osf1/osf1_proto.h +++ b/sys/alpha/osf1/osf1_proto.h @@ -296,64 +296,64 @@ struct osf1_setsysinfo_args { char arg_l_[PADL_(caddr_t)]; caddr_t arg; char arg_r_[PADR_(caddr_t)]; char flag_l_[PADL_(u_long)]; u_long flag; char flag_r_[PADR_(u_long)]; }; -int osf1_wait4 __P((struct thread *, struct osf1_wait4_args *)); -int osf1_mknod __P((struct thread *, struct osf1_mknod_args *)); -int osf1_getfsstat __P((struct thread *, struct osf1_getfsstat_args *)); -int osf1_lseek __P((struct thread *, struct osf1_lseek_args *)); -int osf1_mount __P((struct thread *, struct osf1_mount_args *)); -int osf1_unmount __P((struct thread *, struct osf1_unmount_args *)); -int osf1_setuid __P((struct thread *, struct osf1_setuid_args *)); -int osf1_access __P((struct thread *, struct osf1_access_args *)); -int osf1_kill __P((struct thread *, struct osf1_kill_args *)); -int osf1_set_program_attributes __P((struct thread *, struct osf1_set_program_attributes_args *)); -int osf1_open __P((struct thread *, struct osf1_open_args *)); -int osf1_sigprocmask __P((struct thread *, struct osf1_sigprocmask_args *)); -int osf1_sigpending __P((struct thread *, struct osf1_sigpending_args *)); -int osf1_classcntl __P((struct thread *, struct osf1_classcntl_args *)); -int osf1_ioctl __P((struct thread *, struct osf1_ioctl_args *)); -int osf1_reboot __P((struct thread *, struct osf1_reboot_args *)); -int osf1_execve __P((struct thread *, struct osf1_execve_args *)); -int osf1_stat __P((struct thread *, struct osf1_stat_args *)); -int osf1_lstat __P((struct thread *, struct osf1_lstat_args *)); -int osf1_mmap __P((struct thread *, struct osf1_mmap_args *)); -int osf1_madvise __P((struct thread *, struct osf1_madvise_args *)); -int osf1_setpgrp __P((struct thread *, struct osf1_setpgrp_args *)); -int osf1_setitimer __P((struct thread *, struct osf1_setitimer_args *)); -int osf1_table __P((struct thread *, struct osf1_table_args *)); -int osf1_getitimer __P((struct thread *, struct osf1_getitimer_args *)); -int osf1_fstat __P((struct thread *, struct osf1_fstat_args *)); -int osf1_fcntl __P((struct thread *, struct osf1_fcntl_args *)); -int osf1_select __P((struct thread *, struct osf1_select_args *)); -int osf1_socket __P((struct thread *, struct osf1_socket_args *)); -int osf1_sigreturn __P((struct thread *, struct osf1_sigreturn_args *)); -int osf1_sigsuspend __P((struct thread *, struct osf1_sigsuspend_args *)); -int osf1_osigstack __P((struct thread *, struct osf1_osigstack_args *)); -int osf1_gettimeofday __P((struct thread *, struct osf1_gettimeofday_args *)); -int osf1_getrusage __P((struct thread *, struct osf1_getrusage_args *)); -int osf1_readv __P((struct thread *, struct osf1_readv_args *)); -int osf1_writev __P((struct thread *, struct osf1_writev_args *)); -int osf1_truncate __P((struct thread *, struct osf1_truncate_args *)); -int osf1_ftruncate __P((struct thread *, struct osf1_ftruncate_args *)); -int osf1_setgid __P((struct thread *, struct osf1_setgid_args *)); -int osf1_sendto __P((struct thread *, struct osf1_sendto_args *)); -int osf1_getrlimit __P((struct thread *, struct osf1_getrlimit_args *)); -int osf1_setrlimit __P((struct thread *, struct osf1_setrlimit_args *)); -int osf1_sigaction __P((struct thread *, struct osf1_sigaction_args *)); -int osf1_statfs __P((struct thread *, struct osf1_statfs_args *)); -int osf1_fstatfs __P((struct thread *, struct osf1_fstatfs_args *)); -int osf1_msync __P((struct thread *, struct osf1_msync_args *)); -int osf1_signal __P((struct thread *, struct osf1_signal_args *)); -int osf1_sigaltstack __P((struct thread *, struct osf1_sigaltstack_args *)); -int osf1_sysinfo __P((struct thread *, struct osf1_sysinfo_args *)); -int osf1_proplist_syscall __P((struct thread *, struct osf1_proplist_syscall_args *)); -int osf1_ntpadjtime __P((struct thread *, struct osf1_ntpadjtime_args *)); -int osf1_ntpgettime __P((struct thread *, struct osf1_ntpgettime_args *)); -int osf1_pathconf __P((struct thread *, struct osf1_pathconf_args *)); -int osf1_fpathconf __P((struct thread *, struct osf1_fpathconf_args *)); -int osf1_uswitch __P((struct thread *, struct osf1_uswitch_args *)); -int osf1_usleep_thread __P((struct thread *, struct osf1_usleep_thread_args *)); -int osf1_getsysinfo __P((struct thread *, struct osf1_getsysinfo_args *)); -int osf1_setsysinfo __P((struct thread *, struct osf1_setsysinfo_args *)); +int osf1_wait4(struct thread *, struct osf1_wait4_args *); +int osf1_mknod(struct thread *, struct osf1_mknod_args *); +int osf1_getfsstat(struct thread *, struct osf1_getfsstat_args *); +int osf1_lseek(struct thread *, struct osf1_lseek_args *); +int osf1_mount(struct thread *, struct osf1_mount_args *); +int osf1_unmount(struct thread *, struct osf1_unmount_args *); +int osf1_setuid(struct thread *, struct osf1_setuid_args *); +int osf1_access(struct thread *, struct osf1_access_args *); +int osf1_kill(struct thread *, struct osf1_kill_args *); +int osf1_set_program_attributes(struct thread *, struct osf1_set_program_attributes_args *); +int osf1_open(struct thread *, struct osf1_open_args *); +int osf1_sigprocmask(struct thread *, struct osf1_sigprocmask_args *); +int osf1_sigpending(struct thread *, struct osf1_sigpending_args *); +int osf1_classcntl(struct thread *, struct osf1_classcntl_args *); +int osf1_ioctl(struct thread *, struct osf1_ioctl_args *); +int osf1_reboot(struct thread *, struct osf1_reboot_args *); +int osf1_execve(struct thread *, struct osf1_execve_args *); +int osf1_stat(struct thread *, struct osf1_stat_args *); +int osf1_lstat(struct thread *, struct osf1_lstat_args *); +int osf1_mmap(struct thread *, struct osf1_mmap_args *); +int osf1_madvise(struct thread *, struct osf1_madvise_args *); +int osf1_setpgrp(struct thread *, struct osf1_setpgrp_args *); +int osf1_setitimer(struct thread *, struct osf1_setitimer_args *); +int osf1_table(struct thread *, struct osf1_table_args *); +int osf1_getitimer(struct thread *, struct osf1_getitimer_args *); +int osf1_fstat(struct thread *, struct osf1_fstat_args *); +int osf1_fcntl(struct thread *, struct osf1_fcntl_args *); +int osf1_select(struct thread *, struct osf1_select_args *); +int osf1_socket(struct thread *, struct osf1_socket_args *); +int osf1_sigreturn(struct thread *, struct osf1_sigreturn_args *); +int osf1_sigsuspend(struct thread *, struct osf1_sigsuspend_args *); +int osf1_osigstack(struct thread *, struct osf1_osigstack_args *); +int osf1_gettimeofday(struct thread *, struct osf1_gettimeofday_args *); +int osf1_getrusage(struct thread *, struct osf1_getrusage_args *); +int osf1_readv(struct thread *, struct osf1_readv_args *); +int osf1_writev(struct thread *, struct osf1_writev_args *); +int osf1_truncate(struct thread *, struct osf1_truncate_args *); +int osf1_ftruncate(struct thread *, struct osf1_ftruncate_args *); +int osf1_setgid(struct thread *, struct osf1_setgid_args *); +int osf1_sendto(struct thread *, struct osf1_sendto_args *); +int osf1_getrlimit(struct thread *, struct osf1_getrlimit_args *); +int osf1_setrlimit(struct thread *, struct osf1_setrlimit_args *); +int osf1_sigaction(struct thread *, struct osf1_sigaction_args *); +int osf1_statfs(struct thread *, struct osf1_statfs_args *); +int osf1_fstatfs(struct thread *, struct osf1_fstatfs_args *); +int osf1_msync(struct thread *, struct osf1_msync_args *); +int osf1_signal(struct thread *, struct osf1_signal_args *); +int osf1_sigaltstack(struct thread *, struct osf1_sigaltstack_args *); +int osf1_sysinfo(struct thread *, struct osf1_sysinfo_args *); +int osf1_proplist_syscall(struct thread *, struct osf1_proplist_syscall_args *); +int osf1_ntpadjtime(struct thread *, struct osf1_ntpadjtime_args *); +int osf1_ntpgettime(struct thread *, struct osf1_ntpgettime_args *); +int osf1_pathconf(struct thread *, struct osf1_pathconf_args *); +int osf1_fpathconf(struct thread *, struct osf1_fpathconf_args *); +int osf1_uswitch(struct thread *, struct osf1_uswitch_args *); +int osf1_usleep_thread(struct thread *, struct osf1_usleep_thread_args *); +int osf1_getsysinfo(struct thread *, struct osf1_getsysinfo_args *); +int osf1_setsysinfo(struct thread *, struct osf1_setsysinfo_args *); #ifdef COMPAT_43 diff --git a/sys/alpha/osf1/osf1_signal.c b/sys/alpha/osf1/osf1_signal.c index 4696689..9e0cf5a 100644 --- a/sys/alpha/osf1/osf1_signal.c +++ b/sys/alpha/osf1/osf1_signal.c @@ -86,10 +86,10 @@ #define DPRINTF uprintf int osf1_sigdbg = 0; -static void bsd_to_osf1_sigaction __P((const struct sigaction *bsa, - struct osf1_sigaction *osa)); -static void osf1_to_bsd_sigaction __P((const struct osf1_sigaction *osa, - struct sigaction *bsa)); +static void bsd_to_osf1_sigaction(const struct sigaction *bsa, + struct osf1_sigaction *osa); +static void osf1_to_bsd_sigaction(const struct osf1_sigaction *osa, + struct sigaction *bsa); #define sigemptyset(s) SIGEMPTYSET(*(s)) #define sigismember(s, n) SIGISMEMBER(*(s), n) diff --git a/sys/alpha/osf1/osf1_signal.h b/sys/alpha/osf1/osf1_signal.h index 2559f67..ec1fbeb 100644 --- a/sys/alpha/osf1/osf1_signal.h +++ b/sys/alpha/osf1/osf1_signal.h @@ -19,7 +19,7 @@ typedef u_long osf1_sigset_t; -typedef void (*osf1_handler_t) __P((int)); +typedef void (*osf1_handler_t)(int); struct osf1_sigaction { osf1_handler_t osa_handler; @@ -57,11 +57,11 @@ struct osf1_sigaltstack { extern int osf1_to_linux_sig[]; -void bsd_to_osf1_sigaltstack __P((const struct sigaltstack *, struct osf1_sigaltstack *)); -void bsd_to_osf1_sigset __P((const sigset_t *, osf1_sigset_t *)); -void osf1_to_bsd_sigaltstack __P((const struct osf1_sigaltstack *, struct sigaltstack *)); -void osf1_to_bsd_sigset __P((const osf1_sigset_t *, sigset_t *)); -void osf1_sendsig __P((sig_t, int , sigset_t *, u_long )); +void bsd_to_osf1_sigaltstack(const struct sigaltstack *, struct osf1_sigaltstack *); +void bsd_to_osf1_sigset(const sigset_t *, osf1_sigset_t *); +void osf1_to_bsd_sigaltstack(const struct osf1_sigaltstack *, struct sigaltstack *); +void osf1_to_bsd_sigset(const osf1_sigset_t *, sigset_t *); +void osf1_sendsig(sig_t, int , sigset_t *, u_long ); #endif /* !_OSF1_SIGNAL_H */ diff --git a/sys/alpha/osf1/osf1_sysvec.c b/sys/alpha/osf1/osf1_sysvec.c index e8a31f2..f073712 100644 --- a/sys/alpha/osf1/osf1_sysvec.c +++ b/sys/alpha/osf1/osf1_sysvec.c @@ -59,8 +59,7 @@ MODULE_DEPEND(osf1, sysvshm, 1, 1, 1); int osf1_szsigcode; extern char sigcode[]; -static int osf1_freebsd_fixup __P((long **stack_base, - struct image_params *imgp)); +static int osf1_freebsd_fixup(long **stack_base, struct image_params *imgp); struct sysentvec osf1_sysvec = { OSF1_SYS_MAXSYSCALL, diff --git a/sys/alpha/osf1/osf1_util.h b/sys/alpha/osf1/osf1_util.h index 1df4fbc..7b97467 100644 --- a/sys/alpha/osf1/osf1_util.h +++ b/sys/alpha/osf1/osf1_util.h @@ -66,8 +66,8 @@ stackgap_alloc(sgp, sz) extern const char osf1_emul_path[]; -int osf1_emul_find __P((struct thread *, caddr_t *, const char *, char *, - char **, int)); +int osf1_emul_find(struct thread *, caddr_t *, const char *, char *, + char **, int); #define CHECKALT(p, sgp, path, i) \ do { \ diff --git a/sys/alpha/pci/tsunami.c b/sys/alpha/pci/tsunami.c index 3ca127b..5290f4c 100644 --- a/sys/alpha/pci/tsunami.c +++ b/sys/alpha/pci/tsunami.c @@ -78,8 +78,8 @@ static alpha_chipset_t tsunami_chipset = { tsunami_write_hae, }; -static void tsunami_intr_enable __P((int)); -static void tsunami_intr_disable __P((int)); +static void tsunami_intr_enable(int); +static void tsunami_intr_disable(int); /* * There doesn't appear to be an hae on this platform diff --git a/sys/alpha/tc/am7990.c b/sys/alpha/tc/am7990.c index 8a40fe2..bbb7c06 100644 --- a/sys/alpha/tc/am7990.c +++ b/sys/alpha/tc/am7990.c @@ -111,27 +111,27 @@ #include <alpha/tc/am7990var.h> #ifdef LEDEBUG -void am7990_recv_print __P((struct am7990_softc *, int)); -void am7990_xmit_print __P((struct am7990_softc *, int)); +void am7990_recv_print(struct am7990_softc *, int); +void am7990_xmit_print(struct am7990_softc *, int); #endif -integrate void am7990_rint __P((struct am7990_softc *)); -integrate void am7990_tint __P((struct am7990_softc *)); +integrate void am7990_rint(struct am7990_softc *); +integrate void am7990_tint(struct am7990_softc *); -integrate int am7990_put __P((struct am7990_softc *, int, struct mbuf *)); -integrate struct mbuf *am7990_get __P((struct am7990_softc *, int, int)); -integrate void am7990_read __P((struct am7990_softc *, int, int)); +integrate int am7990_put(struct am7990_softc *, int, struct mbuf *); +integrate struct mbuf *am7990_get(struct am7990_softc *, int, int); +integrate void am7990_read(struct am7990_softc *, int, int); /* -hide void am7990_shutdown __P((void *)); +hide void am7990_shutdown(void *); */ -int am7990_mediachange __P((struct ifnet *)); -void am7990_mediastatus __P((struct ifnet *, struct ifmediareq *)); +int am7990_mediachange(struct ifnet *); +void am7990_mediastatus(struct ifnet *, struct ifmediareq *); #define ifp (&sc->sc_ethercom.ac_if) -static __inline u_int16_t ether_cmp __P((void *, void *)); +static __inline u_int16_t ether_cmp(void *, void *); char * ether_sprintf(u_char *ap); /* * Compare two Ether/802 addresses for equality, inlined and diff --git a/sys/alpha/tc/am7990var.h b/sys/alpha/tc/am7990var.h index 2560f9f..5f36651 100644 --- a/sys/alpha/tc/am7990var.h +++ b/sys/alpha/tc/am7990var.h @@ -101,15 +101,15 @@ struct am7990_softc { * zero bytes in buffer */ void (*sc_copytodesc) - __P((struct am7990_softc *, void *, int, int)); + (struct am7990_softc *, void *, int, int); void (*sc_copyfromdesc) - __P((struct am7990_softc *, void *, int, int)); + (struct am7990_softc *, void *, int, int); void (*sc_copytobuf) - __P((struct am7990_softc *, void *, int, int)); + (struct am7990_softc *, void *, int, int); void (*sc_copyfrombuf) - __P((struct am7990_softc *, void *, int, int)); + (struct am7990_softc *, void *, int, int); void (*sc_zerobuf) - __P((struct am7990_softc *, int, int)); + (struct am7990_softc *, int, int); /* * Machine-dependent functions: @@ -121,15 +121,15 @@ struct am7990_softc { * media change hook - may be NULL */ u_int16_t (*sc_rdcsr) - __P((struct am7990_softc *, u_int16_t)); + (struct am7990_softc *, u_int16_t); void (*sc_wrcsr) - __P((struct am7990_softc *, u_int16_t, u_int16_t)); - void (*sc_hwreset) __P((struct am7990_softc *)); - void (*sc_hwinit) __P((struct am7990_softc *)); - void (*sc_nocarrier) __P((struct am7990_softc *)); - int (*sc_mediachange) __P((struct am7990_softc *)); - void (*sc_mediastatus) __P((struct am7990_softc *, - struct ifmediareq *)); + (struct am7990_softc *, u_int16_t, u_int16_t); + void (*sc_hwreset)(struct am7990_softc *); + void (*sc_hwinit)(struct am7990_softc *); + void (*sc_nocarrier)(struct am7990_softc *); + int (*sc_mediachange)(struct am7990_softc *); + void (*sc_mediastatus)(struct am7990_softc *, + struct ifmediareq *); /* * Media-supported by this interface. If this is NULL, @@ -176,16 +176,16 @@ struct am7990_softc { #endif }; -void am7990_config __P((struct am7990_softc *)); -void am7990_init __P((struct am7990_softc *)); -int am7990_ioctl __P((struct ifnet *, u_long, caddr_t)); -void am7990_meminit __P((struct am7990_softc *)); -void am7990_reset __P((struct am7990_softc *)); -void am7990_setladrf __P((struct arpcom *, u_int16_t *)); -void am7990_start __P((struct ifnet *)); -void am7990_stop __P((struct am7990_softc *)); -void am7990_watchdog __P((struct ifnet *)); -void am7990_intr __P((void *)); +void am7990_config(struct am7990_softc *); +void am7990_init(struct am7990_softc *); +int am7990_ioctl(struct ifnet *, u_long, caddr_t); +void am7990_meminit(struct am7990_softc *); +void am7990_reset(struct am7990_softc *); +void am7990_setladrf(struct arpcom *, u_int16_t *); +void am7990_start(struct ifnet *); +void am7990_stop(struct am7990_softc *); +void am7990_watchdog(struct ifnet *); +void am7990_intr(void *); /* * The following functions are only useful on certain cpu/bus @@ -193,16 +193,16 @@ void am7990_intr __P((void *)); * maximum efficiency, but machine-independent versions are provided * for drivers that have not yet been optimized. */ -void am7990_copytobuf_contig __P((struct am7990_softc *, void *, int, int)); -void am7990_copyfrombuf_contig __P((struct am7990_softc *, void *, int, int)); -void am7990_zerobuf_contig __P((struct am7990_softc *, int, int)); +void am7990_copytobuf_contig(struct am7990_softc *, void *, int, int); +void am7990_copyfrombuf_contig(struct am7990_softc *, void *, int, int); +void am7990_zerobuf_contig(struct am7990_softc *, int, int); #if 0 /* Example only - see am7990.c */ -void am7990_copytobuf_gap2 __P((struct am7990_softc *, void *, int, int)); -void am7990_copyfrombuf_gap2 __P((struct am7990_softc *, void *, int, int)); -void am7990_zerobuf_gap2 __P((struct am7990_softc *, int, int)); +void am7990_copytobuf_gap2(struct am7990_softc *, void *, int, int); +void am7990_copyfrombuf_gap2(struct am7990_softc *, void *, int, int); +void am7990_zerobuf_gap2(struct am7990_softc *, int, int); -void am7990_copytobuf_gap16 __P((struct am7990_softc *, void *, int, int)); -void am7990_copyfrombuf_gap16 __P((struct am7990_softc *, void *, int, int)); -void am7990_zerobuf_gap16 __P((struct am7990_softc *, int, int)); +void am7990_copytobuf_gap16(struct am7990_softc *, void *, int, int); +void am7990_copyfrombuf_gap16(struct am7990_softc *, void *, int, int); +void am7990_zerobuf_gap16(struct am7990_softc *, int, int); #endif /* Example only */ diff --git a/sys/alpha/tc/ascvar.h b/sys/alpha/tc/ascvar.h index b5619db..e22814d 100644 --- a/sys/alpha/tc/ascvar.h +++ b/sys/alpha/tc/ascvar.h @@ -53,12 +53,12 @@ struct asc_softc { ScsiCmd *cmd[ASC_NCMD]; /* active command indexed by SCSI ID */ State st[ASC_NCMD]; /* state info for each active command */ /* Start dma routine */ - int (*dma_start) __P((struct asc_softc *asc, + int (*dma_start)(struct asc_softc *asc, struct scsi_state *state, - caddr_t cp, int flag, int len, int off)); + caddr_t cp, int flag, int len, int off); /* End dma routine */ - void (*dma_end) __P((struct asc_softc *asc, - struct scsi_state *state, int flag)); + void (*dma_end)(struct asc_softc *asc, + struct scsi_state *state, int flag); u_char *dma_next; int dma_xfer; /* Dma len still to go */ @@ -82,8 +82,8 @@ typedef struct asc_softc *asc_softc_t; #define ASC_SPEED_25_MHZ 250 #define ASC_SPEED_12_5_MHZ 125 -void ascattach __P((struct asc_softc *asc, int bus_speed)); -int asc_intr __P ((void *asc)); +void ascattach(struct asc_softc *asc, int bus_speed); +int asc_intr(void *asc); /* * Dma operations. diff --git a/sys/alpha/tc/esp.c b/sys/alpha/tc/esp.c index d9f7577..2b5b40f 100644 --- a/sys/alpha/tc/esp.c +++ b/sys/alpha/tc/esp.c @@ -70,28 +70,28 @@ int esp_debug = 0; /*ESP_SHOWPHASE|ESP_SHOWMISC|ESP_SHOWTRAC|ESP_SHOWCMDS;*/ -/*static*/ void espattach __P((device_t, device_t, void *)); -/*static*/ int espmatch __P((device_t, void *, void *)); -/*static*/ int espprint __P((void *, char *)); -/*static*/ u_int esp_adapter_info __P((struct esp_softc *)); -/*static*/ void espreadregs __P((struct esp_softc *)); -/*static*/ void espselect __P((struct esp_softc *, - u_char, u_char, u_char *, u_char)); -/*static*/ void esp_scsi_reset __P((struct esp_softc *)); -/*static*/ void esp_reset __P((struct esp_softc *)); -/*static*/ void esp_init __P((struct esp_softc *, int)); -/*static*/ int esp_scsi_cmd __P((struct scsi_xfer *)); -/*static*/ int esp_poll __P((struct esp_softc *, struct ecb *)); -/*static*/ void esp_sched __P((struct esp_softc *)); -/*static*/ void esp_done __P((struct 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 ecb *)); -static u_int32_t esp_info __P((int)); -int esp_stp2cpb __P((struct esp_softc *, int)); -int esp_cpb2stp __P((struct esp_softc *, int)); +/*static*/ void espattach (device_t, device_t, void *); +/*static*/ int espmatch (device_t, void *, void *); +/*static*/ int espprint (void *, char *); +/*static*/ u_int esp_adapter_info(struct esp_softc *); +/*static*/ void espreadregs (struct esp_softc *); +/*static*/ void espselect (struct esp_softc *, + u_char, u_char, u_char *, u_char); +/*static*/ void esp_scsi_reset (struct esp_softc *); +/*static*/ void esp_reset (struct esp_softc *); +/*static*/ void esp_init (struct esp_softc *, int); +/*static*/ int esp_scsi_cmd (struct scsi_xfer *); +/*static*/ int esp_poll (struct esp_softc *, struct ecb *); +/*static*/ void esp_sched (struct esp_softc *); +/*static*/ void esp_done (struct 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 ecb *); +static u_int32_t esp_info (int); +int esp_stp2cpb(struct esp_softc *, int); +int esp_cpb2stp(struct esp_softc *, int); static void esp_min_phys (struct buf *); static int esp_probe(device_t dev); diff --git a/sys/alpha/tc/if_le_dec.c b/sys/alpha/tc/if_le_dec.c index 5e50f50..8a136e2 100644 --- a/sys/alpha/tc/if_le_dec.c +++ b/sys/alpha/tc/if_le_dec.c @@ -77,12 +77,12 @@ /* access LANCE registers */ -void le_dec_writereg __P((volatile u_short *regptr, u_short val)); +void le_dec_writereg(volatile u_short *regptr, u_short val); #define LERDWR(cntl, src, dst) { (dst) = (src); tc_mb(); } #define LEWREG(src, dst) le_dec_writereg(&(dst), (src)) -hide void le_dec_wrcsr __P((struct am7990_softc *, u_int16_t, u_int16_t)); -hide u_int16_t le_dec_rdcsr __P((struct am7990_softc *, u_int16_t)); +hide void le_dec_wrcsr(struct am7990_softc *, u_int16_t, u_int16_t); +hide u_int16_t le_dec_rdcsr(struct am7990_softc *, u_int16_t); char *ether_sprintf(char *); void dec_le_common_attach(sc, eap) diff --git a/sys/alpha/tc/if_le_ioasic.c b/sys/alpha/tc/if_le_ioasic.c index 31116a3..0e7ed07 100644 --- a/sys/alpha/tc/if_le_ioasic.c +++ b/sys/alpha/tc/if_le_ioasic.c @@ -83,16 +83,16 @@ static driver_t le_ioasic_driver = { static devclass_t le_ioasic_devclass; -hide void le_ioasic_copytobuf_gap2 __P((struct am7990_softc *, void *, - int, int)); -hide void le_ioasic_copyfrombuf_gap2 __P((struct am7990_softc *, void *, - int, int)); - -hide void le_ioasic_copytobuf_gap16 __P((struct am7990_softc *, void *, - int, int)); -hide void le_ioasic_copyfrombuf_gap16 __P((struct am7990_softc *, void *, - int, int)); -hide void le_ioasic_zerobuf_gap16 __P((struct am7990_softc *, int, int)); +hide void le_ioasic_copytobuf_gap2(struct am7990_softc *, void *, + int, int); +hide void le_ioasic_copyfrombuf_gap2(struct am7990_softc *, void *, + int, int); + +hide void le_ioasic_copytobuf_gap16(struct am7990_softc *, void *, + int, int); +hide void le_ioasic_copyfrombuf_gap16(struct am7990_softc *, void *, + int, int); +hide void le_ioasic_zerobuf_gap16(struct am7990_softc *, int, int); static int diff --git a/sys/alpha/tc/if_levar.h b/sys/alpha/tc/if_levar.h index 9353ab2..cbcb96f 100644 --- a/sys/alpha/tc/if_levar.h +++ b/sys/alpha/tc/if_levar.h @@ -66,4 +66,4 @@ struct le_softc { struct lereg1 *sc_r1; /* LANCE registers */ }; -void dec_le_common_attach __P((struct am7990_softc *, u_char *)); +void dec_le_common_attach(struct am7990_softc *, u_char *); diff --git a/sys/alpha/tc/ioasic.c b/sys/alpha/tc/ioasic.c index 2cfe603..ee960f2 100644 --- a/sys/alpha/tc/ioasic.c +++ b/sys/alpha/tc/ioasic.c @@ -101,7 +101,7 @@ static int ioasic_attach(device_t dev); static driver_intr_t ioasic_intrnull; static int ioasic_print_child(device_t bus, device_t dev); static void ioasic_lance_dma_setup(void *v); -int ioasic_intr __P((void *)); +int ioasic_intr(void *); caddr_t le_iomem = 0; @@ -145,7 +145,7 @@ struct ioasic_dev ioasic_devs[] = { }; int ioasic_ndevs = sizeof(ioasic_devs) / sizeof(ioasic_devs[0]); struct ioasicintr { - void (*iai_func) __P((void *)); + void (*iai_func)(void *); void *iai_arg; } ioasicintrs[IOASIC_NCOOKIES]; @@ -283,7 +283,7 @@ ioasic_intr_establish(ioa, cookie, level, func, arg) device_t ioa; void *cookie, *arg; tc_intrlevel_t level; - void (*func) __P((void *)); + void (*func)(void *); { u_long dev, i; diff --git a/sys/alpha/tc/ioasicvar.h b/sys/alpha/tc/ioasicvar.h index 9ae2097..f1d5a6c 100644 --- a/sys/alpha/tc/ioasicvar.h +++ b/sys/alpha/tc/ioasicvar.h @@ -49,11 +49,11 @@ struct ioasic_dev { }; -char *ioasic_lance_ether_address __P((void)); +char *ioasic_lance_ether_address(void); /* * Interrupt establishment/disestablishment functions */ -void ioasic_intr_establish __P((device_t, void *, tc_intrlevel_t, - void (*)(void *), void *)); -void ioasic_intr_disestablish __P((device_t, void *)); +void ioasic_intr_establish(device_t, void *, tc_intrlevel_t, + void (*)(void *), void *); +void ioasic_intr_disestablish(device_t, void *); diff --git a/sys/alpha/tc/sticvar.h b/sys/alpha/tc/sticvar.h index be394ea..c45f93a 100644 --- a/sys/alpha/tc/sticvar.h +++ b/sys/alpha/tc/sticvar.h @@ -49,5 +49,5 @@ struct stic_softc { void* stic_pktbuf; /* kva of packet/polling area. */ }; -int stic_init __P((struct stic_softc *stic_sc)); +int stic_init(struct stic_softc *stic_sc); #endif /*_TC_STICVAR_H_ */ diff --git a/sys/alpha/tc/tc.c b/sys/alpha/tc/tc.c index 7c34306..39459f4 100644 --- a/sys/alpha/tc/tc.c +++ b/sys/alpha/tc/tc.c @@ -55,10 +55,10 @@ struct tc_softc { int nbuiltins; struct tc_builtin *builtins; struct tc_slotdesc *sc_slots; - void (*sc_intr_establish) __P((struct device *, void *, - tc_intrlevel_t, int (*)(void *), void *)); - void (*sc_intr_disestablish) __P((struct device *, void *)); -/* bus_dma_tag_t (*sc_get_dma_tag) __P((int)); + void (*sc_intr_establish)(struct device *, void *, + tc_intrlevel_t, int (*)(void *), void *); + void (*sc_intr_disestablish)(struct device *, void *); +/* bus_dma_tag_t (*sc_get_dma_tag)(int); */ }; #define NTC_ROMOFFS 2 @@ -91,19 +91,19 @@ static driver_t tc_driver = { #define C(x) ((void *)(u_long)x) -int tc_intrnull __P((void *)); +int tc_intrnull(void *); struct tcintr { - int (*tci_func) __P((void *)); + int (*tci_func)(void *); void *tci_arg; }; #ifdef DEC_3000_300 -void tc_3000_300_intr_setup __P((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_setup(void); +void tc_3000_300_intr_establish(struct device *, void *, + tc_intrlevel_t, int (*)(void *), void *); +void tc_3000_300_intr_disestablish(struct device *, void *); +void tc_3000_300_iointr(void *, unsigned long); @@ -135,11 +135,11 @@ struct tcintr tc_3000_300_intr[TC_3000_300_NCOOKIES]; #endif /* DEC_3000_300 */ #ifdef DEC_3000_500 -void tc_3000_500_intr_setup __P((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_setup(void); +void tc_3000_500_intr_establish(struct device *, void *, + tc_intrlevel_t, int (*)(void *), void *); +void tc_3000_500_intr_disestablish(struct device *, void *); +void tc_3000_500_iointr(void *, unsigned long); struct tc_slotdesc tc_3000_500_slots[] = { { KV(0x100000000), C(TC_3000_500_DEV_OPT0), }, /* 0 - opt slot 0 */ @@ -212,7 +212,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; @@ -383,7 +383,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; @@ -666,7 +666,7 @@ tc_intr_establish(dev, cookie, level, handler, arg) struct device *dev; void *cookie, *arg; tc_intrlevel_t level; - int (*handler) __P((void *)); + int (*handler)(void *); { struct tc_softc *sc = (struct tc_softc *)device_get_softc(dev); diff --git a/sys/alpha/tc/tcds.c b/sys/alpha/tc/tcds.c index 2fe9292..44ef3cd 100644 --- a/sys/alpha/tc/tcds.c +++ b/sys/alpha/tc/tcds.c @@ -104,9 +104,9 @@ struct tcds_softc { static int tcds_probe(device_t dev); static int tcds_attach(device_t dev); -static void tcds_intrnull __P((void *)); +static void tcds_intrnull(void *); static void tcds_lance_dma_setup(void *v); -static int tcds_intr __P((void *)); +static int tcds_intr(void *); @@ -342,7 +342,7 @@ tcds_intr_establish(tcds, cookie, level, func, arg) device_t tcds; void *cookie, *arg; tc_intrlevel_t level; - int (*func) __P((void *)); + int (*func)(void *); { struct tcds_softc *sc = device_get_softc(tcds); u_long slot; diff --git a/sys/alpha/tc/tcdsreg.h b/sys/alpha/tc/tcdsreg.h index da48eb8..43bf773 100644 --- a/sys/alpha/tc/tcdsreg.h +++ b/sys/alpha/tc/tcdsreg.h @@ -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/alpha/tc/tcdsvar.h b/sys/alpha/tc/tcdsvar.h index 8714507..138376f 100644 --- a/sys/alpha/tc/tcdsvar.h +++ b/sys/alpha/tc/tcdsvar.h @@ -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 */ - void (*sc_intrhand) __P((void *)); /* intr. handler */ + void (*sc_intrhand)(void *); /* intr. handler */ void *sc_intrarg; /* intr. handler arg. */ /* @@ -84,25 +84,25 @@ struct tcdsdev_attach_args { /* * TCDS functions. */ -void tcds_intr_establish __P((device_t, void *, tc_intrlevel_t, - int (*)(void *), void *)); -void tcds_intr_disestablish __P((device_t, void *)); -void tcds_dma_enable __P((struct tcds_slotconfig *, int)); -void tcds_scsi_enable __P((struct tcds_slotconfig *, int)); -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 *sc)); +void tcds_intr_establish(device_t, void *, tc_intrlevel_t, + int (*)(void *), void *); +void tcds_intr_disestablish(device_t, void *); +void tcds_dma_enable(struct tcds_slotconfig *, int); +void tcds_scsi_enable(struct tcds_slotconfig *, int); +int tcds_scsi_isintr(struct tcds_slotconfig *, int); +void tcds_scsi_reset(struct tcds_slotconfig *); +int tcds_scsi_iserr(struct tcds_slotconfig *sc); /* * 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/alpha/tc/tcvar.h b/sys/alpha/tc/tcvar.h index 316c306..84b53f8 100644 --- a/sys/alpha/tc/tcvar.h +++ b/sys/alpha/tc/tcvar.h @@ -95,7 +95,7 @@ typedef int32_t tc_offset_t; * These functions are private, and may not be called by * machine-independent code. */ -void tc_dma_init __P((void)); +void tc_dma_init(void); /* * Address of scatter/gather SRAM on the 3000/500-series. @@ -149,9 +149,9 @@ struct tcbus_attach_args { /* TC bus resource management; XXX will move elsewhere eventually. */ /* - void (*tba_intr_establish) __P((device_t, void *, - tc_intrlevel_t, int (*)(void *), void *)); - void (*tba_intr_disestablish) __P((device_t, void *)); + void (*tba_intr_establish)(device_t, void *, + tc_intrlevel_t, int (*)(void *), void *); + void (*tba_intr_disestablish)(device_t, void *); */ }; @@ -174,9 +174,9 @@ struct tc_attach_args { /* * Interrupt establishment functions. */ -void tc_intr_establish __P((device_t, void *, tc_intrlevel_t, - int (*)(void *), void *)); -void tc_intr_disestablish __P((device_t, void *)); +void tc_intr_establish(device_t, void *, tc_intrlevel_t, + int (*)(void *), void *); +void tc_intr_disestablish(device_t, void *); #if 0 #include "locators.h" diff --git a/sys/alpha/tlsb/zs_tlsb.c b/sys/alpha/tlsb/zs_tlsb.c index 0e0a706..452df04 100644 --- a/sys/alpha/tlsb/zs_tlsb.c +++ b/sys/alpha/tlsb/zs_tlsb.c @@ -84,9 +84,9 @@ static struct cdevsw zs_cdevsw = { /* flags */ 0, }; -static void zsstart __P((struct tty *)); -static int zsparam __P((struct tty *, struct termios *)); -static void zsstop __P((struct tty *tp, int flag)); +static void zsstart(struct tty *); +static int zsparam(struct tty *, struct termios *); +static void zsstop(struct tty *tp, int flag); /* * Helpers for console support. @@ -109,7 +109,7 @@ static driver_t zs_driver = { "zs", zs_methods, sizeof (struct zs_softc), }; -static void zs_poll_intr __P((void *)); +static void zs_poll_intr(void *); static int zspolltime; @@ -216,9 +216,9 @@ zs_putc(caddr_t base, int chan, int c) /* * Console support */ -int zs_cngetc __P((dev_t)); -int zs_cncheckc __P((dev_t)); -void zs_cnputc __P((dev_t, int)); +int zs_cngetc(dev_t); +int zs_cncheckc(dev_t); +void zs_cnputc(dev_t, int); static caddr_t zs_console_addr; CONS_DRIVER(zs, NULL, NULL, NULL, zs_cngetc, zs_cncheckc, zs_cnputc, NULL); |
