From 3ae0cd58d3167611fa7b89e1b75e33eb36328cde Mon Sep 17 00:00:00 2001 From: Robert Garrett Date: Tue, 26 Aug 2003 21:42:19 +0000 Subject: [PATCH] what the heck one last one before i go take a nap... remove __P(); from the i386 directory --- sys/cpu/i386/include/cpu.h | 6 +- sys/cpu/i386/include/cpufunc.h | 86 ++++++++--------- sys/cpu/i386/include/endian.h | 10 +- sys/cpu/i386/include/frame.h | 6 +- sys/cpu/i386/include/npx.h | 10 +- sys/cpu/i386/include/perfmon.h | 20 ++-- sys/cpu/i386/include/pmap.h | 16 ++-- sys/cpu/i386/include/profile.h | 28 +++--- sys/cpu/i386/include/reg.h | 10 +- sys/cpu/i386/include/segments.h | 16 ++-- sys/cpu/i386/include/sysarch.h | 18 ++-- sys/cpu/i386/include/vm86.h | 26 +++--- sys/cpu/i386/misc/db_disasm.c | 14 +-- sys/dev/disk/ncv/dvcfg.h | 4 +- sys/i386/apic/mpapic.c | 10 +- sys/i386/apm/apm.c | 10 +- sys/i386/boot/dosboot/dirent.h | 22 ++--- sys/i386/boot/dosboot/disklabe.h | 18 ++-- sys/i386/boot/dosboot/inode.h | 106 ++++++++++----------- sys/i386/boot/dosboot/quota.h | 4 +- sys/i386/boot/dosboot/types.h | 4 +- sys/i386/gnu/isa/dgb.c | 34 +++---- sys/i386/i386/autoconf.c | 10 +- sys/i386/i386/db_disasm.c | 14 +-- sys/i386/i386/db_interface.c | 4 +- sys/i386/i386/db_trace.c | 22 ++--- sys/i386/i386/machdep.c | 12 +-- sys/i386/i386/mem.c | 6 +- sys/i386/i386/mp_machdep.c | 12 +-- sys/i386/i386/mpapic.c | 10 +- sys/i386/i386/pmap.c | 56 +++++------ sys/i386/i386/sys_machdep.c | 12 +-- sys/i386/i386/trap.c | 20 ++-- sys/i386/i386/vm86.c | 4 +- sys/i386/i386/vm_machdep.c | 8 +- sys/i386/icu/icu.h | 6 +- sys/i386/include/apm_bios.h | 4 +- sys/i386/include/bus_pc98.h | 32 +++---- sys/i386/include/clock.h | 22 ++--- sys/i386/include/cpu.h | 6 +- sys/i386/include/cpufunc.h | 86 ++++++++--------- sys/i386/include/dvcfg.h | 4 +- sys/i386/include/endian.h | 10 +- sys/i386/include/frame.h | 6 +- sys/i386/include/in_cksum.h | 4 +- sys/i386/include/md_var.h | 96 +++++++++---------- sys/i386/include/npx.h | 10 +- sys/i386/include/pcb.h | 4 +- sys/i386/include/pcb_ext.h | 8 +- sys/i386/include/perfmon.h | 20 ++-- sys/i386/include/physio_proc.h | 8 +- sys/i386/include/pmap.h | 16 ++-- sys/i386/include/profile.h | 28 +++--- sys/i386/include/ptrace.h | 4 +- sys/i386/include/reg.h | 10 +- sys/i386/include/segments.h | 16 ++-- sys/i386/include/smp.h | 108 +++++++++++----------- sys/i386/include/sysarch.h | 18 ++-- sys/i386/include/vm86.h | 26 +++--- sys/i386/isa/ccbque.h | 8 +- sys/i386/isa/clock.c | 16 ++-- sys/i386/isa/icu.h | 6 +- sys/i386/isa/intr_machdep.h | 18 ++-- sys/i386/isa/npx.c | 48 +++++----- sys/kern/kern_memio.c | 6 +- sys/platform/pc32/apic/mpapic.c | 10 +- sys/platform/pc32/apm/apm.c | 10 +- sys/platform/pc32/boot/dosboot/dirent.h | 22 ++--- sys/platform/pc32/boot/dosboot/disklabe.h | 18 ++-- sys/platform/pc32/boot/dosboot/inode.h | 106 ++++++++++----------- sys/platform/pc32/boot/dosboot/quota.h | 4 +- sys/platform/pc32/boot/dosboot/types.h | 4 +- sys/platform/pc32/gnu/isa/dgb.c | 34 +++---- sys/platform/pc32/i386/autoconf.c | 10 +- sys/platform/pc32/i386/db_disasm.c | 14 +-- sys/platform/pc32/i386/db_interface.c | 4 +- sys/platform/pc32/i386/db_trace.c | 22 ++--- sys/platform/pc32/i386/machdep.c | 12 +-- sys/platform/pc32/i386/mem.c | 6 +- sys/platform/pc32/i386/mp_machdep.c | 12 +-- sys/platform/pc32/i386/mpapic.c | 10 +- sys/platform/pc32/i386/pmap.c | 56 +++++------ sys/platform/pc32/i386/sys_machdep.c | 12 +-- sys/platform/pc32/i386/trap.c | 20 ++-- sys/platform/pc32/i386/vm86.c | 4 +- sys/platform/pc32/i386/vm_machdep.c | 8 +- sys/platform/pc32/icu/icu.h | 6 +- sys/platform/pc32/include/apm_bios.h | 4 +- sys/platform/pc32/include/bus_pc98.h | 32 +++---- sys/platform/pc32/include/clock.h | 22 ++--- sys/platform/pc32/include/dvcfg.h | 4 +- sys/platform/pc32/include/in_cksum.h | 4 +- sys/platform/pc32/include/md_var.h | 96 +++++++++---------- sys/platform/pc32/include/pcb.h | 4 +- sys/platform/pc32/include/pcb_ext.h | 8 +- sys/platform/pc32/include/physio_proc.h | 8 +- sys/platform/pc32/include/ptrace.h | 4 +- sys/platform/pc32/include/smp.h | 108 +++++++++++----------- sys/platform/pc32/isa/clock.c | 16 ++-- sys/platform/pc32/isa/icu.h | 6 +- sys/platform/pc32/isa/intr_machdep.h | 18 ++-- sys/platform/pc32/isa/npx.c | 48 +++++----- sys/sys/ccbque.h | 8 +- 103 files changed, 1058 insertions(+), 1058 deletions(-) diff --git a/sys/cpu/i386/include/cpu.h b/sys/cpu/i386/include/cpu.h index c167662336..2d5c2f59ab 100644 --- a/sys/cpu/i386/include/cpu.h +++ b/sys/cpu/i386/include/cpu.h @@ -35,7 +35,7 @@ * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/include/cpu.h,v 1.43.2.2 2001/06/15 09:37:57 scottl Exp $ - * $DragonFly: src/sys/cpu/i386/include/cpu.h,v 1.10 2003/08/25 19:50:29 dillon Exp $ + * $DragonFly: src/sys/cpu/i386/include/cpu.h,v 1.11 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_CPU_H_ @@ -106,8 +106,8 @@ extern char btext[]; extern char etext[]; -void fork_trampoline __P((void)); -void fork_return __P((struct proc *, struct trapframe)); +void fork_trampoline (void); +void fork_return (struct proc *, struct trapframe); #endif #endif /* !_MACHINE_CPU_H_ */ diff --git a/sys/cpu/i386/include/cpufunc.h b/sys/cpu/i386/include/cpufunc.h index 7bad028eb4..c3134724b5 100644 --- a/sys/cpu/i386/include/cpufunc.h +++ b/sys/cpu/i386/include/cpufunc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.96.2.3 2002/04/28 22:50:54 dwmalone Exp $ - * $DragonFly: src/sys/cpu/i386/include/cpufunc.h,v 1.6 2003/08/07 21:17:22 dillon Exp $ + * $DragonFly: src/sys/cpu/i386/include/cpufunc.h,v 1.7 2003/08/26 21:42:18 rob Exp $ */ /* @@ -623,51 +623,51 @@ load_dr7(u_int sel) #else /* !__GNUC__ */ -int breakpoint __P((void)); -u_int bsfl __P((u_int mask)); -u_int bsrl __P((u_int mask)); -void cpu_disable_intr __P((void)); -void do_cpuid __P((u_int ax, u_int *p)); -void cpu_enable_intr __P((void)); -u_char inb __P((u_int port)); -u_int inl __P((u_int port)); -void insb __P((u_int port, void *addr, size_t cnt)); -void insl __P((u_int port, void *addr, size_t cnt)); -void insw __P((u_int port, void *addr, size_t cnt)); -void invd __P((void)); -void invlpg __P((u_int addr)); -void invltlb __P((void)); -u_short inw __P((u_int port)); -u_int loadandclear __P((u_int *addr)); -void outb __P((u_int port, u_char data)); -void outl __P((u_int port, u_int data)); -void outsb __P((u_int port, void *addr, size_t cnt)); -void outsl __P((u_int port, void *addr, size_t cnt)); -void outsw __P((u_int port, void *addr, size_t cnt)); -void outw __P((u_int port, u_short data)); -u_int rcr2 __P((void)); -u_int64_t rdmsr __P((u_int msr)); -u_int64_t rdpmc __P((u_int pmc)); -u_int64_t rdtsc __P((void)); -u_int read_eflags __P((void)); -void wbinvd __P((void)); -void write_eflags __P((u_int ef)); -void wrmsr __P((u_int msr, u_int64_t newval)); -u_int rfs __P((void)); -u_int rgs __P((void)); -void load_fs __P((u_int sel)); -void load_gs __P((u_int sel)); +int breakpoint (void); +u_int bsfl (u_int mask); +u_int bsrl (u_int mask); +void cpu_disable_intr (void); +void do_cpuid (u_int ax, u_int *p); +void cpu_enable_intr (void); +u_char inb (u_int port); +u_int inl (u_int port); +void insb (u_int port, void *addr, size_t cnt); +void insl (u_int port, void *addr, size_t cnt); +void insw (u_int port, void *addr, size_t cnt); +void invd (void); +void invlpg (u_int addr); +void invltlb (void); +u_short inw (u_int port); +u_int loadandclear (u_int *addr); +void outb (u_int port, u_char data); +void outl (u_int port, u_int data); +void outsb (u_int port, void *addr, size_t cnt); +void outsl (u_int port, void *addr, size_t cnt); +void outsw (u_int port, void *addr, size_t cnt); +void outw (u_int port, u_short data); +u_int rcr2 (void); +u_int64_t rdmsr (u_int msr); +u_int64_t rdpmc (u_int pmc); +u_int64_t rdtsc (void); +u_int read_eflags (void); +void wbinvd (void); +void write_eflags (u_int ef); +void wrmsr (u_int msr, u_int64_t newval); +u_int rfs (void); +u_int rgs (void); +void load_fs (u_int sel); +void load_gs (u_int sel); #endif /* __GNUC__ */ -void load_cr0 __P((u_int cr0)); -void load_cr3 __P((u_int cr3)); -void load_cr4 __P((u_int cr4)); -void ltr __P((u_short sel)); -u_int rcr0 __P((void)); -u_int rcr3 __P((void)); -u_int rcr4 __P((void)); -void reset_dbregs __P((void)); +void load_cr0 (u_int cr0); +void load_cr3 (u_int cr3); +void load_cr4 (u_int cr4); +void ltr (u_short sel); +u_int rcr0 (void); +u_int rcr3 (void); +u_int rcr4 (void); +void reset_dbregs (void); __END_DECLS #endif /* !_MACHINE_CPUFUNC_H_ */ diff --git a/sys/cpu/i386/include/endian.h b/sys/cpu/i386/include/endian.h index c53c5724f2..e298ea8c90 100644 --- a/sys/cpu/i386/include/endian.h +++ b/sys/cpu/i386/include/endian.h @@ -32,7 +32,7 @@ * * from: @(#)endian.h 7.8 (Berkeley) 4/3/91 * $FreeBSD: src/sys/i386/include/endian.h,v 1.18 1999/12/29 04:33:01 peter Exp $ - * $DragonFly: src/sys/cpu/i386/include/endian.h,v 1.2 2003/06/17 04:28:35 dillon Exp $ + * $DragonFly: src/sys/cpu/i386/include/endian.h,v 1.3 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -61,10 +61,10 @@ #endif __BEGIN_DECLS -unsigned long htonl __P((unsigned long)); -unsigned short htons __P((unsigned short)); -unsigned long ntohl __P((unsigned long)); -unsigned short ntohs __P((unsigned short)); +unsigned long htonl (unsigned long); +unsigned short htons (unsigned short); +unsigned long ntohl (unsigned long); +unsigned short ntohs (unsigned short); __END_DECLS #define __word_swap_long(x) \ diff --git a/sys/cpu/i386/include/frame.h b/sys/cpu/i386/include/frame.h index 407eb6a3a7..60ae2e0c1e 100644 --- a/sys/cpu/i386/include/frame.h +++ b/sys/cpu/i386/include/frame.h @@ -35,7 +35,7 @@ * * from: @(#)frame.h 5.2 (Berkeley) 1/18/91 * $FreeBSD: src/sys/i386/include/frame.h,v 1.20 1999/09/29 15:06:22 marcel Exp $ - * $DragonFly: src/sys/cpu/i386/include/frame.h,v 1.2 2003/06/17 04:28:35 dillon Exp $ + * $DragonFly: src/sys/cpu/i386/include/frame.h,v 1.3 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_FRAME_H_ @@ -156,8 +156,8 @@ struct clockframe { int cf_ss; }; -int kdb_trap __P((int, int, struct trapframe *)); -extern int (*pmath_emulate) __P((struct trapframe *)); +int kdb_trap (int, int, struct trapframe *); +extern int (*pmath_emulate) (struct trapframe *); #define INTR_TO_TRAPFRAME(frame) ((struct trapframe *)&(frame)->if_fs) diff --git a/sys/cpu/i386/include/npx.h b/sys/cpu/i386/include/npx.h index 37079cd022..6986e2c727 100644 --- a/sys/cpu/i386/include/npx.h +++ b/sys/cpu/i386/include/npx.h @@ -35,7 +35,7 @@ * * from: @(#)npx.h 5.3 (Berkeley) 1/18/91 * $FreeBSD: src/sys/i386/include/npx.h,v 1.18.2.1 2001/08/15 01:23:52 peter Exp $ - * $DragonFly: src/sys/cpu/i386/include/npx.h,v 1.5 2003/06/28 04:16:03 dillon Exp $ + * $DragonFly: src/sys/cpu/i386/include/npx.h,v 1.6 2003/08/26 21:42:18 rob Exp $ */ /* @@ -143,10 +143,10 @@ union savefpu { #ifdef _KERNEL -int npxdna __P((void)); -void npxexit __P((struct proc *p)); -void npxinit __P((int control)); -void npxsave __P((union savefpu *addr)); +int npxdna (void); +void npxexit (struct proc *p); +void npxinit (int control); +void npxsave (union savefpu *addr); #endif #endif /* !_MACHINE_NPX_H_ */ diff --git a/sys/cpu/i386/include/perfmon.h b/sys/cpu/i386/include/perfmon.h index f23e5eef11..dfa6c60ca5 100644 --- a/sys/cpu/i386/include/perfmon.h +++ b/sys/cpu/i386/include/perfmon.h @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/perfmon.h,v 1.7 1999/12/29 04:33:04 peter Exp $ - * $DragonFly: src/sys/cpu/i386/include/perfmon.h,v 1.2 2003/06/17 04:28:36 dillon Exp $ + * $DragonFly: src/sys/cpu/i386/include/perfmon.h,v 1.3 2003/08/26 21:42:18 rob Exp $ */ /* @@ -103,15 +103,15 @@ struct pmc_tstamp { /* * Intra-kernel interface to performance monitoring counters */ -void perfmon_init __P((void)); -int perfmon_avail __P((void)); -int perfmon_setup __P((int, unsigned int)); -int perfmon_get __P((int, unsigned int *)); -int perfmon_fini __P((int)); -int perfmon_start __P((int)); -int perfmon_stop __P((int)); -int perfmon_read __P((int, quad_t *)); -int perfmon_reset __P((int)); +void perfmon_init (void); +int perfmon_avail (void); +int perfmon_setup (int, unsigned int); +int perfmon_get (int, unsigned int *); +int perfmon_fini (int); +int perfmon_start (int); +int perfmon_stop (int); +int perfmon_read (int, quad_t *); +int perfmon_reset (int); #endif /* _KERNEL */ diff --git a/sys/cpu/i386/include/pmap.h b/sys/cpu/i386/include/pmap.h index 7649b5b1d6..39d3444f37 100644 --- a/sys/cpu/i386/include/pmap.h +++ b/sys/cpu/i386/include/pmap.h @@ -43,7 +43,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * $FreeBSD: src/sys/i386/include/pmap.h,v 1.65.2.3 2001/10/03 07:15:37 peter Exp $ - * $DragonFly: src/sys/cpu/i386/include/pmap.h,v 1.3 2003/06/28 02:09:49 dillon Exp $ + * $DragonFly: src/sys/cpu/i386/include/pmap.h,v 1.4 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -252,14 +252,14 @@ extern char *ptvmmap; /* poor name! */ extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; -void pmap_bootstrap __P(( vm_offset_t, vm_offset_t)); -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_bootstrap ( vm_offset_t, vm_offset_t); +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); #ifdef SMP -void pmap_set_opt __P((void)); +void pmap_set_opt (void); #endif #endif /* _KERNEL */ diff --git a/sys/cpu/i386/include/profile.h b/sys/cpu/i386/include/profile.h index ed0c3c661b..20bb09f33e 100644 --- a/sys/cpu/i386/include/profile.h +++ b/sys/cpu/i386/include/profile.h @@ -32,7 +32,7 @@ * * @(#)profile.h 8.1 (Berkeley) 6/11/93 * $FreeBSD: src/sys/i386/include/profile.h,v 1.20 1999/12/29 04:33:05 peter Exp $ - * $DragonFly: src/sys/cpu/i386/include/profile.h,v 1.3 2003/07/20 04:20:32 dillon Exp $ + * $DragonFly: src/sys/cpu/i386/include/profile.h,v 1.4 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_PROFILE_H_ @@ -116,15 +116,15 @@ typedef u_int fptrdiff_t; #ifdef _KERNEL -void mcount __P((uintfptr_t frompc, uintfptr_t selfpc)); +void mcount (uintfptr_t frompc, uintfptr_t selfpc); #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) @@ -137,12 +137,12 @@ void stopguprof __P((struct gmonparam *p)); __BEGIN_DECLS #ifdef __GNUC__ #ifdef __ELF__ -void mcount __P((void)) __asm(".mcount"); +void mcount (void) __asm(".mcount"); #else -void mcount __P((void)) __asm("mcount"); +void mcount (void) __asm("mcount"); #endif #endif -static void _mcount __P((uintfptr_t frompc, uintfptr_t selfpc)); +static void _mcount (uintfptr_t frompc, uintfptr_t selfpc); __END_DECLS #endif /* _KERNEL */ @@ -152,11 +152,11 @@ __END_DECLS extern int cputime_bias; __BEGIN_DECLS -int cputime __P((void)); -void empty_loop __P((void)); -void mexitcount __P((uintfptr_t selfpc)); -void nullfunc __P((void)); -void nullfunc_loop __P((void)); +int cputime (void); +void empty_loop (void); +void mexitcount (uintfptr_t selfpc); +void nullfunc (void); +void nullfunc_loop (void); __END_DECLS #endif diff --git a/sys/cpu/i386/include/reg.h b/sys/cpu/i386/include/reg.h index 9765614b05..2a4fbd0880 100644 --- a/sys/cpu/i386/include/reg.h +++ b/sys/cpu/i386/include/reg.h @@ -35,7 +35,7 @@ * * from: @(#)reg.h 5.5 (Berkeley) 1/18/91 * $FreeBSD: src/sys/i386/include/reg.h,v 1.22.2.2 2002/11/07 22:47:55 alfred Exp $ - * $DragonFly: src/sys/cpu/i386/include/reg.h,v 1.2 2003/06/17 04:28:36 dillon Exp $ + * $DragonFly: src/sys/cpu/i386/include/reg.h,v 1.3 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_REG_H_ @@ -144,10 +144,10 @@ struct dbreg { /* * XXX these interfaces are MI, so they should be declared in a MI place. */ -int set_fpregs __P((struct proc *, struct fpreg *)); -int set_regs __P((struct proc *p, struct reg *regs)); -void setregs __P((struct proc *, u_long, u_long, u_long)); -int set_dbregs __P((struct proc *p, struct dbreg *dbregs)); +int set_fpregs (struct proc *, struct fpreg *); +int set_regs (struct proc *p, struct reg *regs); +void setregs (struct proc *, u_long, u_long, u_long); +int set_dbregs (struct proc *p, struct dbreg *dbregs); #endif #endif /* !_MACHINE_REG_H_ */ diff --git a/sys/cpu/i386/include/segments.h b/sys/cpu/i386/include/segments.h index 975f703099..4234209b52 100644 --- a/sys/cpu/i386/include/segments.h +++ b/sys/cpu/i386/include/segments.h @@ -36,7 +36,7 @@ * * from: @(#)segments.h 7.1 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/include/segments.h,v 1.24 1999/12/29 04:33:07 peter Exp $ - * $DragonFly: src/sys/cpu/i386/include/segments.h,v 1.5 2003/07/24 01:41:24 dillon Exp $ + * $DragonFly: src/sys/cpu/i386/include/segments.h,v 1.6 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_SEGMENTS_H_ @@ -248,13 +248,13 @@ extern struct soft_segment_descriptor gdt_segs[]; extern struct gate_descriptor *idt; extern union descriptor ldt[NLDT]; -void lgdt __P((struct region_descriptor *rdp)); -void lidt __P((struct region_descriptor *rdp)); -void lldt __P((u_short sel)); -void sdtossd __P((struct segment_descriptor *sdp, - struct soft_segment_descriptor *ssdp)); -void ssdtosd __P((struct soft_segment_descriptor *ssdp, - struct segment_descriptor *sdp)); +void lgdt (struct region_descriptor *rdp); +void lidt (struct region_descriptor *rdp); +void lldt (u_short sel); +void sdtossd (struct segment_descriptor *sdp, + struct soft_segment_descriptor *ssdp); +void ssdtosd (struct soft_segment_descriptor *ssdp, + struct segment_descriptor *sdp); #endif /* _KERNEL */ #endif /* !_MACHINE_SEGMENTS_H_ */ diff --git a/sys/cpu/i386/include/sysarch.h b/sys/cpu/i386/include/sysarch.h index e012cad001..d764fb1912 100644 --- a/sys/cpu/i386/include/sysarch.h +++ b/sys/cpu/i386/include/sysarch.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/sysarch.h,v 1.13.2.2 2002/10/07 17:17:28 jhb Exp $ - * $DragonFly: src/sys/cpu/i386/include/sysarch.h,v 1.2 2003/06/17 04:28:36 dillon Exp $ + * $DragonFly: src/sys/cpu/i386/include/sysarch.h,v 1.3 2003/08/26 21:42:18 rob Exp $ */ /* @@ -72,14 +72,14 @@ union descriptor; struct dbreg; __BEGIN_DECLS -int i386_get_ldt __P((int, union descriptor *, int)); -int i386_set_ldt __P((int, union descriptor *, int)); -int i386_get_ioperm __P((unsigned int, unsigned int *, int *)); -int i386_set_ioperm __P((unsigned int, unsigned int, int)); -int i386_vm86 __P((int, void *)); -int i386_set_watch __P((int watchnum, unsigned int watchaddr, int size, - int access, struct dbreg * d)); -int i386_clr_watch __P((int watchnum, struct dbreg * d)); +int i386_get_ldt (int, union descriptor *, int); +int i386_set_ldt (int, union descriptor *, int); +int i386_get_ioperm (unsigned int, unsigned int *, int *); +int i386_set_ioperm (unsigned int, unsigned int, int); +int i386_vm86 (int, void *); +int i386_set_watch (int watchnum, unsigned int watchaddr, int size, + int access, struct dbreg * d); +int i386_clr_watch (int watchnum, struct dbreg * d); __END_DECLS #endif diff --git a/sys/cpu/i386/include/vm86.h b/sys/cpu/i386/include/vm86.h index d85118aeb5..fe3c4c75ab 100644 --- a/sys/cpu/i386/include/vm86.h +++ b/sys/cpu/i386/include/vm86.h @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/vm86.h,v 1.13 1999/09/02 20:59:50 luoqi Exp $ - * $DragonFly: src/sys/cpu/i386/include/vm86.h,v 1.2 2003/06/17 04:28:36 dillon Exp $ + * $DragonFly: src/sys/cpu/i386/include/vm86.h,v 1.3 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_VM86_H_ @@ -149,17 +149,17 @@ extern int in_vm86call; extern int vm86paddr; struct proc; -extern int vm86_emulate __P((struct vm86frame *)); -extern int vm86_sysarch __P((struct proc *, char *)); -extern void vm86_trap __P((struct vm86frame *)); -extern int vm86_intcall __P((int, struct vm86frame *)); -extern int vm86_datacall __P((int, struct vm86frame *, struct vm86context *)); -extern void vm86_initialize __P((void)); -extern vm_offset_t vm86_getpage __P((struct vm86context *, int)); -extern vm_offset_t vm86_addpage __P((struct vm86context *, int, vm_offset_t)); -extern int vm86_getptr __P((struct vm86context *, vm_offset_t, - u_short *, u_short *)); - -extern vm_offset_t vm86_getaddr __P((struct vm86context *, u_short, u_short)); +extern int vm86_emulate (struct vm86frame *); +extern int vm86_sysarch (struct proc *, char *); +extern void vm86_trap (struct vm86frame *); +extern int vm86_intcall (int, struct vm86frame *); +extern int vm86_datacall (int, struct vm86frame *, struct vm86context *); +extern void vm86_initialize (void); +extern vm_offset_t vm86_getpage (struct vm86context *, int); +extern vm_offset_t vm86_addpage (struct vm86context *, int, vm_offset_t); +extern int vm86_getptr (struct vm86context *, vm_offset_t, + u_short *, u_short *); + +extern vm_offset_t vm86_getaddr (struct vm86context *, u_short, u_short); #endif /* _MACHINE_VM86_H_ */ diff --git a/sys/cpu/i386/misc/db_disasm.c b/sys/cpu/i386/misc/db_disasm.c index 962b103cb4..aa03b9e8e0 100644 --- a/sys/cpu/i386/misc/db_disasm.c +++ b/sys/cpu/i386/misc/db_disasm.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/i386/i386/db_disasm.c,v 1.23.2.1 2001/07/29 22:48:37 kris Exp $ - * $DragonFly: src/sys/cpu/i386/misc/db_disasm.c,v 1.2 2003/06/17 04:28:35 dillon Exp $ + * $DragonFly: src/sys/cpu/i386/misc/db_disasm.c,v 1.3 2003/08/26 21:42:18 rob Exp $ */ /* @@ -862,13 +862,13 @@ static const int db_lengths[] = { (loc) += (size); static db_addr_t - db_disasm_esc __P((db_addr_t loc, int inst, int short_addr, - int size, const char *seg)); -static void db_print_address __P((const char *seg, int size, - struct i_addr *addrp)); + db_disasm_esc (db_addr_t loc, int inst, int short_addr, + int size, const char *seg); +static void db_print_address (const char *seg, int size, + struct i_addr *addrp); static db_addr_t - db_read_address __P((db_addr_t loc, int short_addr, - int regmodrm, struct i_addr *addrp)); + db_read_address (db_addr_t loc, int short_addr, + int regmodrm, struct i_addr *addrp); /* * Read address at location and return updated location. diff --git a/sys/dev/disk/ncv/dvcfg.h b/sys/dev/disk/ncv/dvcfg.h index c3fb08873f..4d182fcd98 100644 --- a/sys/dev/disk/ncv/dvcfg.h +++ b/sys/dev/disk/ncv/dvcfg.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/i386/include/dvcfg.h,v 1.2.6.1 2000/08/03 01:01:19 peter Exp $ */ -/* $DragonFly: src/sys/dev/disk/ncv/dvcfg.h,v 1.3 2003/06/28 04:16:03 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/ncv/dvcfg.h,v 1.4 2003/08/26 21:42:18 rob Exp $ */ /* $NetBSD$ */ /* * [NetBSD for NEC PC98 series] @@ -51,7 +51,7 @@ struct dvcfg_hwsel { #define DVCFG_HWSEL_SZ(array) (sizeof(array) / sizeof(dvcfg_hw_t)) -static __inline dvcfg_hw_t dvcfg_hw __P((struct dvcfg_hwsel *, u_int)); +static __inline dvcfg_hw_t dvcfg_hw (struct dvcfg_hwsel *, u_int); static __inline dvcfg_hw_t dvcfg_hw(selp, num) diff --git a/sys/i386/apic/mpapic.c b/sys/i386/apic/mpapic.c index ebbbace1b3..240024b0c6 100644 --- a/sys/i386/apic/mpapic.c +++ b/sys/i386/apic/mpapic.c @@ -23,7 +23,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/mpapic.c,v 1.37.2.7 2003/01/25 02:31:47 peter Exp $ - * $DragonFly: src/sys/i386/apic/Attic/mpapic.c,v 1.6 2003/07/11 17:42:08 dillon Exp $ + * $DragonFly: src/sys/i386/apic/Attic/mpapic.c,v 1.7 2003/08/26 21:42:18 rob Exp $ */ #include @@ -129,8 +129,8 @@ apic_dump(char* str) #define REDIRCNT_IOAPIC(A) \ ((int)((io_apic_versions[(A)] & IOART_VER_MAXREDIR) >> MAXREDIRSHIFT) + 1) -static int trigger __P((int apic, int pin, u_int32_t * flags)); -static void polarity __P((int apic, int pin, u_int32_t * flags, int level)); +static int trigger (int apic, int pin, u_int32_t * flags); +static void polarity (int apic, int pin, u_int32_t * flags, int level); #define DEFAULT_FLAGS \ ((u_int32_t) \ @@ -578,8 +578,8 @@ selected_apic_ipi(u_int target, int vector, int delivery_mode) #endif #if defined(READY) -int acquire_apic_timer __P((void)); -int release_apic_timer __P((void)); +int acquire_apic_timer (void); +int release_apic_timer (void); /* * Acquire the APIC timer for exclusive use. diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c index c2757267d6..ada2b4b314 100644 --- a/sys/i386/apm/apm.c +++ b/sys/i386/apm/apm.c @@ -16,7 +16,7 @@ * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * * $FreeBSD: src/sys/i386/apm/apm.c,v 1.114.2.5 2002/11/02 04:41:50 iwasaki Exp $ - * $DragonFly: src/sys/i386/apm/Attic/apm.c,v 1.5 2003/07/21 05:50:39 dillon Exp $ + * $DragonFly: src/sys/i386/apm/Attic/apm.c,v 1.6 2003/08/26 21:42:17 rob Exp $ */ #include @@ -47,12 +47,12 @@ #include /* Used by the apm_saver screen saver module */ -int apm_display __P((int newstate)); +int apm_display (int newstate); struct apm_softc apm_softc; -static void apm_resume __P((void)); +static void apm_resume (void); static int apm_bioscall(void); -static int apm_check_function_supported __P((u_int version, u_int func)); +static int apm_check_function_supported (u_int version, u_int func); static u_long apm_version; @@ -467,7 +467,7 @@ apm_default_suspend(void *arg) return 0; } -static int apm_record_event __P((struct apm_softc *, u_int)); +static int apm_record_event (struct apm_softc *, u_int); static void apm_processevent(void); static u_int apm_op_inprog = 0; diff --git a/sys/i386/boot/dosboot/dirent.h b/sys/i386/boot/dosboot/dirent.h index 064ab4e143..3a2bc66d83 100644 --- a/sys/i386/boot/dosboot/dirent.h +++ b/sys/i386/boot/dosboot/dirent.h @@ -33,7 +33,7 @@ * @(#)dirent.h 5.18 (Berkeley) 2/23/91 * * $FreeBSD: src/sys/i386/boot/dosboot/dirent.h,v 1.2 1999/12/29 04:32:50 peter Exp $ - * $DragonFly: src/sys/i386/boot/dosboot/Attic/dirent.h,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/boot/dosboot/Attic/dirent.h,v 1.3 2003/08/26 21:42:17 rob Exp $ */ #ifndef _DIRENT_H_ @@ -92,17 +92,17 @@ typedef struct _dirdesc { #include "cdefs.h" __BEGIN_DECLS -DIR *opendir __P((const char *)); -struct dirent *readdir __P((DIR *)); -void rewinddir __P((DIR *)); -int closedir __P((DIR *)); +DIR *opendir (const char *); +struct dirent *readdir (DIR *); +void rewinddir (DIR *); +int closedir (DIR *); #ifndef _POSIX_SOURCE -long telldir __P((const DIR *)); -void seekdir __P((DIR *, long)); -int scandir __P((const char *, struct dirent ***, - int (*)(struct dirent *), int (*)(const void *, const void *))); -int alphasort __P((const void *, const void *)); -int getdirentries __P((int, char *, int, long *)); +long telldir (const DIR *); +void seekdir (DIR *, long); +int scandir (const char *, struct dirent ***, + int (*)(struct dirent *), int (*)(const void *, const void *)); +int alphasort (const void *, const void *); +int getdirentries (int, char *, int, long *); #endif /* not POSIX */ __END_DECLS diff --git a/sys/i386/boot/dosboot/disklabe.h b/sys/i386/boot/dosboot/disklabe.h index 906566fe02..2bb40b30fb 100644 --- a/sys/i386/boot/dosboot/disklabe.h +++ b/sys/i386/boot/dosboot/disklabe.h @@ -32,7 +32,7 @@ * * @(#)disklabel.h 8.1 (Berkeley) 6/2/93 * $FreeBSD: src/sys/i386/boot/dosboot/disklabe.h,v 1.8 1999/12/29 04:32:50 peter Exp $ - * $DragonFly: src/sys/i386/boot/dosboot/Attic/disklabe.h,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/boot/dosboot/Attic/disklabe.h,v 1.3 2003/08/26 21:42:17 rob Exp $ */ #ifndef _SYS_DISKLABEL_H_ @@ -377,14 +377,14 @@ extern struct dos_partition dos_partitions[NDOSPART]; #ifdef KERNEL struct dkbad; -u_int dkcksum __P((struct disklabel *)); -int writedisklabel __P((dev_t dev, void (*strat)(), struct disklabel *lp)); -char * readdisklabel __P((dev_t dev, void (*strat)(), struct disklabel *lp, struct dos_partition *dp, struct dkbad *bdp)); -int setdisklabel __P((struct disklabel *olp, struct disklabel *nlp, u_long openmask)); -void disksort __P((struct buf *ap, struct buf *bp)); -void diskerr __P((struct buf *, char *, char *, int, int, struct disklabel *)); +u_int dkcksum (struct disklabel *); +int writedisklabel (dev_t dev, void (*strat)(), struct disklabel *lp); +char * readdisklabel (dev_t dev, void (*strat)(), struct disklabel *lp, struct dos_partition *dp, struct dkbad *bdp); +int setdisklabel (struct disklabel *olp, struct disklabel *nlp, u_long openmask); +void disksort (struct buf *ap, struct buf *bp); +void diskerr (struct buf *, char *, char *, int, int, struct disklabel *); #ifdef __i386 -char * readMBRtolabel __P(( dev_t dev , void (*strat)(), register struct disklabel *lp, struct dos_partition *dp, int *cyl)); +char * readMBRtolabel ( dev_t dev , void (*strat)(), register struct disklabel *lp, struct dos_partition *dp, int *cyl); #endif #endif @@ -393,7 +393,7 @@ char * readMBRtolabel __P(( dev_t dev , void (*strat)(), register struct disklab #include "cdefs.h" __BEGIN_DECLS -struct disklabel *getdiskbyname __P((const char *)); +struct disklabel *getdiskbyname (const char *); __END_DECLS #endif diff --git a/sys/i386/boot/dosboot/inode.h b/sys/i386/boot/dosboot/inode.h index c1220d5ee0..ed031955a0 100644 --- a/sys/i386/boot/dosboot/inode.h +++ b/sys/i386/boot/dosboot/inode.h @@ -32,7 +32,7 @@ * * from: @(#)inode.h 7.17 (Berkeley) 5/8/91 * $FreeBSD: src/sys/i386/boot/dosboot/inode.h,v 1.7 1999/12/29 04:32:51 peter Exp $ - * $DragonFly: src/sys/i386/boot/dosboot/Attic/inode.h,v 1.3 2003/08/01 17:46:20 dillon Exp $ + * $DragonFly: src/sys/i386/boot/dosboot/Attic/inode.h,v 1.4 2003/08/26 21:42:17 rob Exp $ */ #ifndef _UFS_INODE_H_ @@ -171,57 +171,57 @@ struct ufid { /* * Prototypes for UFS vnode operations */ -int ufs_lookup __P((struct vnode *vp, struct nameidata *ndp, struct proc *p)); -int ufs_create __P((struct nameidata *ndp, struct vattr *vap, struct proc *p)); -int ufs_mknod __P((struct nameidata *ndp, struct vattr *vap, struct ucred *cred, - struct proc *p)); -int ufs_open __P((struct vnode *vp, int mode, struct ucred *cred, - struct proc *p)); -int ufs_close __P((struct vnode *vp, int fflag, struct ucred *cred, - struct proc *p)); -int ufs_access __P((struct vnode *vp, int mode, struct ucred *cred, - struct proc *p)); -int ufs_getattr __P((struct vnode *vp, struct vattr *vap, struct ucred *cred, - struct proc *p)); -int ufs_setattr __P((struct vnode *vp, struct vattr *vap, struct ucred *cred, - struct proc *p)); -int ufs_read __P((struct vnode *vp, struct uio *uio, int ioflag, - struct ucred *cred)); -int ufs_write __P((struct vnode *vp, struct uio *uio, int ioflag, - struct ucred *cred)); -int ufs_ioctl __P((struct vnode *vp, int command, caddr_t data, int fflag, - struct ucred *cred, struct proc *p)); -int ufs_select __P((struct vnode *vp, int which, int fflags, struct ucred *cred, - struct proc *p)); -int ufs_mmap __P((struct vnode *vp, int fflags, struct ucred *cred, - struct proc *p)); -int ufs_fsync __P((struct vnode *vp, int fflags, struct ucred *cred, - int waitfor, struct proc *p)); -int ufs_seek __P((struct vnode *vp, off_t oldoff, off_t newoff, - struct ucred *cred)); -int ufs_remove __P((struct nameidata *ndp, struct proc *p)); -int ufs_link __P((struct vnode *vp, struct nameidata *ndp, struct proc *p)); -int ufs_rename __P((struct nameidata *fndp, struct nameidata *tdnp, - struct proc *p)); -int ufs_mkdir __P((struct nameidata *ndp, struct vattr *vap, struct proc *p)); -int ufs_rmdir __P((struct nameidata *ndp, struct proc *p)); -int ufs_symlink __P((struct nameidata *ndp, struct vattr *vap, char *target, - struct proc *p)); -int ufs_readdir __P((struct vnode *vp, struct uio *uio, struct ucred *cred, - int *eofflagp)); -int ufs_readlink __P((struct vnode *vp, struct uio *uio, struct ucred *cred)); -int ufs_abortop __P((struct nameidata *ndp)); -int ufs_inactive __P((struct vnode *vp, struct proc *p)); -int ufs_reclaim __P((struct vnode *vp)); -int ufs_lock __P((struct vnode *vp)); -int ufs_unlock __P((struct vnode *vp)); -int ufs_bmap __P((struct vnode *vp, daddr_t bn, struct vnode **vpp, - daddr_t *bnp)); -int ufs_strategy __P((struct buf *bp)); -void ufs_print __P((struct vnode *vp)); -int ufs_islocked __P((struct vnode *vp)); -int ufs_advlock __P((struct vnode *vp, caddr_t id, int op, struct flock *fl, - int flags)); +int ufs_lookup (struct vnode *vp, struct nameidata *ndp, struct proc *p); +int ufs_create (struct nameidata *ndp, struct vattr *vap, struct proc *p); +int ufs_mknod (struct nameidata *ndp, struct vattr *vap, struct ucred *cred, + struct proc *p); +int ufs_open (struct vnode *vp, int mode, struct ucred *cred, + struct proc *p); +int ufs_close (struct vnode *vp, int fflag, struct ucred *cred, + struct proc *p); +int ufs_access (struct vnode *vp, int mode, struct ucred *cred, + struct proc *p); +int ufs_getattr (struct vnode *vp, struct vattr *vap, struct ucred *cred, + struct proc *p); +int ufs_setattr (struct vnode *vp, struct vattr *vap, struct ucred *cred, + struct proc *p); +int ufs_read (struct vnode *vp, struct uio *uio, int ioflag, + struct ucred *cred); +int ufs_write (struct vnode *vp, struct uio *uio, int ioflag, + struct ucred *cred); +int ufs_ioctl (struct vnode *vp, int command, caddr_t data, int fflag, + struct ucred *cred, struct proc *p); +int ufs_select (struct vnode *vp, int which, int fflags, struct ucred *cred, + struct proc *p); +int ufs_mmap (struct vnode *vp, int fflags, struct ucred *cred, + struct proc *p); +int ufs_fsync (struct vnode *vp, int fflags, struct ucred *cred, + int waitfor, struct proc *p); +int ufs_seek (struct vnode *vp, off_t oldoff, off_t newoff, + struct ucred *cred); +int ufs_remove (struct nameidata *ndp, struct proc *p); +int ufs_link (struct vnode *vp, struct nameidata *ndp, struct proc *p); +int ufs_rename (struct nameidata *fndp, struct nameidata *tdnp, + struct proc *p); +int ufs_mkdir (struct nameidata *ndp, struct vattr *vap, struct proc *p); +int ufs_rmdir (struct nameidata *ndp, struct proc *p); +int ufs_symlink (struct nameidata *ndp, struct vattr *vap, char *target, + struct proc *p); +int ufs_readdir (struct vnode *vp, struct uio *uio, struct ucred *cred, + int *eofflagp); +int ufs_readlink (struct vnode *vp, struct uio *uio, struct ucred *cred); +int ufs_abortop (struct nameidata *ndp); +int ufs_inactive (struct vnode *vp, struct proc *p); +int ufs_reclaim (struct vnode *vp); +int ufs_lock (struct vnode *vp); +int ufs_unlock (struct vnode *vp); +int ufs_bmap (struct vnode *vp, daddr_t bn, struct vnode **vpp, + daddr_t *bnp); +int ufs_strategy (struct buf *bp); +void ufs_print (struct vnode *vp); +int ufs_islocked (struct vnode *vp); +int ufs_advlock (struct vnode *vp, caddr_t id, int op, struct flock *fl, + int flags); extern void blkfree(struct inode *, daddr_t, off_t); extern void ifree(struct inode *, ino_t, int); @@ -235,7 +235,7 @@ extern int realloccg(struct inode *, off_t, daddr_t, int, int, struct buf **); extern int ialloc(struct inode *, ino_t, int, struct ucred *, struct inode **); extern daddr_t blkpref(struct inode *, daddr_t, int, daddr_t *); extern u_long hashalloc(struct inode *, int, long, int, - u_long (*)(struct inode *, int, long, int)); + u_long (*)(struct inode *, int, long, int); extern daddr_t fragextend(struct inode *, int, long, int, int); extern daddr_t alloccg(struct inode *, int, daddr_t, int); diff --git a/sys/i386/boot/dosboot/quota.h b/sys/i386/boot/dosboot/quota.h index 7bd820986e..d35286f1da 100644 --- a/sys/i386/boot/dosboot/quota.h +++ b/sys/i386/boot/dosboot/quota.h @@ -35,7 +35,7 @@ * * from: @(#)quota.h 7.9 (Berkeley) 2/22/91 * $FreeBSD: src/sys/i386/boot/dosboot/quota.h,v 1.6 1999/12/29 04:32:51 peter Exp $ - * $DragonFly: src/sys/i386/boot/dosboot/Attic/quota.h,v 1.3 2003/07/03 18:35:26 dillon Exp $ + * $DragonFly: src/sys/i386/boot/dosboot/Attic/quota.h,v 1.4 2003/08/26 21:42:17 rob Exp $ */ #ifndef _QUOTA_ @@ -202,7 +202,7 @@ void dqflush(struct vnode *); #include "cdefs.h" __BEGIN_DECLS -int quotactl __P((const char *, int, int, void *)); +int quotactl (const char *, int, int, void *); __END_DECLS #endif /* _KERNEL */ diff --git a/sys/i386/boot/dosboot/types.h b/sys/i386/boot/dosboot/types.h index b0d5492dad..ba68660b26 100644 --- a/sys/i386/boot/dosboot/types.h +++ b/sys/i386/boot/dosboot/types.h @@ -37,7 +37,7 @@ * * @(#)types.h 8.4 (Berkeley) 1/21/94 * $FreeBSD: src/sys/i386/boot/dosboot/types.h,v 1.6 1999/12/29 04:32:52 peter Exp $ - * $DragonFly: src/sys/i386/boot/dosboot/Attic/types.h,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/boot/dosboot/Attic/types.h,v 1.3 2003/08/26 21:42:17 rob Exp $ */ #ifndef _SYS_TYPES_H_ @@ -86,7 +86,7 @@ typedef unsigned short uid_t; /* user id */ */ #ifndef KERNEL __BEGIN_DECLS -off_t lseek __P((int, off_t, int)); +off_t lseek (int, off_t, int); __END_DECLS #endif diff --git a/sys/i386/gnu/isa/dgb.c b/sys/i386/gnu/isa/dgb.c index e3139848b8..89f157e437 100644 --- a/sys/i386/gnu/isa/dgb.c +++ b/sys/i386/gnu/isa/dgb.c @@ -1,6 +1,6 @@ /*- * dgb.c $FreeBSD: src/sys/gnu/i386/isa/dgb.c,v 1.56.2.1 2001/02/26 04:23:09 jlemon Exp $ - * dgb.c $DragonFly: src/sys/i386/gnu/isa/Attic/dgb.c,v 1.8 2003/08/07 21:17:21 dillon Exp $ + * dgb.c $DragonFly: src/sys/i386/gnu/isa/Attic/dgb.c,v 1.9 2003/08/26 21:42:17 rob Exp $ * * Digiboard driver. * @@ -173,28 +173,28 @@ static struct tty dgb_tty[NDGBPORTS]; */ /* Interrupt handling entry points. */ -static void dgbpoll __P((void *unit_c)); +static void dgbpoll (void *unit_c); /* Device switch entry points. */ #define dgbreset noreset #define dgbmmap nommap #define dgbstrategy nostrategy -static int dgbattach __P((struct isa_device *dev)); -static int dgbprobe __P((struct isa_device *dev)); +static int dgbattach (struct isa_device *dev); +static int dgbprobe (struct isa_device *dev); static void fepcmd(struct dgb_p *port, unsigned cmd, unsigned op1, unsigned op2, unsigned ncmds, unsigned bytecmd); -static void dgbstart __P((struct tty *tp)); -static void dgbstop __P((struct tty *tp, int rw)); -static int dgbparam __P((struct tty *tp, struct termios *t)); -static void dgbhardclose __P((struct dgb_p *port)); -static void dgb_drain_or_flush __P((struct dgb_p *port)); -static int dgbdrain __P((struct dgb_p *port)); -static void dgb_pause __P((void *chan)); -static void wakeflush __P((void *p)); -static void disc_optim __P((struct tty *tp, struct termios *t)); +static void dgbstart (struct tty *tp); +static void dgbstop (struct tty *tp, int rw); +static int dgbparam (struct tty *tp, struct termios *t); +static void dgbhardclose (struct dgb_p *port); +static void dgb_drain_or_flush (struct dgb_p *port); +static int dgbdrain (struct dgb_p *port); +static void dgb_pause (void *chan); +static void wakeflush (void *p); +static void disc_optim (struct tty *tp, struct termios *t); struct isa_driver dgbdriver = { @@ -306,10 +306,10 @@ static int dgbdebug=0; SYSCTL_INT(_debug, OID_AUTO, dgb_debug, CTLFLAG_RW, &dgbdebug, 0, ""); #endif -static __inline int setwin __P((struct dgb_softc *sc, unsigned addr)); -static __inline int setinitwin __P((struct dgb_softc *sc, unsigned addr)); -static __inline void hidewin __P((struct dgb_softc *sc)); -static __inline void towin __P((struct dgb_softc *sc, int win)); +static __inline int setwin (struct dgb_softc *sc, unsigned addr); +static __inline int setinitwin (struct dgb_softc *sc, unsigned addr); +static __inline void hidewin (struct dgb_softc *sc); +static __inline void towin (struct dgb_softc *sc, int win); /*Helg: to allow recursive dgb...() calls */ typedef struct diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c index a7cff64d10..580cda4c92 100644 --- a/sys/i386/i386/autoconf.c +++ b/sys/i386/i386/autoconf.c @@ -35,7 +35,7 @@ * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/i386/autoconf.c,v 1.146.2.2 2001/06/07 06:05:58 dd Exp $ - * $DragonFly: src/sys/i386/i386/Attic/autoconf.c,v 1.9 2003/08/07 21:17:22 dillon Exp $ + * $DragonFly: src/sys/i386/i386/Attic/autoconf.c,v 1.10 2003/08/26 21:42:18 rob Exp $ */ /* @@ -91,12 +91,12 @@ device_t isa_bus_device = 0; #endif -static void configure_first __P((void *)); -static void configure __P((void *)); -static void configure_final __P((void *)); +static void configure_first (void *); +static void configure (void *); +static void configure_final (void *); #if defined(FFS) && defined(FFS_ROOT) -static void setroot __P((void)); +static void setroot (void); #endif #if defined(NFS) && defined(NFS_ROOT) diff --git a/sys/i386/i386/db_disasm.c b/sys/i386/i386/db_disasm.c index 59299d74e5..3ad35c238d 100644 --- a/sys/i386/i386/db_disasm.c +++ b/sys/i386/i386/db_disasm.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/i386/i386/db_disasm.c,v 1.23.2.1 2001/07/29 22:48:37 kris Exp $ - * $DragonFly: src/sys/i386/i386/Attic/db_disasm.c,v 1.2 2003/06/17 04:28:35 dillon Exp $ + * $DragonFly: src/sys/i386/i386/Attic/db_disasm.c,v 1.3 2003/08/26 21:42:18 rob Exp $ */ /* @@ -862,13 +862,13 @@ static const int db_lengths[] = { (loc) += (size); static db_addr_t - db_disasm_esc __P((db_addr_t loc, int inst, int short_addr, - int size, const char *seg)); -static void db_print_address __P((const char *seg, int size, - struct i_addr *addrp)); + db_disasm_esc (db_addr_t loc, int inst, int short_addr, + int size, const char *seg); +static void db_print_address (const char *seg, int size, + struct i_addr *addrp); static db_addr_t - db_read_address __P((db_addr_t loc, int short_addr, - int regmodrm, struct i_addr *addrp)); + db_read_address (db_addr_t loc, int short_addr, + int regmodrm, struct i_addr *addrp); /* * Read address at location and return updated location. diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c index e1fdfd18c8..a316d325ca 100644 --- a/sys/i386/i386/db_interface.c +++ b/sys/i386/i386/db_interface.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/i386/i386/db_interface.c,v 1.48.2.1 2000/07/07 00:38:46 obrien Exp $ - * $DragonFly: src/sys/i386/i386/Attic/db_interface.c,v 1.5 2003/07/26 19:07:47 rob Exp $ + * $DragonFly: src/sys/i386/i386/Attic/db_interface.c,v 1.6 2003/08/26 21:42:18 rob Exp $ */ /* @@ -52,7 +52,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); int db_active; db_regs_t ddb_regs; diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c index 279dd1e27a..397e867bb0 100644 --- a/sys/i386/i386/db_trace.c +++ b/sys/i386/i386/db_trace.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/i386/i386/db_trace.c,v 1.35.2.3 2002/02/21 22:31:25 silby Exp $ - * $DragonFly: src/sys/i386/i386/Attic/db_trace.c,v 1.5 2003/08/03 10:07:40 hmp Exp $ + * $DragonFly: src/sys/i386/i386/Attic/db_trace.c,v 1.6 2003/08/26 21:42:18 rob Exp $ */ #include @@ -107,18 +107,18 @@ struct i386_frame { #define INTERRUPT 2 #define SYSCALL 3 -static void db_nextframe __P((struct i386_frame **, db_addr_t *)); -static int db_numargs __P((struct i386_frame *)); -static void db_print_stack_entry __P((const char *, int, char **, int *, db_addr_t)); +static void db_nextframe (struct i386_frame **, db_addr_t *); +static int db_numargs (struct i386_frame *); +static void db_print_stack_entry (const char *, int, char **, int *, db_addr_t); -static char * watchtype_str __P((int type)); -int i386_set_watch __P((int watchnum, unsigned int watchaddr, - int size, int access, struct dbreg * d)); -int i386_clr_watch __P((int watchnum, struct dbreg * d)); -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)); +static char * watchtype_str (int type); +int i386_set_watch (int watchnum, unsigned int watchaddr, + int size, int access, struct dbreg * d); +int i386_clr_watch (int watchnum, struct dbreg * d); +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/i386/i386/machdep.c b/sys/i386/i386/machdep.c index aefb5b7fda..8aea251180 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -36,7 +36,7 @@ * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.385.2.30 2003/05/31 08:48:05 alc Exp $ - * $DragonFly: src/sys/i386/i386/Attic/machdep.c,v 1.34 2003/08/25 19:50:28 dillon Exp $ + * $DragonFly: src/sys/i386/i386/Attic/machdep.c,v 1.35 2003/08/26 21:42:18 rob Exp $ */ #include "use_apm.h" @@ -120,18 +120,18 @@ #include #include -extern void init386 __P((int first)); -extern void dblfault_handler __P((void)); +extern void init386 (int first); +extern void dblfault_handler (void); extern void printcpuinfo(void); /* XXX header file */ extern void finishidentcpu(void); extern void panicifcpuunsupported(void); extern void initializecpu(void); -static void cpu_startup __P((void *)); +static void cpu_startup (void *); #ifndef CPU_DISABLE_SSE -static void set_fpregs_xmm __P((struct save87 *, struct savexmm *)); -static void fill_fpregs_xmm __P((struct savexmm *, struct save87 *)); +static void set_fpregs_xmm (struct save87 *, struct savexmm *); +static void fill_fpregs_xmm (struct savexmm *, struct save87 *); #endif /* CPU_DISABLE_SSE */ #ifdef DIRECTIO extern void ffs_rawread_setup(void); diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c index b8e5ebbcec..5b89db1092 100644 --- a/sys/i386/i386/mem.c +++ b/sys/i386/i386/mem.c @@ -39,7 +39,7 @@ * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/i386/mem.c,v 1.79.2.9 2003/01/04 22:58:01 njl Exp $ - * $DragonFly: src/sys/i386/i386/Attic/mem.c,v 1.8 2003/07/26 19:07:47 rob Exp $ + * $DragonFly: src/sys/i386/i386/Attic/mem.c,v 1.9 2003/08/26 21:42:18 rob Exp $ */ /* @@ -103,8 +103,8 @@ static int rand_bolt; static caddr_t zbuf; MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); -static int mem_ioctl __P((dev_t, u_long, caddr_t, int, struct thread *)); -static int random_ioctl __P((dev_t, u_long, caddr_t, int, struct thread *)); +static int mem_ioctl (dev_t, u_long, caddr_t, int, struct thread *); +static int random_ioctl (dev_t, u_long, caddr_t, int, struct thread *); struct mem_range_softc mem_range_softc; diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c index cad26d3b9a..5459af867c 100644 --- a/sys/i386/i386/mp_machdep.c +++ b/sys/i386/i386/mp_machdep.c @@ -23,7 +23,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.115.2.15 2003/03/14 21:22:35 jhb Exp $ - * $DragonFly: src/sys/i386/i386/Attic/mp_machdep.c,v 1.14 2003/07/30 02:59:19 dillon Exp $ + * $DragonFly: src/sys/i386/i386/Attic/mp_machdep.c,v 1.15 2003/08/26 21:42:18 rob Exp $ */ #include "opt_cpu.h" @@ -717,11 +717,11 @@ static io_int *io_apic_ints; static int nintrs; -static int processor_entry __P((proc_entry_ptr entry, int cpu)); -static int bus_entry __P((bus_entry_ptr entry, int bus)); -static int io_apic_entry __P((io_apic_entry_ptr entry, int apic)); -static int int_entry __P((int_entry_ptr entry, int intr)); -static int lookup_bus_type __P((char *name)); +static int processor_entry (proc_entry_ptr entry, int cpu); +static int bus_entry (bus_entry_ptr entry, int bus); +static int io_apic_entry (io_apic_entry_ptr entry, int apic); +static int int_entry (int_entry_ptr entry, int intr); +static int lookup_bus_type (char *name); /* diff --git a/sys/i386/i386/mpapic.c b/sys/i386/i386/mpapic.c index 85fb851370..0a8d9bc0a4 100644 --- a/sys/i386/i386/mpapic.c +++ b/sys/i386/i386/mpapic.c @@ -23,7 +23,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/mpapic.c,v 1.37.2.7 2003/01/25 02:31:47 peter Exp $ - * $DragonFly: src/sys/i386/i386/Attic/mpapic.c,v 1.6 2003/07/11 17:42:08 dillon Exp $ + * $DragonFly: src/sys/i386/i386/Attic/mpapic.c,v 1.7 2003/08/26 21:42:18 rob Exp $ */ #include @@ -129,8 +129,8 @@ apic_dump(char* str) #define REDIRCNT_IOAPIC(A) \ ((int)((io_apic_versions[(A)] & IOART_VER_MAXREDIR) >> MAXREDIRSHIFT) + 1) -static int trigger __P((int apic, int pin, u_int32_t * flags)); -static void polarity __P((int apic, int pin, u_int32_t * flags, int level)); +static int trigger (int apic, int pin, u_int32_t * flags); +static void polarity (int apic, int pin, u_int32_t * flags, int level); #define DEFAULT_FLAGS \ ((u_int32_t) \ @@ -578,8 +578,8 @@ selected_apic_ipi(u_int target, int vector, int delivery_mode) #endif #if defined(READY) -int acquire_apic_timer __P((void)); -int release_apic_timer __P((void)); +int acquire_apic_timer (void); +int release_apic_timer (void); /* * Acquire the APIC timer for exclusive use. diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 8d2618abeb..32822c84d2 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -40,7 +40,7 @@ * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.250.2.18 2002/03/06 22:48:53 silby Exp $ - * $DragonFly: src/sys/i386/i386/Attic/pmap.c,v 1.19 2003/08/03 10:07:40 hmp Exp $ + * $DragonFly: src/sys/i386/i386/Attic/pmap.c,v 1.20 2003/08/26 21:42:18 rob Exp $ */ /* @@ -187,31 +187,31 @@ static caddr_t crashdumpmap; extern pt_entry_t *SMPpt; -static PMAP_INLINE void free_pv_entry __P((pv_entry_t pv)); -static unsigned * get_ptbase __P((pmap_t pmap)); -static pv_entry_t get_pv_entry __P((void)); -static void i386_protection_init __P((void)); -static __inline 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((struct pmap *pmap, unsigned *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 boolean_t pmap_testbit __P((vm_page_t m, int bit)); -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 unsigned * pmap_pte_quick __P((pmap_t pmap, vm_offset_t va)); -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 unsigned * get_ptbase (pmap_t pmap); +static pv_entry_t get_pv_entry (void); +static void i386_protection_init (void); +static __inline 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 (struct pmap *pmap, unsigned *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 boolean_t pmap_testbit (vm_page_t m, int bit); +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 unsigned * pmap_pte_quick (pmap_t pmap, vm_offset_t va); +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 vm_offset_t pmap_kmem_choose(vm_offset_t addr); static unsigned pdir4mb; @@ -3304,8 +3304,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/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c index ddb1456da5..b9d707fb27 100644 --- a/sys/i386/i386/sys_machdep.c +++ b/sys/i386/i386/sys_machdep.c @@ -32,7 +32,7 @@ * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 * $FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.47.2.3 2002/10/07 17:20:00 jhb Exp $ - * $DragonFly: src/sys/i386/i386/Attic/sys_machdep.c,v 1.10 2003/07/30 00:19:13 dillon Exp $ + * $DragonFly: src/sys/i386/i386/Attic/sys_machdep.c,v 1.11 2003/08/26 21:42:18 rob Exp $ * */ @@ -72,12 +72,12 @@ #ifdef USER_LDT -static int i386_get_ldt __P((struct proc *, char *, int *)); -static int i386_set_ldt __P((struct proc *, char *, int *)); +static int i386_get_ldt (struct proc *, char *, int *); +static int i386_set_ldt (struct proc *, char *, int *); #endif -static int i386_get_ioperm __P((struct proc *, char *)); -static int i386_set_ioperm __P((struct proc *, char *)); -int i386_extend_pcb __P((struct proc *)); +static int i386_get_ioperm (struct proc *, char *); +static int i386_set_ioperm (struct proc *, char *); +int i386_extend_pcb (struct proc *); /* * sysarch_args(int op, char *params) diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index 73ddc8f840..5a6811ab51 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -36,7 +36,7 @@ * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 * $FreeBSD: src/sys/i386/i386/trap.c,v 1.147.2.11 2003/02/27 19:09:59 luoqi Exp $ - * $DragonFly: src/sys/i386/i386/Attic/trap.c,v 1.33 2003/08/25 19:50:28 dillon Exp $ + * $DragonFly: src/sys/i386/i386/Attic/trap.c,v 1.34 2003/08/26 21:42:18 rob Exp $ */ /* @@ -103,16 +103,16 @@ #include #include -int (*pmath_emulate) __P((struct trapframe *)); +int (*pmath_emulate) (struct trapframe *); -extern void trap __P((struct trapframe frame)); -extern int trapwrite __P((unsigned addr)); -extern void syscall2 __P((struct trapframe frame)); -extern void sendsys2 __P((struct trapframe frame)); +extern void trap (struct trapframe frame); +extern int trapwrite (unsigned addr); +extern void syscall2 (struct trapframe frame); +extern void sendsys2 (struct trapframe frame); -static int trap_pfault __P((struct trapframe *, int, vm_offset_t)); -static void trap_fatal __P((struct trapframe *, vm_offset_t)); -void dblfault_handler __P((void)); +static int trap_pfault (struct trapframe *, int, vm_offset_t); +static void trap_fatal (struct trapframe *, vm_offset_t); +void dblfault_handler (void); extern inthand_t IDTVEC(syscall); @@ -284,7 +284,7 @@ userret(struct proc *p, struct trapframe *frame, u_quad_t oticks) #ifdef DEVICE_POLLING extern u_int32_t poll_in_trap; -extern int ether_poll __P((int count)); +extern int ether_poll (int count); #endif /* DEVICE_POLLING */ /* diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c index 4bfde76a1f..a8413c44cd 100644 --- a/sys/i386/i386/vm86.c +++ b/sys/i386/i386/vm86.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/vm86.c,v 1.31.2.2 2001/10/05 06:18:55 peter Exp $ - * $DragonFly: src/sys/i386/i386/Attic/vm86.c,v 1.7 2003/07/08 06:27:26 dillon Exp $ + * $DragonFly: src/sys/i386/i386/Attic/vm86.c,v 1.8 2003/08/26 21:42:18 rob Exp $ */ #include @@ -47,7 +47,7 @@ #include #include -extern int i386_extend_pcb __P((struct proc *)); +extern int i386_extend_pcb (struct proc *); extern int vm86pa; extern struct pcb *vm86pcb; diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index 487120e3fd..20094730af 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -39,7 +39,7 @@ * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.132.2.9 2003/01/25 19:02:23 dillon Exp $ - * $DragonFly: src/sys/i386/i386/Attic/vm_machdep.c,v 1.23 2003/08/07 21:17:22 dillon Exp $ + * $DragonFly: src/sys/i386/i386/Attic/vm_machdep.c,v 1.24 2003/08/26 21:42:18 rob Exp $ */ #include "use_npx.h" @@ -91,9 +91,9 @@ #include #endif -static void cpu_reset_real __P((void)); +static void cpu_reset_real (void); #ifdef SMP -static void cpu_reset_proxy __P((void)); +static void cpu_reset_proxy (void); static u_int cpu_reset_proxyid; static volatile u_int cpu_reset_proxy_active; #endif @@ -236,7 +236,7 @@ cpu_fork(p1, p2, flags) void cpu_set_fork_handler(p, func, arg) struct proc *p; - void (*func) __P((void *)); + void (*func) (void *); void *arg; { /* diff --git a/sys/i386/icu/icu.h b/sys/i386/icu/icu.h index bc8c04ab5c..b1d29e7f08 100644 --- a/sys/i386/icu/icu.h +++ b/sys/i386/icu/icu.h @@ -35,7 +35,7 @@ * * from: @(#)icu.h 5.6 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/isa/icu.h,v 1.18 1999/12/26 12:43:47 bde Exp $ - * $DragonFly: src/sys/i386/icu/Attic/icu.h,v 1.3 2003/06/29 03:28:43 dillon Exp $ + * $DragonFly: src/sys/i386/icu/Attic/icu.h,v 1.4 2003/08/26 21:42:19 rob Exp $ */ /* @@ -48,8 +48,8 @@ #ifndef LOCORE -void INTREN __P((u_int)); -void INTRDIS __P((u_int)); +void INTREN (u_int); +void INTRDIS (u_int); #endif /* LOCORE */ diff --git a/sys/i386/include/apm_bios.h b/sys/i386/include/apm_bios.h index 1ea47fb155..8f6028d6ac 100644 --- a/sys/i386/include/apm_bios.h +++ b/sys/i386/include/apm_bios.h @@ -13,7 +13,7 @@ * Aug, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * * $FreeBSD: src/sys/i386/include/apm_bios.h,v 1.27.2.2 2002/04/12 16:47:00 bmah Exp $ - * $DragonFly: src/sys/i386/include/Attic/apm_bios.h,v 1.2 2003/06/17 04:28:35 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/apm_bios.h,v 1.3 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_APM_BIOS_H_ @@ -145,7 +145,7 @@ /* C definitions */ struct apmhook { struct apmhook *ah_next; - int (*ah_fun) __P((void *ah_arg)); + int (*ah_fun) (void *ah_arg); void *ah_arg; const char *ah_name; int ah_order; diff --git a/sys/i386/include/bus_pc98.h b/sys/i386/include/bus_pc98.h index a4d8d1517a..6f9c3540e9 100644 --- a/sys/i386/include/bus_pc98.h +++ b/sys/i386/include/bus_pc98.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/i386/include/bus_pc98.h,v 1.8.2.5 2002/03/03 05:42:50 nyan Exp $ */ -/* $DragonFly: src/sys/i386/include/Attic/bus_pc98.h,v 1.3 2003/08/07 21:17:22 dillon Exp $ */ +/* $DragonFly: src/sys/i386/include/Attic/bus_pc98.h,v 1.4 2003/08/26 21:42:18 rob Exp $ */ /* $NecBSD: busio.h,v 3.25.4.2.2.1 2000/06/12 03:53:08 honda Exp $ */ /* $NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $ */ @@ -76,7 +76,7 @@ struct resource; /* * bus space tag */ -#define _PASCAL_CALL __P((void)) +#define _PASCAL_CALL (void) #define _BUS_SPACE_CALL_FUNCS_TAB(NAME,TYPE,BWN) \ NAME##_space_read_##BWN##, \ @@ -216,28 +216,28 @@ void i386_memio_free(bus_space_tag_t t, bus_space_handle_t bsh, */ #define _BUS_ACCESS_METHODS_PROTO(TYPE,BWN) \ static __inline TYPE bus_space_read_##BWN \ - __P((bus_space_tag_t, bus_space_handle_t, bus_size_t offset)); \ + (bus_space_tag_t, bus_space_handle_t, bus_size_t offset); \ static __inline void bus_space_read_multi_##BWN \ - __P((bus_space_tag_t, bus_space_handle_t, \ - bus_size_t, TYPE *, size_t)); \ + (bus_space_tag_t, bus_space_handle_t, \ + bus_size_t, TYPE *, size_t); \ static __inline void bus_space_read_region_##BWN \ - __P((bus_space_tag_t, bus_space_handle_t, \ - bus_size_t, TYPE *, size_t)); \ + (bus_space_tag_t, bus_space_handle_t, \ + bus_size_t, TYPE *, size_t); \ static __inline void bus_space_write_##BWN \ - __P((bus_space_tag_t, bus_space_handle_t, bus_size_t, TYPE)); \ + (bus_space_tag_t, bus_space_handle_t, bus_size_t, TYPE); \ static __inline void bus_space_write_multi_##BWN \ - __P((bus_space_tag_t, bus_space_handle_t, \ - bus_size_t, const TYPE *, size_t)); \ + (bus_space_tag_t, bus_space_handle_t, \ + bus_size_t, const TYPE *, size_t); \ static __inline void bus_space_write_region_##BWN \ - __P((bus_space_tag_t, bus_space_handle_t, \ - bus_size_t, const TYPE *, size_t)); \ + (bus_space_tag_t, bus_space_handle_t, \ + bus_size_t, const TYPE *, size_t); \ static __inline void bus_space_set_multi_##BWN \ - __P((bus_space_tag_t, bus_space_handle_t, bus_size_t, TYPE, size_t));\ + (bus_space_tag_t, bus_space_handle_t, bus_size_t, TYPE, size_t);\ static __inline void bus_space_set_region_##BWN \ - __P((bus_space_tag_t, bus_space_handle_t, bus_size_t, TYPE, size_t));\ + (bus_space_tag_t, bus_space_handle_t, bus_size_t, TYPE, size_t);\ static __inline void bus_space_copy_region_##BWN \ - __P((bus_space_tag_t, bus_space_handle_t, bus_size_t, \ - bus_space_handle_t, bus_size_t, size_t)); + (bus_space_tag_t, bus_space_handle_t, bus_size_t, \ + bus_space_handle_t, bus_size_t, size_t); _BUS_ACCESS_METHODS_PROTO(u_int8_t,1) _BUS_ACCESS_METHODS_PROTO(u_int16_t,2) diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h index 77014c5781..e61ca19246 100644 --- a/sys/i386/include/clock.h +++ b/sys/i386/include/clock.h @@ -4,7 +4,7 @@ * This file is in the public domain. * * $FreeBSD: src/sys/i386/include/clock.h,v 1.38.2.1 2002/11/02 04:41:50 iwasaki Exp $ - * $DragonFly: src/sys/i386/include/Attic/clock.h,v 1.3 2003/08/03 11:51:25 hmp Exp $ + * $DragonFly: src/sys/i386/include/Attic/clock.h,v 1.4 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -32,19 +32,19 @@ extern int apic_8254_intr; */ struct clockframe; -int acquire_timer0 __P((int rate, - void (*function)(struct clockframe *frame))); -int acquire_timer2 __P((int mode)); -int release_timer0 __P((void)); -int release_timer2 __P((void)); +int acquire_timer0 (int rate, + void (*function)(struct clockframe *frame)); +int acquire_timer2 (int mode); +int release_timer0 (void); +int release_timer2 (void); #ifndef PC98 -int rtcin __P((int val)); +int rtcin (int val); #else -int acquire_timer1 __P((int mode)); -int release_timer1 __P((void)); +int acquire_timer1 (int mode); +int release_timer1 (void); #endif -int sysbeep __P((int pitch, int period)); -void timer_restore __P((void)); +int sysbeep (int pitch, int period); +void timer_restore (void); #endif /* _KERNEL */ diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h index 4b65c39a7d..1628b84548 100644 --- a/sys/i386/include/cpu.h +++ b/sys/i386/include/cpu.h @@ -35,7 +35,7 @@ * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/include/cpu.h,v 1.43.2.2 2001/06/15 09:37:57 scottl Exp $ - * $DragonFly: src/sys/i386/include/Attic/cpu.h,v 1.10 2003/08/25 19:50:29 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/cpu.h,v 1.11 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_CPU_H_ @@ -106,8 +106,8 @@ extern char btext[]; extern char etext[]; -void fork_trampoline __P((void)); -void fork_return __P((struct proc *, struct trapframe)); +void fork_trampoline (void); +void fork_return (struct proc *, struct trapframe); #endif #endif /* !_MACHINE_CPU_H_ */ diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h index 7685af2083..4eb501e08d 100644 --- a/sys/i386/include/cpufunc.h +++ b/sys/i386/include/cpufunc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.96.2.3 2002/04/28 22:50:54 dwmalone Exp $ - * $DragonFly: src/sys/i386/include/Attic/cpufunc.h,v 1.6 2003/08/07 21:17:22 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/cpufunc.h,v 1.7 2003/08/26 21:42:18 rob Exp $ */ /* @@ -623,51 +623,51 @@ load_dr7(u_int sel) #else /* !__GNUC__ */ -int breakpoint __P((void)); -u_int bsfl __P((u_int mask)); -u_int bsrl __P((u_int mask)); -void cpu_disable_intr __P((void)); -void do_cpuid __P((u_int ax, u_int *p)); -void cpu_enable_intr __P((void)); -u_char inb __P((u_int port)); -u_int inl __P((u_int port)); -void insb __P((u_int port, void *addr, size_t cnt)); -void insl __P((u_int port, void *addr, size_t cnt)); -void insw __P((u_int port, void *addr, size_t cnt)); -void invd __P((void)); -void invlpg __P((u_int addr)); -void invltlb __P((void)); -u_short inw __P((u_int port)); -u_int loadandclear __P((u_int *addr)); -void outb __P((u_int port, u_char data)); -void outl __P((u_int port, u_int data)); -void outsb __P((u_int port, void *addr, size_t cnt)); -void outsl __P((u_int port, void *addr, size_t cnt)); -void outsw __P((u_int port, void *addr, size_t cnt)); -void outw __P((u_int port, u_short data)); -u_int rcr2 __P((void)); -u_int64_t rdmsr __P((u_int msr)); -u_int64_t rdpmc __P((u_int pmc)); -u_int64_t rdtsc __P((void)); -u_int read_eflags __P((void)); -void wbinvd __P((void)); -void write_eflags __P((u_int ef)); -void wrmsr __P((u_int msr, u_int64_t newval)); -u_int rfs __P((void)); -u_int rgs __P((void)); -void load_fs __P((u_int sel)); -void load_gs __P((u_int sel)); +int breakpoint (void); +u_int bsfl (u_int mask); +u_int bsrl (u_int mask); +void cpu_disable_intr (void); +void do_cpuid (u_int ax, u_int *p); +void cpu_enable_intr (void); +u_char inb (u_int port); +u_int inl (u_int port); +void insb (u_int port, void *addr, size_t cnt); +void insl (u_int port, void *addr, size_t cnt); +void insw (u_int port, void *addr, size_t cnt); +void invd (void); +void invlpg (u_int addr); +void invltlb (void); +u_short inw (u_int port); +u_int loadandclear (u_int *addr); +void outb (u_int port, u_char data); +void outl (u_int port, u_int data); +void outsb (u_int port, void *addr, size_t cnt); +void outsl (u_int port, void *addr, size_t cnt); +void outsw (u_int port, void *addr, size_t cnt); +void outw (u_int port, u_short data); +u_int rcr2 (void); +u_int64_t rdmsr (u_int msr); +u_int64_t rdpmc (u_int pmc); +u_int64_t rdtsc (void); +u_int read_eflags (void); +void wbinvd (void); +void write_eflags (u_int ef); +void wrmsr (u_int msr, u_int64_t newval); +u_int rfs (void); +u_int rgs (void); +void load_fs (u_int sel); +void load_gs (u_int sel); #endif /* __GNUC__ */ -void load_cr0 __P((u_int cr0)); -void load_cr3 __P((u_int cr3)); -void load_cr4 __P((u_int cr4)); -void ltr __P((u_short sel)); -u_int rcr0 __P((void)); -u_int rcr3 __P((void)); -u_int rcr4 __P((void)); -void reset_dbregs __P((void)); +void load_cr0 (u_int cr0); +void load_cr3 (u_int cr3); +void load_cr4 (u_int cr4); +void ltr (u_short sel); +u_int rcr0 (void); +u_int rcr3 (void); +u_int rcr4 (void); +void reset_dbregs (void); __END_DECLS #endif /* !_MACHINE_CPUFUNC_H_ */ diff --git a/sys/i386/include/dvcfg.h b/sys/i386/include/dvcfg.h index 93bbf91c69..cc557a20b7 100644 --- a/sys/i386/include/dvcfg.h +++ b/sys/i386/include/dvcfg.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/i386/include/dvcfg.h,v 1.2.6.1 2000/08/03 01:01:19 peter Exp $ */ -/* $DragonFly: src/sys/i386/include/Attic/dvcfg.h,v 1.3 2003/06/28 04:16:03 dillon Exp $ */ +/* $DragonFly: src/sys/i386/include/Attic/dvcfg.h,v 1.4 2003/08/26 21:42:18 rob Exp $ */ /* $NetBSD$ */ /* * [NetBSD for NEC PC98 series] @@ -51,7 +51,7 @@ struct dvcfg_hwsel { #define DVCFG_HWSEL_SZ(array) (sizeof(array) / sizeof(dvcfg_hw_t)) -static __inline dvcfg_hw_t dvcfg_hw __P((struct dvcfg_hwsel *, u_int)); +static __inline dvcfg_hw_t dvcfg_hw (struct dvcfg_hwsel *, u_int); static __inline dvcfg_hw_t dvcfg_hw(selp, num) diff --git a/sys/i386/include/endian.h b/sys/i386/include/endian.h index c3e93ad279..41fdce1a63 100644 --- a/sys/i386/include/endian.h +++ b/sys/i386/include/endian.h @@ -32,7 +32,7 @@ * * from: @(#)endian.h 7.8 (Berkeley) 4/3/91 * $FreeBSD: src/sys/i386/include/endian.h,v 1.18 1999/12/29 04:33:01 peter Exp $ - * $DragonFly: src/sys/i386/include/Attic/endian.h,v 1.2 2003/06/17 04:28:35 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/endian.h,v 1.3 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -61,10 +61,10 @@ #endif __BEGIN_DECLS -unsigned long htonl __P((unsigned long)); -unsigned short htons __P((unsigned short)); -unsigned long ntohl __P((unsigned long)); -unsigned short ntohs __P((unsigned short)); +unsigned long htonl (unsigned long); +unsigned short htons (unsigned short); +unsigned long ntohl (unsigned long); +unsigned short ntohs (unsigned short); __END_DECLS #define __word_swap_long(x) \ diff --git a/sys/i386/include/frame.h b/sys/i386/include/frame.h index 55d2519594..77f24b12f9 100644 --- a/sys/i386/include/frame.h +++ b/sys/i386/include/frame.h @@ -35,7 +35,7 @@ * * from: @(#)frame.h 5.2 (Berkeley) 1/18/91 * $FreeBSD: src/sys/i386/include/frame.h,v 1.20 1999/09/29 15:06:22 marcel Exp $ - * $DragonFly: src/sys/i386/include/Attic/frame.h,v 1.2 2003/06/17 04:28:35 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/frame.h,v 1.3 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_FRAME_H_ @@ -156,8 +156,8 @@ struct clockframe { int cf_ss; }; -int kdb_trap __P((int, int, struct trapframe *)); -extern int (*pmath_emulate) __P((struct trapframe *)); +int kdb_trap (int, int, struct trapframe *); +extern int (*pmath_emulate) (struct trapframe *); #define INTR_TO_TRAPFRAME(frame) ((struct trapframe *)&(frame)->if_fs) diff --git a/sys/i386/include/in_cksum.h b/sys/i386/include/in_cksum.h index f543e95a34..bdf5779456 100644 --- a/sys/i386/include/in_cksum.h +++ b/sys/i386/include/in_cksum.h @@ -34,7 +34,7 @@ * from: @(#)in_cksum.c 1.3 (Berkeley) 1/19/91 * from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp * $FreeBSD: src/sys/i386/include/in_cksum.h,v 1.7.2.2 2002/07/02 04:03:04 jdp Exp $ - * $DragonFly: src/sys/i386/include/Attic/in_cksum.h,v 1.3 2003/07/26 19:07:48 rob Exp $ + * $DragonFly: src/sys/i386/include/Attic/in_cksum.h,v 1.4 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_IN_CKSUM_H_ @@ -110,7 +110,7 @@ in_pseudo(u_int sum, u_int b, u_int c) } #else -u_int in_cksum_hdr __P((const struct ip *)); +u_int in_cksum_hdr (const struct ip *); #define in_cksum_update(ip) \ do { \ int __tmpsum; \ diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h index bc9f3a1a7b..94f9020f10 100644 --- a/sys/i386/include/md_var.h +++ b/sys/i386/include/md_var.h @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/md_var.h,v 1.35.2.4 2003/01/22 20:14:53 jhb Exp $ - * $DragonFly: src/sys/i386/include/Attic/md_var.h,v 1.9 2003/07/23 02:30:18 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/md_var.h,v 1.10 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -39,12 +39,12 @@ extern int Maxmem; extern u_int atdevbase; /* offset in virtual memory of ISA io mem */ -extern void (*bcopy_vector) __P((const void *from, void *to, size_t len)); +extern void (*bcopy_vector) (const void *from, void *to, size_t len); extern int busdma_swi_pending; -extern int (*copyin_vector) __P((const void *udaddr, void *kaddr, - size_t len)); -extern int (*copyout_vector) __P((const void *kaddr, void *udaddr, - size_t len)); +extern int (*copyin_vector) (const void *udaddr, void *kaddr, + size_t len); +extern int (*copyout_vector) (const void *kaddr, void *udaddr, + size_t len); extern u_int cpu_exthigh; extern u_int cpu_feature; extern u_int cpu_fxsr; @@ -59,11 +59,11 @@ extern int need_pre_dma_flush; extern int need_post_dma_flush; #endif extern int nfs_diskless_valid; -extern void (*ovbcopy_vector) __P((const void *from, void *to, size_t len)); +extern void (*ovbcopy_vector) (const void *from, void *to, size_t len); extern char sigcode[]; extern int szsigcode, szosigcode; -typedef void alias_for_inthand_t __P((u_int cs, u_int ef, u_int esp, u_int ss)); +typedef void alias_for_inthand_t (u_int cs, u_int ef, u_int esp, u_int ss); struct proc; struct reg; struct fpreg; @@ -71,46 +71,46 @@ struct dbreg; struct mdglobaldata; struct thread; -void bcopyb __P((const void *from, void *to, size_t len)); -void busdma_swi __P((void)); -void cpu_gdinit __P((struct mdglobaldata *gd, int cpu)); -void cpu_halt __P((void)); -void cpu_idle __P((void)); -void cpu_reset __P((void)); -void cpu_setregs __P((void)); -void cpu_switch_load_gs __P((void)) __asm(__STRING(cpu_switch_load_gs)); -void cpu_heavy_restore __P((void)); /* cannot be called from C */ -void cpu_lwkt_restore __P((void)); /* cannot be called from C */ -void cpu_idle_restore __P((void)); /* cannot be called from C */ -void cpu_kthread_restore __P((void));/* cannot be called from C */ -void cpu_exit_idleptd __P((void)); /* disassociate proc MMU */ -void cpu_exit_switch __P((struct thread *next)); -void doreti_iret __P((void)) __asm(__STRING(doreti_iret)); -void doreti_iret_fault __P((void)) __asm(__STRING(doreti_iret_fault)); -void doreti_popl_ds __P((void)) __asm(__STRING(doreti_popl_ds)); -void doreti_popl_ds_fault __P((void)) __asm(__STRING(doreti_popl_ds_fault)); -void doreti_popl_es __P((void)) __asm(__STRING(doreti_popl_es)); -void doreti_popl_es_fault __P((void)) __asm(__STRING(doreti_popl_es_fault)); -void doreti_popl_fs __P((void)) __asm(__STRING(doreti_popl_fs)); -void doreti_popl_fs_fault __P((void)) __asm(__STRING(doreti_popl_fs_fault)); -void enable_sse __P((void)); -int fill_fpregs __P((struct proc *, struct fpreg *)); -int fill_regs __P((struct proc *p, struct reg *regs)); -int fill_dbregs __P((struct proc *p, struct dbreg *dbregs)); -void fillw __P((int /*u_short*/ pat, void *base, size_t cnt)); -void i486_bzero __P((volatile void *buf, size_t len)); -void i586_bzero __P((volatile void *buf, size_t len)); -void i586_bcopy __P((const void *from, void *to, size_t len)); -int i586_copyin __P((const void *udaddr, void *kaddr, size_t len)); -int i586_copyout __P((const void *kaddr, void *udaddr, size_t len)); -void i686_pagezero __P((void *addr)); +void bcopyb (const void *from, void *to, size_t len); +void busdma_swi (void); +void cpu_gdinit (struct mdglobaldata *gd, int cpu); +void cpu_halt (void); +void cpu_idle (void); +void cpu_reset (void); +void cpu_setregs (void); +void cpu_switch_load_gs (void) __asm(__STRING(cpu_switch_load_gs)); +void cpu_heavy_restore (void); /* cannot be called from C */ +void cpu_lwkt_restore (void); /* cannot be called from C */ +void cpu_idle_restore (void); /* cannot be called from C */ +void cpu_kthread_restore (void);/* cannot be called from C */ +void cpu_exit_idleptd (void); /* disassociate proc MMU */ +void cpu_exit_switch (struct thread *next); +void doreti_iret (void) __asm(__STRING(doreti_iret)); +void doreti_iret_fault (void) __asm(__STRING(doreti_iret_fault)); +void doreti_popl_ds (void) __asm(__STRING(doreti_popl_ds)); +void doreti_popl_ds_fault (void) __asm(__STRING(doreti_popl_ds_fault)); +void doreti_popl_es (void) __asm(__STRING(doreti_popl_es)); +void doreti_popl_es_fault (void) __asm(__STRING(doreti_popl_es_fault)); +void doreti_popl_fs (void) __asm(__STRING(doreti_popl_fs)); +void doreti_popl_fs_fault (void) __asm(__STRING(doreti_popl_fs_fault)); +void enable_sse (void); +int fill_fpregs (struct proc *, struct fpreg *); +int fill_regs (struct proc *p, struct reg *regs); +int fill_dbregs (struct proc *p, struct dbreg *dbregs); +void fillw (int /*u_short*/ pat, void *base, size_t cnt); +void i486_bzero (volatile void *buf, size_t len); +void i586_bzero (volatile void *buf, size_t len); +void i586_bcopy (const void *from, void *to, size_t len); +int i586_copyin (const void *udaddr, void *kaddr, size_t len); +int i586_copyout (const void *kaddr, void *udaddr, size_t len); +void i686_pagezero (void *addr); void init_AMD_Elan_sc520(void); -int is_physical_memory __P((vm_offset_t addr)); -u_long kvtop __P((void *addr)); -void setidt __P((int idx, alias_for_inthand_t *func, int typ, int dpl, - int selec)); -void userconfig __P((void)); -int user_dbreg_trap __P((void)); -int vm_page_zero_idle __P((void)); +int is_physical_memory (vm_offset_t addr); +u_long kvtop (void *addr); +void setidt (int idx, alias_for_inthand_t *func, int typ, int dpl, + int selec); +void userconfig (void); +int user_dbreg_trap (void); +int vm_page_zero_idle (void); #endif /* !_MACHINE_MD_VAR_H_ */ diff --git a/sys/i386/include/npx.h b/sys/i386/include/npx.h index e202891ae9..a5474e4025 100644 --- a/sys/i386/include/npx.h +++ b/sys/i386/include/npx.h @@ -35,7 +35,7 @@ * * from: @(#)npx.h 5.3 (Berkeley) 1/18/91 * $FreeBSD: src/sys/i386/include/npx.h,v 1.18.2.1 2001/08/15 01:23:52 peter Exp $ - * $DragonFly: src/sys/i386/include/Attic/npx.h,v 1.5 2003/06/28 04:16:03 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/npx.h,v 1.6 2003/08/26 21:42:18 rob Exp $ */ /* @@ -143,10 +143,10 @@ union savefpu { #ifdef _KERNEL -int npxdna __P((void)); -void npxexit __P((struct proc *p)); -void npxinit __P((int control)); -void npxsave __P((union savefpu *addr)); +int npxdna (void); +void npxexit (struct proc *p); +void npxinit (int control); +void npxsave (union savefpu *addr); #endif #endif /* !_MACHINE_NPX_H_ */ diff --git a/sys/i386/include/pcb.h b/sys/i386/include/pcb.h index e2df507ddf..1504e719a1 100644 --- a/sys/i386/include/pcb.h +++ b/sys/i386/include/pcb.h @@ -35,7 +35,7 @@ * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 * $FreeBSD: src/sys/i386/include/pcb.h,v 1.32.2.1 2001/08/15 01:23:52 peter Exp $ - * $DragonFly: src/sys/i386/include/Attic/pcb.h,v 1.6 2003/08/07 21:17:22 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/pcb.h,v 1.7 2003/08/26 21:42:18 rob Exp $ */ #ifndef _I386_PCB_H_ @@ -86,7 +86,7 @@ struct pcb { #ifdef _KERNEL -void savectx __P((struct pcb *)); +void savectx (struct pcb *); #endif #endif /* _I386_PCB_H_ */ diff --git a/sys/i386/include/pcb_ext.h b/sys/i386/include/pcb_ext.h index d2d1fb4e8d..5e33c2e682 100644 --- a/sys/i386/include/pcb_ext.h +++ b/sys/i386/include/pcb_ext.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/pcb_ext.h,v 1.4 1999/12/29 04:33:04 peter Exp $ - * $DragonFly: src/sys/i386/include/Attic/pcb_ext.h,v 1.3 2003/08/07 21:17:22 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/pcb_ext.h,v 1.4 2003/08/26 21:42:18 rob Exp $ */ #ifndef _I386_PCB_EXT_H_ @@ -55,9 +55,9 @@ struct pcb_ldt { #ifdef _KERNEL #ifdef USER_LDT -void set_user_ldt __P((struct pcb *)); -struct pcb_ldt *user_ldt_alloc __P((struct pcb *, int)); -void user_ldt_free __P((struct pcb *)); +void set_user_ldt (struct pcb *); +struct pcb_ldt *user_ldt_alloc (struct pcb *, int); +void user_ldt_free (struct pcb *); #endif #endif diff --git a/sys/i386/include/perfmon.h b/sys/i386/include/perfmon.h index 8e2562d53b..2d9e1d2769 100644 --- a/sys/i386/include/perfmon.h +++ b/sys/i386/include/perfmon.h @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/perfmon.h,v 1.7 1999/12/29 04:33:04 peter Exp $ - * $DragonFly: src/sys/i386/include/Attic/perfmon.h,v 1.2 2003/06/17 04:28:36 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/perfmon.h,v 1.3 2003/08/26 21:42:18 rob Exp $ */ /* @@ -103,15 +103,15 @@ struct pmc_tstamp { /* * Intra-kernel interface to performance monitoring counters */ -void perfmon_init __P((void)); -int perfmon_avail __P((void)); -int perfmon_setup __P((int, unsigned int)); -int perfmon_get __P((int, unsigned int *)); -int perfmon_fini __P((int)); -int perfmon_start __P((int)); -int perfmon_stop __P((int)); -int perfmon_read __P((int, quad_t *)); -int perfmon_reset __P((int)); +void perfmon_init (void); +int perfmon_avail (void); +int perfmon_setup (int, unsigned int); +int perfmon_get (int, unsigned int *); +int perfmon_fini (int); +int perfmon_start (int); +int perfmon_stop (int); +int perfmon_read (int, quad_t *); +int perfmon_reset (int); #endif /* _KERNEL */ diff --git a/sys/i386/include/physio_proc.h b/sys/i386/include/physio_proc.h index c2770b19be..8e859b6385 100644 --- a/sys/i386/include/physio_proc.h +++ b/sys/i386/include/physio_proc.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/i386/include/physio_proc.h,v 1.1.2.1 2000/10/29 11:05:48 non Exp $ */ -/* $DragonFly: src/sys/i386/include/Attic/physio_proc.h,v 1.3 2003/06/28 04:16:03 dillon Exp $ */ +/* $DragonFly: src/sys/i386/include/Attic/physio_proc.h,v 1.4 2003/08/26 21:42:18 rob Exp $ */ /* $NecBSD: physio_proc.h,v 3.4 1999/07/23 20:47:03 honda Exp $ */ /* $NetBSD$ */ @@ -46,8 +46,8 @@ struct physio_proc { struct proc *pp_proc; }; -static __inline struct physio_proc *physio_proc_enter __P((struct buf *)); -static __inline void physio_proc_leave __P((struct physio_proc *)); +static __inline struct physio_proc *physio_proc_enter (struct buf *); +static __inline void physio_proc_leave (struct physio_proc *); static __inline struct physio_proc * physio_proc_enter(bp) @@ -87,5 +87,5 @@ physio_proc_leave(pp) splx(s); } -void physio_proc_init __P((void)); +void physio_proc_init (void); #endif /* _MACHINE_PHYSIO_PROC_H_ */ diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h index 0aa2c75f16..cb906cfc64 100644 --- a/sys/i386/include/pmap.h +++ b/sys/i386/include/pmap.h @@ -43,7 +43,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * $FreeBSD: src/sys/i386/include/pmap.h,v 1.65.2.3 2001/10/03 07:15:37 peter Exp $ - * $DragonFly: src/sys/i386/include/Attic/pmap.h,v 1.3 2003/06/28 02:09:49 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/pmap.h,v 1.4 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -252,14 +252,14 @@ extern char *ptvmmap; /* poor name! */ extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; -void pmap_bootstrap __P(( vm_offset_t, vm_offset_t)); -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_bootstrap ( vm_offset_t, vm_offset_t); +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); #ifdef SMP -void pmap_set_opt __P((void)); +void pmap_set_opt (void); #endif #endif /* _KERNEL */ diff --git a/sys/i386/include/profile.h b/sys/i386/include/profile.h index 3b6423f51c..8246dffe81 100644 --- a/sys/i386/include/profile.h +++ b/sys/i386/include/profile.h @@ -32,7 +32,7 @@ * * @(#)profile.h 8.1 (Berkeley) 6/11/93 * $FreeBSD: src/sys/i386/include/profile.h,v 1.20 1999/12/29 04:33:05 peter Exp $ - * $DragonFly: src/sys/i386/include/Attic/profile.h,v 1.3 2003/07/20 04:20:32 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/profile.h,v 1.4 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_PROFILE_H_ @@ -116,15 +116,15 @@ typedef u_int fptrdiff_t; #ifdef _KERNEL -void mcount __P((uintfptr_t frompc, uintfptr_t selfpc)); +void mcount (uintfptr_t frompc, uintfptr_t selfpc); #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) @@ -137,12 +137,12 @@ void stopguprof __P((struct gmonparam *p)); __BEGIN_DECLS #ifdef __GNUC__ #ifdef __ELF__ -void mcount __P((void)) __asm(".mcount"); +void mcount (void) __asm(".mcount"); #else -void mcount __P((void)) __asm("mcount"); +void mcount (void) __asm("mcount"); #endif #endif -static void _mcount __P((uintfptr_t frompc, uintfptr_t selfpc)); +static void _mcount (uintfptr_t frompc, uintfptr_t selfpc); __END_DECLS #endif /* _KERNEL */ @@ -152,11 +152,11 @@ __END_DECLS extern int cputime_bias; __BEGIN_DECLS -int cputime __P((void)); -void empty_loop __P((void)); -void mexitcount __P((uintfptr_t selfpc)); -void nullfunc __P((void)); -void nullfunc_loop __P((void)); +int cputime (void); +void empty_loop (void); +void mexitcount (uintfptr_t selfpc); +void nullfunc (void); +void nullfunc_loop (void); __END_DECLS #endif diff --git a/sys/i386/include/ptrace.h b/sys/i386/include/ptrace.h index 6eacd67230..e7fa616fbd 100644 --- a/sys/i386/include/ptrace.h +++ b/sys/i386/include/ptrace.h @@ -32,7 +32,7 @@ * * @(#)ptrace.h 8.1 (Berkeley) 6/11/93 * $FreeBSD: src/sys/i386/include/ptrace.h,v 1.9 1999/12/29 04:33:06 peter Exp $ - * $DragonFly: src/sys/i386/include/Attic/ptrace.h,v 1.2 2003/06/17 04:28:36 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/ptrace.h,v 1.3 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_PTRACE_H_ @@ -49,7 +49,7 @@ #define PT_SETDBREGS (PT_FIRSTMACH + 6) #ifdef _KERNEL -int ptrace_read_u_check __P((struct proc *p, vm_offset_t off, size_t len)); +int ptrace_read_u_check (struct proc *p, vm_offset_t off, size_t len); #endif #endif diff --git a/sys/i386/include/reg.h b/sys/i386/include/reg.h index 887ba5f7d8..9be8d5ff82 100644 --- a/sys/i386/include/reg.h +++ b/sys/i386/include/reg.h @@ -35,7 +35,7 @@ * * from: @(#)reg.h 5.5 (Berkeley) 1/18/91 * $FreeBSD: src/sys/i386/include/reg.h,v 1.22.2.2 2002/11/07 22:47:55 alfred Exp $ - * $DragonFly: src/sys/i386/include/Attic/reg.h,v 1.2 2003/06/17 04:28:36 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/reg.h,v 1.3 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_REG_H_ @@ -144,10 +144,10 @@ struct dbreg { /* * XXX these interfaces are MI, so they should be declared in a MI place. */ -int set_fpregs __P((struct proc *, struct fpreg *)); -int set_regs __P((struct proc *p, struct reg *regs)); -void setregs __P((struct proc *, u_long, u_long, u_long)); -int set_dbregs __P((struct proc *p, struct dbreg *dbregs)); +int set_fpregs (struct proc *, struct fpreg *); +int set_regs (struct proc *p, struct reg *regs); +void setregs (struct proc *, u_long, u_long, u_long); +int set_dbregs (struct proc *p, struct dbreg *dbregs); #endif #endif /* !_MACHINE_REG_H_ */ diff --git a/sys/i386/include/segments.h b/sys/i386/include/segments.h index 39724b2afe..e08ada6188 100644 --- a/sys/i386/include/segments.h +++ b/sys/i386/include/segments.h @@ -36,7 +36,7 @@ * * from: @(#)segments.h 7.1 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/include/segments.h,v 1.24 1999/12/29 04:33:07 peter Exp $ - * $DragonFly: src/sys/i386/include/Attic/segments.h,v 1.5 2003/07/24 01:41:24 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/segments.h,v 1.6 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_SEGMENTS_H_ @@ -248,13 +248,13 @@ extern struct soft_segment_descriptor gdt_segs[]; extern struct gate_descriptor *idt; extern union descriptor ldt[NLDT]; -void lgdt __P((struct region_descriptor *rdp)); -void lidt __P((struct region_descriptor *rdp)); -void lldt __P((u_short sel)); -void sdtossd __P((struct segment_descriptor *sdp, - struct soft_segment_descriptor *ssdp)); -void ssdtosd __P((struct soft_segment_descriptor *ssdp, - struct segment_descriptor *sdp)); +void lgdt (struct region_descriptor *rdp); +void lidt (struct region_descriptor *rdp); +void lldt (u_short sel); +void sdtossd (struct segment_descriptor *sdp, + struct soft_segment_descriptor *ssdp); +void ssdtosd (struct soft_segment_descriptor *ssdp, + struct segment_descriptor *sdp); #endif /* _KERNEL */ #endif /* !_MACHINE_SEGMENTS_H_ */ diff --git a/sys/i386/include/smp.h b/sys/i386/include/smp.h index 5e2677e1fa..b2dce5bccd 100644 --- a/sys/i386/include/smp.h +++ b/sys/i386/include/smp.h @@ -7,7 +7,7 @@ * ---------------------------------------------------------------------------- * * $FreeBSD: src/sys/i386/include/smp.h,v 1.50.2.5 2001/02/13 22:32:45 tegge Exp $ - * $DragonFly: src/sys/i386/include/Attic/smp.h,v 1.6 2003/08/07 21:17:22 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/smp.h,v 1.7 2003/08/26 21:42:18 rob Exp $ * */ @@ -45,19 +45,19 @@ extern int current_postcode; /** XXX currently in mp_machdep.c */ extern int bootMP_size; /* functions in mpboot.s */ -void bootMP __P((void)); +void bootMP (void); /* global data in apic_vector.s */ extern volatile u_int stopped_cpus; extern volatile u_int started_cpus; extern volatile u_int checkstate_probed_cpus; -extern void (*cpustop_restartfunc) __P((void)); +extern void (*cpustop_restartfunc) (void); /* functions in apic_ipl.s */ -void apic_eoi __P((void)); -u_int io_apic_read __P((int, int)); -void io_apic_write __P((int, int, u_int)); +void apic_eoi (void); +u_int io_apic_read (int, int); +void io_apic_write (int, int, u_int); /* global data in mp_machdep.c */ extern int bsp_apic_ready; @@ -85,70 +85,70 @@ extern u_int all_cpus; extern struct pcb stoppcbs[]; /* functions in mp_machdep.c */ -u_int mp_bootaddress __P((u_int)); -int mp_probe __P((void)); -void mp_start __P((void)); -void mp_announce __P((void)); -u_int isa_apic_mask __P((u_int)); -int isa_apic_irq __P((int)); -int pci_apic_irq __P((int, int, int)); -int apic_irq __P((int, int)); -int next_apic_irq __P((int)); -int undirect_isa_irq __P((int)); -int undirect_pci_irq __P((int)); -int apic_bus_type __P((int)); -int apic_src_bus_id __P((int, int)); -int apic_src_bus_irq __P((int, int)); -int apic_int_type __P((int, int)); -int apic_trigger __P((int, int)); -int apic_polarity __P((int, int)); -void assign_apic_irq __P((int apic, int intpin, int irq)); -void revoke_apic_irq __P((int irq)); -void bsp_apic_configure __P((void)); -void init_secondary __P((void)); -int stop_cpus __P((u_int)); -void ap_init __P((void)); -int restart_cpus __P((u_int)); +u_int mp_bootaddress (u_int); +int mp_probe (void); +void mp_start (void); +void mp_announce (void); +u_int isa_apic_mask (u_int); +int isa_apic_irq (int); +int pci_apic_irq (int, int, int); +int apic_irq (int, int); +int next_apic_irq (int); +int undirect_isa_irq (int); +int undirect_pci_irq (int); +int apic_bus_type (int); +int apic_src_bus_id (int, int); +int apic_src_bus_irq (int, int); +int apic_int_type (int, int); +int apic_trigger (int, int); +int apic_polarity (int, int); +void assign_apic_irq (int apic, int intpin, int irq); +void revoke_apic_irq (int irq); +void bsp_apic_configure (void); +void init_secondary (void); +int stop_cpus (u_int); +void ap_init (void); +int restart_cpus (u_int); #ifdef BETTER_CLOCK -void forward_statclock __P((int pscnt)); -void forward_hardclock __P((int pscnt)); +void forward_statclock (int pscnt); +void forward_hardclock (int pscnt); #endif /* BETTER_CLOCK */ -void forward_signal __P((struct proc *)); -void forward_roundrobin __P((void)); +void forward_signal (struct proc *); +void forward_roundrobin (void); #ifdef APIC_INTR_REORDER -void set_lapic_isrloc __P((int, int)); +void set_lapic_isrloc (int, int); #endif /* APIC_INTR_REORDER */ -void smp_rendezvous_action __P((void)); -void smp_rendezvous __P((void (*)(void *), +void smp_rendezvous_action (void); +void smp_rendezvous (void (*)(void *), void (*)(void *), void (*)(void *), - void *arg)); + void *arg); /* global data in mpapic.c */ extern volatile lapic_t lapic; extern volatile ioapic_t **ioapic; /* functions in mpapic.c */ -void apic_dump __P((char*)); -void apic_initialize __P((void)); -void imen_dump __P((void)); -int apic_ipi __P((int, int, int)); -int selected_apic_ipi __P((u_int, int, int)); -int io_apic_setup __P((int)); -void io_apic_setup_intpin __P((int, int)); -void io_apic_set_id __P((int, int)); -int io_apic_get_id __P((int)); -int ext_int_setup __P((int, int)); +void apic_dump (char*); +void apic_initialize (void); +void imen_dump (void); +int apic_ipi (int, int, int); +int selected_apic_ipi (u_int, int, int); +int io_apic_setup (int); +void io_apic_setup_intpin (int, int); +void io_apic_set_id (int, int); +int io_apic_get_id (int); +int ext_int_setup (int, int); #if defined(READY) -void clr_io_apic_mask24 __P((int, u_int32_t)); -void set_io_apic_mask24 __P((int, u_int32_t)); +void clr_io_apic_mask24 (int, u_int32_t); +void set_io_apic_mask24 (int, u_int32_t); #endif /* READY */ -void set_apic_timer __P((int)); -int read_apic_timer __P((void)); -void u_sleep __P((int)); -void cpu_send_ipiq __P((int)); +void set_apic_timer (int); +int read_apic_timer (void); +void u_sleep (int); +void cpu_send_ipiq (int); /* global data in init_smp.c */ extern int invltlb_ok; diff --git a/sys/i386/include/sysarch.h b/sys/i386/include/sysarch.h index fd8f9de994..a74b82a413 100644 --- a/sys/i386/include/sysarch.h +++ b/sys/i386/include/sysarch.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/sysarch.h,v 1.13.2.2 2002/10/07 17:17:28 jhb Exp $ - * $DragonFly: src/sys/i386/include/Attic/sysarch.h,v 1.2 2003/06/17 04:28:36 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/sysarch.h,v 1.3 2003/08/26 21:42:18 rob Exp $ */ /* @@ -72,14 +72,14 @@ union descriptor; struct dbreg; __BEGIN_DECLS -int i386_get_ldt __P((int, union descriptor *, int)); -int i386_set_ldt __P((int, union descriptor *, int)); -int i386_get_ioperm __P((unsigned int, unsigned int *, int *)); -int i386_set_ioperm __P((unsigned int, unsigned int, int)); -int i386_vm86 __P((int, void *)); -int i386_set_watch __P((int watchnum, unsigned int watchaddr, int size, - int access, struct dbreg * d)); -int i386_clr_watch __P((int watchnum, struct dbreg * d)); +int i386_get_ldt (int, union descriptor *, int); +int i386_set_ldt (int, union descriptor *, int); +int i386_get_ioperm (unsigned int, unsigned int *, int *); +int i386_set_ioperm (unsigned int, unsigned int, int); +int i386_vm86 (int, void *); +int i386_set_watch (int watchnum, unsigned int watchaddr, int size, + int access, struct dbreg * d); +int i386_clr_watch (int watchnum, struct dbreg * d); __END_DECLS #endif diff --git a/sys/i386/include/vm86.h b/sys/i386/include/vm86.h index f500a338e4..55f0de4630 100644 --- a/sys/i386/include/vm86.h +++ b/sys/i386/include/vm86.h @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/vm86.h,v 1.13 1999/09/02 20:59:50 luoqi Exp $ - * $DragonFly: src/sys/i386/include/Attic/vm86.h,v 1.2 2003/06/17 04:28:36 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/vm86.h,v 1.3 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_VM86_H_ @@ -149,17 +149,17 @@ extern int in_vm86call; extern int vm86paddr; struct proc; -extern int vm86_emulate __P((struct vm86frame *)); -extern int vm86_sysarch __P((struct proc *, char *)); -extern void vm86_trap __P((struct vm86frame *)); -extern int vm86_intcall __P((int, struct vm86frame *)); -extern int vm86_datacall __P((int, struct vm86frame *, struct vm86context *)); -extern void vm86_initialize __P((void)); -extern vm_offset_t vm86_getpage __P((struct vm86context *, int)); -extern vm_offset_t vm86_addpage __P((struct vm86context *, int, vm_offset_t)); -extern int vm86_getptr __P((struct vm86context *, vm_offset_t, - u_short *, u_short *)); - -extern vm_offset_t vm86_getaddr __P((struct vm86context *, u_short, u_short)); +extern int vm86_emulate (struct vm86frame *); +extern int vm86_sysarch (struct proc *, char *); +extern void vm86_trap (struct vm86frame *); +extern int vm86_intcall (int, struct vm86frame *); +extern int vm86_datacall (int, struct vm86frame *, struct vm86context *); +extern void vm86_initialize (void); +extern vm_offset_t vm86_getpage (struct vm86context *, int); +extern vm_offset_t vm86_addpage (struct vm86context *, int, vm_offset_t); +extern int vm86_getptr (struct vm86context *, vm_offset_t, + u_short *, u_short *); + +extern vm_offset_t vm86_getaddr (struct vm86context *, u_short, u_short); #endif /* _MACHINE_VM86_H_ */ diff --git a/sys/i386/isa/ccbque.h b/sys/i386/isa/ccbque.h index 7dda9860b9..5a0a245374 100644 --- a/sys/i386/isa/ccbque.h +++ b/sys/i386/isa/ccbque.h @@ -28,7 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/ccbque.h,v 1.3.6.2 2000/10/21 07:44:24 nyan Exp $ - * $DragonFly: src/sys/i386/isa/Attic/ccbque.h,v 1.3 2003/07/26 19:07:48 rob Exp $ + * $DragonFly: src/sys/i386/isa/Attic/ccbque.h,v 1.4 2003/08/26 21:42:19 rob Exp $ */ /* * Common command control queue funcs. @@ -50,9 +50,9 @@ struct CCBTYPE##que { \ u_int flags; \ }; \ \ -void DEV##_init_ccbque __P((int)); \ -struct CCBTYPE *DEV##_get_ccb __P((void)); \ -void DEV##_free_ccb __P((struct CCBTYPE *)); +void DEV##_init_ccbque (int); \ +struct CCBTYPE *DEV##_get_ccb (void); \ +void DEV##_free_ccb (struct CCBTYPE *); /* (II) static allocated memory */ #define GENERIC_CCB_STATIC_ALLOC(DEV, CCBTYPE) \ diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index 68acd96baa..134c509397 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -35,7 +35,7 @@ * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 * $FreeBSD: src/sys/i386/isa/clock.c,v 1.149.2.6 2002/11/02 04:41:50 iwasaki Exp $ - * $DragonFly: src/sys/i386/isa/Attic/clock.c,v 1.5 2003/08/07 21:17:23 dillon Exp $ + * $DragonFly: src/sys/i386/isa/Attic/clock.c,v 1.6 2003/08/26 21:42:19 rob Exp $ */ /* @@ -95,8 +95,8 @@ #include /* The interrupt triggered by the 8254 (timer) chip */ int apic_8254_intr; -static u_long read_intr_count __P((int vec)); -static void setup_8254_mixed_mode __P((void)); +static u_long read_intr_count (int vec); +static void setup_8254_mixed_mode (void); #endif /* @@ -152,7 +152,7 @@ static int i8254_ticked; * timer0_state == 0 case. We should use inthand_add()/inthand_remove() * to switch between clkintr() and a slightly different timerintr(). */ -static void (*new_function) __P((struct clockframe *frame)); +static void (*new_function) (struct clockframe *frame); static u_int new_rate; static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; static u_char rtc_statusb = RTCSB_24HR | RTCSB_PINTR; @@ -166,11 +166,11 @@ static u_int timer0_prescaler_count; static u_char timer0_state; static u_char timer2_state; -static void (*timer_func) __P((struct clockframe *frame)) = hardclock; +static void (*timer_func) (struct clockframe *frame) = hardclock; static u_int tsc_present; -static unsigned i8254_get_timecount __P((struct timecounter *tc)); -static unsigned tsc_get_timecount __P((struct timecounter *tc)); +static unsigned i8254_get_timecount (struct timecounter *tc); +static unsigned tsc_get_timecount (struct timecounter *tc); static void set_timer_freq(u_int freq, int intr_freq); static struct timecounter tsc_timecounter = { @@ -270,7 +270,7 @@ clkintr(struct clockframe frame) * The acquire and release functions must be called at ipl >= splclock(). */ int -acquire_timer0(int rate, void (*function) __P((struct clockframe *frame))) +acquire_timer0(int rate, void (*function) (struct clockframe *frame)) { static int old_rate; diff --git a/sys/i386/isa/icu.h b/sys/i386/isa/icu.h index ca54dc72d7..7b94266878 100644 --- a/sys/i386/isa/icu.h +++ b/sys/i386/isa/icu.h @@ -35,7 +35,7 @@ * * from: @(#)icu.h 5.6 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/isa/icu.h,v 1.18 1999/12/26 12:43:47 bde Exp $ - * $DragonFly: src/sys/i386/isa/Attic/icu.h,v 1.3 2003/06/29 03:28:43 dillon Exp $ + * $DragonFly: src/sys/i386/isa/Attic/icu.h,v 1.4 2003/08/26 21:42:19 rob Exp $ */ /* @@ -48,8 +48,8 @@ #ifndef LOCORE -void INTREN __P((u_int)); -void INTRDIS __P((u_int)); +void INTREN (u_int); +void INTRDIS (u_int); #endif /* LOCORE */ diff --git a/sys/i386/isa/intr_machdep.h b/sys/i386/isa/intr_machdep.h index fd363d1b5b..4ed05219c8 100644 --- a/sys/i386/isa/intr_machdep.h +++ b/sys/i386/isa/intr_machdep.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/intr_machdep.h,v 1.19.2.2 2001/10/14 20:05:50 luigi Exp $ - * $DragonFly: src/sys/i386/isa/Attic/intr_machdep.h,v 1.7 2003/07/12 16:55:50 dillon Exp $ + * $DragonFly: src/sys/i386/isa/Attic/intr_machdep.h,v 1.8 2003/08/26 21:42:19 rob Exp $ */ #ifndef _I386_ISA_INTR_MACHDEP_H_ @@ -212,14 +212,14 @@ inthand_t #endif /* SMP */ void call_fast_unpend(int irq); -void isa_defaultirq __P((void)); -int isa_nmi __P((int cd)); -int icu_setup __P((int intr, inthand2_t *func, void *arg, - u_int *maskptr, int flags)); -int icu_unset __P((int intr, inthand2_t *handler)); -int update_intr_masks __P((void)); - -intrmask_t splq __P((intrmask_t mask)); +void isa_defaultirq (void); +int isa_nmi (int cd); +int icu_setup (int intr, inthand2_t *func, void *arg, + u_int *maskptr, int flags); +int icu_unset (int intr, inthand2_t *handler); +int update_intr_masks (void); + +intrmask_t splq (intrmask_t mask); #define INTR_FAST 0x00000001 /* fast interrupt handler */ #define INTR_EXCL 0x00010000 /* excl. intr, default is shared */ diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c index a21f7555e6..95ef20f35e 100644 --- a/sys/i386/isa/npx.c +++ b/sys/i386/isa/npx.c @@ -33,7 +33,7 @@ * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 * $FreeBSD: src/sys/i386/isa/npx.c,v 1.80.2.3 2001/10/20 19:04:38 tegge Exp $ - * $DragonFly: src/sys/i386/isa/Attic/npx.c,v 1.12 2003/08/07 21:17:23 dillon Exp $ + * $DragonFly: src/sys/i386/isa/Attic/npx.c,v 1.13 2003/08/26 21:42:19 rob Exp $ */ #include "opt_cpu.h" @@ -109,21 +109,21 @@ #else /* not __GNUC__ */ -void fldcw __P((caddr_t addr)); -void fnclex __P((void)); -void fninit __P((void)); -void fnop __P((void)); -void fnsave __P((caddr_t addr)); -void fnstcw __P((caddr_t addr)); -void fnstsw __P((caddr_t addr)); -void fp_divide_by_0 __P((void)); -void frstor __P((caddr_t addr)); +void fldcw (caddr_t addr); +void fnclex (void); +void fninit (void); +void fnop (void); +void fnsave (caddr_t addr); +void fnstcw (caddr_t addr); +void fnstsw (caddr_t addr); +void fp_divide_by_0 (void); +void frstor (caddr_t addr); #ifndef CPU_DISABLE_SSE -void fxsave __P((caddr_t addr)); -void fxrstor __P((caddr_t addr)); +void fxsave (caddr_t addr); +void fxrstor (caddr_t addr); #endif -void start_emulating __P((void)); -void stop_emulating __P((void)); +void start_emulating (void); +void stop_emulating (void); #endif /* __GNUC__ */ @@ -139,16 +139,16 @@ void stop_emulating __P((void)); typedef u_char bool_t; -static int npx_attach __P((device_t dev)); - void npx_intr __P((void *)); -static void npx_identify __P((driver_t *driver, device_t parent)); -static int npx_probe __P((device_t dev)); -static int npx_probe1 __P((device_t dev)); -static void fpusave __P((union savefpu *)); -static void fpurstor __P((union savefpu *)); +static int npx_attach (device_t dev); + void npx_intr (void *); +static void npx_identify (driver_t *driver, device_t parent); +static int npx_probe (device_t dev); +static int npx_probe1 (device_t dev); +static void fpusave (union savefpu *); +static void fpurstor (union savefpu *); #ifdef I586_CPU -static long timezero __P((const char *funcname, - void (*func)(volatile void *buf, size_t len))); +static long timezero (const char *funcname, + void (*func)(volatile void *buf, size_t len)); #endif /* I586_CPU */ int hw_float; /* XXX currently just alias for npx_exists */ @@ -947,7 +947,7 @@ fpurstor(addr) static long timezero(funcname, func) const char *funcname; - void (*func) __P((volatile void *buf, size_t len)); + void (*func) (volatile void *buf, size_t len); { void *buf; diff --git a/sys/kern/kern_memio.c b/sys/kern/kern_memio.c index 44b09df219..4c218b1460 100644 --- a/sys/kern/kern_memio.c +++ b/sys/kern/kern_memio.c @@ -39,7 +39,7 @@ * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/i386/mem.c,v 1.79.2.9 2003/01/04 22:58:01 njl Exp $ - * $DragonFly: src/sys/kern/kern_memio.c,v 1.8 2003/07/26 19:07:47 rob Exp $ + * $DragonFly: src/sys/kern/kern_memio.c,v 1.9 2003/08/26 21:42:18 rob Exp $ */ /* @@ -103,8 +103,8 @@ static int rand_bolt; static caddr_t zbuf; MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); -static int mem_ioctl __P((dev_t, u_long, caddr_t, int, struct thread *)); -static int random_ioctl __P((dev_t, u_long, caddr_t, int, struct thread *)); +static int mem_ioctl (dev_t, u_long, caddr_t, int, struct thread *); +static int random_ioctl (dev_t, u_long, caddr_t, int, struct thread *); struct mem_range_softc mem_range_softc; diff --git a/sys/platform/pc32/apic/mpapic.c b/sys/platform/pc32/apic/mpapic.c index 20432a3e89..46bdd1eb95 100644 --- a/sys/platform/pc32/apic/mpapic.c +++ b/sys/platform/pc32/apic/mpapic.c @@ -23,7 +23,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/mpapic.c,v 1.37.2.7 2003/01/25 02:31:47 peter Exp $ - * $DragonFly: src/sys/platform/pc32/apic/mpapic.c,v 1.6 2003/07/11 17:42:08 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/apic/mpapic.c,v 1.7 2003/08/26 21:42:18 rob Exp $ */ #include @@ -129,8 +129,8 @@ apic_dump(char* str) #define REDIRCNT_IOAPIC(A) \ ((int)((io_apic_versions[(A)] & IOART_VER_MAXREDIR) >> MAXREDIRSHIFT) + 1) -static int trigger __P((int apic, int pin, u_int32_t * flags)); -static void polarity __P((int apic, int pin, u_int32_t * flags, int level)); +static int trigger (int apic, int pin, u_int32_t * flags); +static void polarity (int apic, int pin, u_int32_t * flags, int level); #define DEFAULT_FLAGS \ ((u_int32_t) \ @@ -578,8 +578,8 @@ selected_apic_ipi(u_int target, int vector, int delivery_mode) #endif #if defined(READY) -int acquire_apic_timer __P((void)); -int release_apic_timer __P((void)); +int acquire_apic_timer (void); +int release_apic_timer (void); /* * Acquire the APIC timer for exclusive use. diff --git a/sys/platform/pc32/apm/apm.c b/sys/platform/pc32/apm/apm.c index 481f3e6e39..c3a2f349ed 100644 --- a/sys/platform/pc32/apm/apm.c +++ b/sys/platform/pc32/apm/apm.c @@ -16,7 +16,7 @@ * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * * $FreeBSD: src/sys/i386/apm/apm.c,v 1.114.2.5 2002/11/02 04:41:50 iwasaki Exp $ - * $DragonFly: src/sys/platform/pc32/apm/apm.c,v 1.5 2003/07/21 05:50:39 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/apm/apm.c,v 1.6 2003/08/26 21:42:17 rob Exp $ */ #include @@ -47,12 +47,12 @@ #include /* Used by the apm_saver screen saver module */ -int apm_display __P((int newstate)); +int apm_display (int newstate); struct apm_softc apm_softc; -static void apm_resume __P((void)); +static void apm_resume (void); static int apm_bioscall(void); -static int apm_check_function_supported __P((u_int version, u_int func)); +static int apm_check_function_supported (u_int version, u_int func); static u_long apm_version; @@ -467,7 +467,7 @@ apm_default_suspend(void *arg) return 0; } -static int apm_record_event __P((struct apm_softc *, u_int)); +static int apm_record_event (struct apm_softc *, u_int); static void apm_processevent(void); static u_int apm_op_inprog = 0; diff --git a/sys/platform/pc32/boot/dosboot/dirent.h b/sys/platform/pc32/boot/dosboot/dirent.h index 6aad83b256..ad57f717ba 100644 --- a/sys/platform/pc32/boot/dosboot/dirent.h +++ b/sys/platform/pc32/boot/dosboot/dirent.h @@ -33,7 +33,7 @@ * @(#)dirent.h 5.18 (Berkeley) 2/23/91 * * $FreeBSD: src/sys/i386/boot/dosboot/dirent.h,v 1.2 1999/12/29 04:32:50 peter Exp $ - * $DragonFly: src/sys/platform/pc32/boot/dosboot/Attic/dirent.h,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/boot/dosboot/Attic/dirent.h,v 1.3 2003/08/26 21:42:17 rob Exp $ */ #ifndef _DIRENT_H_ @@ -92,17 +92,17 @@ typedef struct _dirdesc { #include "cdefs.h" __BEGIN_DECLS -DIR *opendir __P((const char *)); -struct dirent *readdir __P((DIR *)); -void rewinddir __P((DIR *)); -int closedir __P((DIR *)); +DIR *opendir (const char *); +struct dirent *readdir (DIR *); +void rewinddir (DIR *); +int closedir (DIR *); #ifndef _POSIX_SOURCE -long telldir __P((const DIR *)); -void seekdir __P((DIR *, long)); -int scandir __P((const char *, struct dirent ***, - int (*)(struct dirent *), int (*)(const void *, const void *))); -int alphasort __P((const void *, const void *)); -int getdirentries __P((int, char *, int, long *)); +long telldir (const DIR *); +void seekdir (DIR *, long); +int scandir (const char *, struct dirent ***, + int (*)(struct dirent *), int (*)(const void *, const void *)); +int alphasort (const void *, const void *); +int getdirentries (int, char *, int, long *); #endif /* not POSIX */ __END_DECLS diff --git a/sys/platform/pc32/boot/dosboot/disklabe.h b/sys/platform/pc32/boot/dosboot/disklabe.h index 5cb977a08f..4128607706 100644 --- a/sys/platform/pc32/boot/dosboot/disklabe.h +++ b/sys/platform/pc32/boot/dosboot/disklabe.h @@ -32,7 +32,7 @@ * * @(#)disklabel.h 8.1 (Berkeley) 6/2/93 * $FreeBSD: src/sys/i386/boot/dosboot/disklabe.h,v 1.8 1999/12/29 04:32:50 peter Exp $ - * $DragonFly: src/sys/platform/pc32/boot/dosboot/Attic/disklabe.h,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/boot/dosboot/Attic/disklabe.h,v 1.3 2003/08/26 21:42:17 rob Exp $ */ #ifndef _SYS_DISKLABEL_H_ @@ -377,14 +377,14 @@ extern struct dos_partition dos_partitions[NDOSPART]; #ifdef KERNEL struct dkbad; -u_int dkcksum __P((struct disklabel *)); -int writedisklabel __P((dev_t dev, void (*strat)(), struct disklabel *lp)); -char * readdisklabel __P((dev_t dev, void (*strat)(), struct disklabel *lp, struct dos_partition *dp, struct dkbad *bdp)); -int setdisklabel __P((struct disklabel *olp, struct disklabel *nlp, u_long openmask)); -void disksort __P((struct buf *ap, struct buf *bp)); -void diskerr __P((struct buf *, char *, char *, int, int, struct disklabel *)); +u_int dkcksum (struct disklabel *); +int writedisklabel (dev_t dev, void (*strat)(), struct disklabel *lp); +char * readdisklabel (dev_t dev, void (*strat)(), struct disklabel *lp, struct dos_partition *dp, struct dkbad *bdp); +int setdisklabel (struct disklabel *olp, struct disklabel *nlp, u_long openmask); +void disksort (struct buf *ap, struct buf *bp); +void diskerr (struct buf *, char *, char *, int, int, struct disklabel *); #ifdef __i386 -char * readMBRtolabel __P(( dev_t dev , void (*strat)(), register struct disklabel *lp, struct dos_partition *dp, int *cyl)); +char * readMBRtolabel ( dev_t dev , void (*strat)(), register struct disklabel *lp, struct dos_partition *dp, int *cyl); #endif #endif @@ -393,7 +393,7 @@ char * readMBRtolabel __P(( dev_t dev , void (*strat)(), register struct disklab #include "cdefs.h" __BEGIN_DECLS -struct disklabel *getdiskbyname __P((const char *)); +struct disklabel *getdiskbyname (const char *); __END_DECLS #endif diff --git a/sys/platform/pc32/boot/dosboot/inode.h b/sys/platform/pc32/boot/dosboot/inode.h index 710323121f..303770a932 100644 --- a/sys/platform/pc32/boot/dosboot/inode.h +++ b/sys/platform/pc32/boot/dosboot/inode.h @@ -32,7 +32,7 @@ * * from: @(#)inode.h 7.17 (Berkeley) 5/8/91 * $FreeBSD: src/sys/i386/boot/dosboot/inode.h,v 1.7 1999/12/29 04:32:51 peter Exp $ - * $DragonFly: src/sys/platform/pc32/boot/dosboot/Attic/inode.h,v 1.3 2003/08/01 17:46:20 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/boot/dosboot/Attic/inode.h,v 1.4 2003/08/26 21:42:17 rob Exp $ */ #ifndef _UFS_INODE_H_ @@ -171,57 +171,57 @@ struct ufid { /* * Prototypes for UFS vnode operations */ -int ufs_lookup __P((struct vnode *vp, struct nameidata *ndp, struct proc *p)); -int ufs_create __P((struct nameidata *ndp, struct vattr *vap, struct proc *p)); -int ufs_mknod __P((struct nameidata *ndp, struct vattr *vap, struct ucred *cred, - struct proc *p)); -int ufs_open __P((struct vnode *vp, int mode, struct ucred *cred, - struct proc *p)); -int ufs_close __P((struct vnode *vp, int fflag, struct ucred *cred, - struct proc *p)); -int ufs_access __P((struct vnode *vp, int mode, struct ucred *cred, - struct proc *p)); -int ufs_getattr __P((struct vnode *vp, struct vattr *vap, struct ucred *cred, - struct proc *p)); -int ufs_setattr __P((struct vnode *vp, struct vattr *vap, struct ucred *cred, - struct proc *p)); -int ufs_read __P((struct vnode *vp, struct uio *uio, int ioflag, - struct ucred *cred)); -int ufs_write __P((struct vnode *vp, struct uio *uio, int ioflag, - struct ucred *cred)); -int ufs_ioctl __P((struct vnode *vp, int command, caddr_t data, int fflag, - struct ucred *cred, struct proc *p)); -int ufs_select __P((struct vnode *vp, int which, int fflags, struct ucred *cred, - struct proc *p)); -int ufs_mmap __P((struct vnode *vp, int fflags, struct ucred *cred, - struct proc *p)); -int ufs_fsync __P((struct vnode *vp, int fflags, struct ucred *cred, - int waitfor, struct proc *p)); -int ufs_seek __P((struct vnode *vp, off_t oldoff, off_t newoff, - struct ucred *cred)); -int ufs_remove __P((struct nameidata *ndp, struct proc *p)); -int ufs_link __P((struct vnode *vp, struct nameidata *ndp, struct proc *p)); -int ufs_rename __P((struct nameidata *fndp, struct nameidata *tdnp, - struct proc *p)); -int ufs_mkdir __P((struct nameidata *ndp, struct vattr *vap, struct proc *p)); -int ufs_rmdir __P((struct nameidata *ndp, struct proc *p)); -int ufs_symlink __P((struct nameidata *ndp, struct vattr *vap, char *target, - struct proc *p)); -int ufs_readdir __P((struct vnode *vp, struct uio *uio, struct ucred *cred, - int *eofflagp)); -int ufs_readlink __P((struct vnode *vp, struct uio *uio, struct ucred *cred)); -int ufs_abortop __P((struct nameidata *ndp)); -int ufs_inactive __P((struct vnode *vp, struct proc *p)); -int ufs_reclaim __P((struct vnode *vp)); -int ufs_lock __P((struct vnode *vp)); -int ufs_unlock __P((struct vnode *vp)); -int ufs_bmap __P((struct vnode *vp, daddr_t bn, struct vnode **vpp, - daddr_t *bnp)); -int ufs_strategy __P((struct buf *bp)); -void ufs_print __P((struct vnode *vp)); -int ufs_islocked __P((struct vnode *vp)); -int ufs_advlock __P((struct vnode *vp, caddr_t id, int op, struct flock *fl, - int flags)); +int ufs_lookup (struct vnode *vp, struct nameidata *ndp, struct proc *p); +int ufs_create (struct nameidata *ndp, struct vattr *vap, struct proc *p); +int ufs_mknod (struct nameidata *ndp, struct vattr *vap, struct ucred *cred, + struct proc *p); +int ufs_open (struct vnode *vp, int mode, struct ucred *cred, + struct proc *p); +int ufs_close (struct vnode *vp, int fflag, struct ucred *cred, + struct proc *p); +int ufs_access (struct vnode *vp, int mode, struct ucred *cred, + struct proc *p); +int ufs_getattr (struct vnode *vp, struct vattr *vap, struct ucred *cred, + struct proc *p); +int ufs_setattr (struct vnode *vp, struct vattr *vap, struct ucred *cred, + struct proc *p); +int ufs_read (struct vnode *vp, struct uio *uio, int ioflag, + struct ucred *cred); +int ufs_write (struct vnode *vp, struct uio *uio, int ioflag, + struct ucred *cred); +int ufs_ioctl (struct vnode *vp, int command, caddr_t data, int fflag, + struct ucred *cred, struct proc *p); +int ufs_select (struct vnode *vp, int which, int fflags, struct ucred *cred, + struct proc *p); +int ufs_mmap (struct vnode *vp, int fflags, struct ucred *cred, + struct proc *p); +int ufs_fsync (struct vnode *vp, int fflags, struct ucred *cred, + int waitfor, struct proc *p); +int ufs_seek (struct vnode *vp, off_t oldoff, off_t newoff, + struct ucred *cred); +int ufs_remove (struct nameidata *ndp, struct proc *p); +int ufs_link (struct vnode *vp, struct nameidata *ndp, struct proc *p); +int ufs_rename (struct nameidata *fndp, struct nameidata *tdnp, + struct proc *p); +int ufs_mkdir (struct nameidata *ndp, struct vattr *vap, struct proc *p); +int ufs_rmdir (struct nameidata *ndp, struct proc *p); +int ufs_symlink (struct nameidata *ndp, struct vattr *vap, char *target, + struct proc *p); +int ufs_readdir (struct vnode *vp, struct uio *uio, struct ucred *cred, + int *eofflagp); +int ufs_readlink (struct vnode *vp, struct uio *uio, struct ucred *cred); +int ufs_abortop (struct nameidata *ndp); +int ufs_inactive (struct vnode *vp, struct proc *p); +int ufs_reclaim (struct vnode *vp); +int ufs_lock (struct vnode *vp); +int ufs_unlock (struct vnode *vp); +int ufs_bmap (struct vnode *vp, daddr_t bn, struct vnode **vpp, + daddr_t *bnp); +int ufs_strategy (struct buf *bp); +void ufs_print (struct vnode *vp); +int ufs_islocked (struct vnode *vp); +int ufs_advlock (struct vnode *vp, caddr_t id, int op, struct flock *fl, + int flags); extern void blkfree(struct inode *, daddr_t, off_t); extern void ifree(struct inode *, ino_t, int); @@ -235,7 +235,7 @@ extern int realloccg(struct inode *, off_t, daddr_t, int, int, struct buf **); extern int ialloc(struct inode *, ino_t, int, struct ucred *, struct inode **); extern daddr_t blkpref(struct inode *, daddr_t, int, daddr_t *); extern u_long hashalloc(struct inode *, int, long, int, - u_long (*)(struct inode *, int, long, int)); + u_long (*)(struct inode *, int, long, int); extern daddr_t fragextend(struct inode *, int, long, int, int); extern daddr_t alloccg(struct inode *, int, daddr_t, int); diff --git a/sys/platform/pc32/boot/dosboot/quota.h b/sys/platform/pc32/boot/dosboot/quota.h index 7e6f881686..aaf5f19e0a 100644 --- a/sys/platform/pc32/boot/dosboot/quota.h +++ b/sys/platform/pc32/boot/dosboot/quota.h @@ -35,7 +35,7 @@ * * from: @(#)quota.h 7.9 (Berkeley) 2/22/91 * $FreeBSD: src/sys/i386/boot/dosboot/quota.h,v 1.6 1999/12/29 04:32:51 peter Exp $ - * $DragonFly: src/sys/platform/pc32/boot/dosboot/Attic/quota.h,v 1.3 2003/07/03 18:35:26 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/boot/dosboot/Attic/quota.h,v 1.4 2003/08/26 21:42:17 rob Exp $ */ #ifndef _QUOTA_ @@ -202,7 +202,7 @@ void dqflush(struct vnode *); #include "cdefs.h" __BEGIN_DECLS -int quotactl __P((const char *, int, int, void *)); +int quotactl (const char *, int, int, void *); __END_DECLS #endif /* _KERNEL */ diff --git a/sys/platform/pc32/boot/dosboot/types.h b/sys/platform/pc32/boot/dosboot/types.h index f5861c170c..8016ba5e09 100644 --- a/sys/platform/pc32/boot/dosboot/types.h +++ b/sys/platform/pc32/boot/dosboot/types.h @@ -37,7 +37,7 @@ * * @(#)types.h 8.4 (Berkeley) 1/21/94 * $FreeBSD: src/sys/i386/boot/dosboot/types.h,v 1.6 1999/12/29 04:32:52 peter Exp $ - * $DragonFly: src/sys/platform/pc32/boot/dosboot/Attic/types.h,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/boot/dosboot/Attic/types.h,v 1.3 2003/08/26 21:42:17 rob Exp $ */ #ifndef _SYS_TYPES_H_ @@ -86,7 +86,7 @@ typedef unsigned short uid_t; /* user id */ */ #ifndef KERNEL __BEGIN_DECLS -off_t lseek __P((int, off_t, int)); +off_t lseek (int, off_t, int); __END_DECLS #endif diff --git a/sys/platform/pc32/gnu/isa/dgb.c b/sys/platform/pc32/gnu/isa/dgb.c index ff6a4715c6..c0d704982d 100644 --- a/sys/platform/pc32/gnu/isa/dgb.c +++ b/sys/platform/pc32/gnu/isa/dgb.c @@ -1,6 +1,6 @@ /*- * dgb.c $FreeBSD: src/sys/gnu/i386/isa/dgb.c,v 1.56.2.1 2001/02/26 04:23:09 jlemon Exp $ - * dgb.c $DragonFly: src/sys/platform/pc32/gnu/isa/dgb.c,v 1.8 2003/08/07 21:17:21 dillon Exp $ + * dgb.c $DragonFly: src/sys/platform/pc32/gnu/isa/dgb.c,v 1.9 2003/08/26 21:42:17 rob Exp $ * * Digiboard driver. * @@ -173,28 +173,28 @@ static struct tty dgb_tty[NDGBPORTS]; */ /* Interrupt handling entry points. */ -static void dgbpoll __P((void *unit_c)); +static void dgbpoll (void *unit_c); /* Device switch entry points. */ #define dgbreset noreset #define dgbmmap nommap #define dgbstrategy nostrategy -static int dgbattach __P((struct isa_device *dev)); -static int dgbprobe __P((struct isa_device *dev)); +static int dgbattach (struct isa_device *dev); +static int dgbprobe (struct isa_device *dev); static void fepcmd(struct dgb_p *port, unsigned cmd, unsigned op1, unsigned op2, unsigned ncmds, unsigned bytecmd); -static void dgbstart __P((struct tty *tp)); -static void dgbstop __P((struct tty *tp, int rw)); -static int dgbparam __P((struct tty *tp, struct termios *t)); -static void dgbhardclose __P((struct dgb_p *port)); -static void dgb_drain_or_flush __P((struct dgb_p *port)); -static int dgbdrain __P((struct dgb_p *port)); -static void dgb_pause __P((void *chan)); -static void wakeflush __P((void *p)); -static void disc_optim __P((struct tty *tp, struct termios *t)); +static void dgbstart (struct tty *tp); +static void dgbstop (struct tty *tp, int rw); +static int dgbparam (struct tty *tp, struct termios *t); +static void dgbhardclose (struct dgb_p *port); +static void dgb_drain_or_flush (struct dgb_p *port); +static int dgbdrain (struct dgb_p *port); +static void dgb_pause (void *chan); +static void wakeflush (void *p); +static void disc_optim (struct tty *tp, struct termios *t); struct isa_driver dgbdriver = { @@ -306,10 +306,10 @@ static int dgbdebug=0; SYSCTL_INT(_debug, OID_AUTO, dgb_debug, CTLFLAG_RW, &dgbdebug, 0, ""); #endif -static __inline int setwin __P((struct dgb_softc *sc, unsigned addr)); -static __inline int setinitwin __P((struct dgb_softc *sc, unsigned addr)); -static __inline void hidewin __P((struct dgb_softc *sc)); -static __inline void towin __P((struct dgb_softc *sc, int win)); +static __inline int setwin (struct dgb_softc *sc, unsigned addr); +static __inline int setinitwin (struct dgb_softc *sc, unsigned addr); +static __inline void hidewin (struct dgb_softc *sc); +static __inline void towin (struct dgb_softc *sc, int win); /*Helg: to allow recursive dgb...() calls */ typedef struct diff --git a/sys/platform/pc32/i386/autoconf.c b/sys/platform/pc32/i386/autoconf.c index 539503e749..4c124b7984 100644 --- a/sys/platform/pc32/i386/autoconf.c +++ b/sys/platform/pc32/i386/autoconf.c @@ -35,7 +35,7 @@ * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/i386/autoconf.c,v 1.146.2.2 2001/06/07 06:05:58 dd Exp $ - * $DragonFly: src/sys/platform/pc32/i386/autoconf.c,v 1.9 2003/08/07 21:17:22 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/autoconf.c,v 1.10 2003/08/26 21:42:18 rob Exp $ */ /* @@ -91,12 +91,12 @@ device_t isa_bus_device = 0; #endif -static void configure_first __P((void *)); -static void configure __P((void *)); -static void configure_final __P((void *)); +static void configure_first (void *); +static void configure (void *); +static void configure_final (void *); #if defined(FFS) && defined(FFS_ROOT) -static void setroot __P((void)); +static void setroot (void); #endif #if defined(NFS) && defined(NFS_ROOT) diff --git a/sys/platform/pc32/i386/db_disasm.c b/sys/platform/pc32/i386/db_disasm.c index ea7f5f6b54..4c26139ce1 100644 --- a/sys/platform/pc32/i386/db_disasm.c +++ b/sys/platform/pc32/i386/db_disasm.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/i386/i386/db_disasm.c,v 1.23.2.1 2001/07/29 22:48:37 kris Exp $ - * $DragonFly: src/sys/platform/pc32/i386/Attic/db_disasm.c,v 1.2 2003/06/17 04:28:35 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/Attic/db_disasm.c,v 1.3 2003/08/26 21:42:18 rob Exp $ */ /* @@ -862,13 +862,13 @@ static const int db_lengths[] = { (loc) += (size); static db_addr_t - db_disasm_esc __P((db_addr_t loc, int inst, int short_addr, - int size, const char *seg)); -static void db_print_address __P((const char *seg, int size, - struct i_addr *addrp)); + db_disasm_esc (db_addr_t loc, int inst, int short_addr, + int size, const char *seg); +static void db_print_address (const char *seg, int size, + struct i_addr *addrp); static db_addr_t - db_read_address __P((db_addr_t loc, int short_addr, - int regmodrm, struct i_addr *addrp)); + db_read_address (db_addr_t loc, int short_addr, + int regmodrm, struct i_addr *addrp); /* * Read address at location and return updated location. diff --git a/sys/platform/pc32/i386/db_interface.c b/sys/platform/pc32/i386/db_interface.c index 81a6b6d2b3..b55563e695 100644 --- a/sys/platform/pc32/i386/db_interface.c +++ b/sys/platform/pc32/i386/db_interface.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/i386/i386/db_interface.c,v 1.48.2.1 2000/07/07 00:38:46 obrien Exp $ - * $DragonFly: src/sys/platform/pc32/i386/db_interface.c,v 1.5 2003/07/26 19:07:47 rob Exp $ + * $DragonFly: src/sys/platform/pc32/i386/db_interface.c,v 1.6 2003/08/26 21:42:18 rob Exp $ */ /* @@ -52,7 +52,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); int db_active; db_regs_t ddb_regs; diff --git a/sys/platform/pc32/i386/db_trace.c b/sys/platform/pc32/i386/db_trace.c index 553bcbfe50..da33ce67eb 100644 --- a/sys/platform/pc32/i386/db_trace.c +++ b/sys/platform/pc32/i386/db_trace.c @@ -24,7 +24,7 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/i386/i386/db_trace.c,v 1.35.2.3 2002/02/21 22:31:25 silby Exp $ - * $DragonFly: src/sys/platform/pc32/i386/db_trace.c,v 1.5 2003/08/03 10:07:40 hmp Exp $ + * $DragonFly: src/sys/platform/pc32/i386/db_trace.c,v 1.6 2003/08/26 21:42:18 rob Exp $ */ #include @@ -107,18 +107,18 @@ struct i386_frame { #define INTERRUPT 2 #define SYSCALL 3 -static void db_nextframe __P((struct i386_frame **, db_addr_t *)); -static int db_numargs __P((struct i386_frame *)); -static void db_print_stack_entry __P((const char *, int, char **, int *, db_addr_t)); +static void db_nextframe (struct i386_frame **, db_addr_t *); +static int db_numargs (struct i386_frame *); +static void db_print_stack_entry (const char *, int, char **, int *, db_addr_t); -static char * watchtype_str __P((int type)); -int i386_set_watch __P((int watchnum, unsigned int watchaddr, - int size, int access, struct dbreg * d)); -int i386_clr_watch __P((int watchnum, struct dbreg * d)); -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)); +static char * watchtype_str (int type); +int i386_set_watch (int watchnum, unsigned int watchaddr, + int size, int access, struct dbreg * d); +int i386_clr_watch (int watchnum, struct dbreg * d); +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/platform/pc32/i386/machdep.c b/sys/platform/pc32/i386/machdep.c index ec3ec6c6fa..c8caf9b731 100644 --- a/sys/platform/pc32/i386/machdep.c +++ b/sys/platform/pc32/i386/machdep.c @@ -36,7 +36,7 @@ * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.385.2.30 2003/05/31 08:48:05 alc Exp $ - * $DragonFly: src/sys/platform/pc32/i386/machdep.c,v 1.34 2003/08/25 19:50:28 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/machdep.c,v 1.35 2003/08/26 21:42:18 rob Exp $ */ #include "use_apm.h" @@ -120,18 +120,18 @@ #include #include -extern void init386 __P((int first)); -extern void dblfault_handler __P((void)); +extern void init386 (int first); +extern void dblfault_handler (void); extern void printcpuinfo(void); /* XXX header file */ extern void finishidentcpu(void); extern void panicifcpuunsupported(void); extern void initializecpu(void); -static void cpu_startup __P((void *)); +static void cpu_startup (void *); #ifndef CPU_DISABLE_SSE -static void set_fpregs_xmm __P((struct save87 *, struct savexmm *)); -static void fill_fpregs_xmm __P((struct savexmm *, struct save87 *)); +static void set_fpregs_xmm (struct save87 *, struct savexmm *); +static void fill_fpregs_xmm (struct savexmm *, struct save87 *); #endif /* CPU_DISABLE_SSE */ #ifdef DIRECTIO extern void ffs_rawread_setup(void); diff --git a/sys/platform/pc32/i386/mem.c b/sys/platform/pc32/i386/mem.c index 8d6cda74c4..b4f020f589 100644 --- a/sys/platform/pc32/i386/mem.c +++ b/sys/platform/pc32/i386/mem.c @@ -39,7 +39,7 @@ * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/i386/mem.c,v 1.79.2.9 2003/01/04 22:58:01 njl Exp $ - * $DragonFly: src/sys/platform/pc32/i386/Attic/mem.c,v 1.8 2003/07/26 19:07:47 rob Exp $ + * $DragonFly: src/sys/platform/pc32/i386/Attic/mem.c,v 1.9 2003/08/26 21:42:18 rob Exp $ */ /* @@ -103,8 +103,8 @@ static int rand_bolt; static caddr_t zbuf; MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); -static int mem_ioctl __P((dev_t, u_long, caddr_t, int, struct thread *)); -static int random_ioctl __P((dev_t, u_long, caddr_t, int, struct thread *)); +static int mem_ioctl (dev_t, u_long, caddr_t, int, struct thread *); +static int random_ioctl (dev_t, u_long, caddr_t, int, struct thread *); struct mem_range_softc mem_range_softc; diff --git a/sys/platform/pc32/i386/mp_machdep.c b/sys/platform/pc32/i386/mp_machdep.c index 4e4c3e60f8..a8c74c550e 100644 --- a/sys/platform/pc32/i386/mp_machdep.c +++ b/sys/platform/pc32/i386/mp_machdep.c @@ -23,7 +23,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.115.2.15 2003/03/14 21:22:35 jhb Exp $ - * $DragonFly: src/sys/platform/pc32/i386/mp_machdep.c,v 1.14 2003/07/30 02:59:19 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/mp_machdep.c,v 1.15 2003/08/26 21:42:18 rob Exp $ */ #include "opt_cpu.h" @@ -717,11 +717,11 @@ static io_int *io_apic_ints; static int nintrs; -static int processor_entry __P((proc_entry_ptr entry, int cpu)); -static int bus_entry __P((bus_entry_ptr entry, int bus)); -static int io_apic_entry __P((io_apic_entry_ptr entry, int apic)); -static int int_entry __P((int_entry_ptr entry, int intr)); -static int lookup_bus_type __P((char *name)); +static int processor_entry (proc_entry_ptr entry, int cpu); +static int bus_entry (bus_entry_ptr entry, int bus); +static int io_apic_entry (io_apic_entry_ptr entry, int apic); +static int int_entry (int_entry_ptr entry, int intr); +static int lookup_bus_type (char *name); /* diff --git a/sys/platform/pc32/i386/mpapic.c b/sys/platform/pc32/i386/mpapic.c index 53ea4657d7..c62cd5e69b 100644 --- a/sys/platform/pc32/i386/mpapic.c +++ b/sys/platform/pc32/i386/mpapic.c @@ -23,7 +23,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/mpapic.c,v 1.37.2.7 2003/01/25 02:31:47 peter Exp $ - * $DragonFly: src/sys/platform/pc32/i386/Attic/mpapic.c,v 1.6 2003/07/11 17:42:08 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/Attic/mpapic.c,v 1.7 2003/08/26 21:42:18 rob Exp $ */ #include @@ -129,8 +129,8 @@ apic_dump(char* str) #define REDIRCNT_IOAPIC(A) \ ((int)((io_apic_versions[(A)] & IOART_VER_MAXREDIR) >> MAXREDIRSHIFT) + 1) -static int trigger __P((int apic, int pin, u_int32_t * flags)); -static void polarity __P((int apic, int pin, u_int32_t * flags, int level)); +static int trigger (int apic, int pin, u_int32_t * flags); +static void polarity (int apic, int pin, u_int32_t * flags, int level); #define DEFAULT_FLAGS \ ((u_int32_t) \ @@ -578,8 +578,8 @@ selected_apic_ipi(u_int target, int vector, int delivery_mode) #endif #if defined(READY) -int acquire_apic_timer __P((void)); -int release_apic_timer __P((void)); +int acquire_apic_timer (void); +int release_apic_timer (void); /* * Acquire the APIC timer for exclusive use. diff --git a/sys/platform/pc32/i386/pmap.c b/sys/platform/pc32/i386/pmap.c index c9a20d6f4f..bd934b32ee 100644 --- a/sys/platform/pc32/i386/pmap.c +++ b/sys/platform/pc32/i386/pmap.c @@ -40,7 +40,7 @@ * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.250.2.18 2002/03/06 22:48:53 silby Exp $ - * $DragonFly: src/sys/platform/pc32/i386/pmap.c,v 1.19 2003/08/03 10:07:40 hmp Exp $ + * $DragonFly: src/sys/platform/pc32/i386/pmap.c,v 1.20 2003/08/26 21:42:18 rob Exp $ */ /* @@ -187,31 +187,31 @@ static caddr_t crashdumpmap; extern pt_entry_t *SMPpt; -static PMAP_INLINE void free_pv_entry __P((pv_entry_t pv)); -static unsigned * get_ptbase __P((pmap_t pmap)); -static pv_entry_t get_pv_entry __P((void)); -static void i386_protection_init __P((void)); -static __inline 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((struct pmap *pmap, unsigned *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 boolean_t pmap_testbit __P((vm_page_t m, int bit)); -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 unsigned * pmap_pte_quick __P((pmap_t pmap, vm_offset_t va)); -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 unsigned * get_ptbase (pmap_t pmap); +static pv_entry_t get_pv_entry (void); +static void i386_protection_init (void); +static __inline 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 (struct pmap *pmap, unsigned *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 boolean_t pmap_testbit (vm_page_t m, int bit); +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 unsigned * pmap_pte_quick (pmap_t pmap, vm_offset_t va); +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 vm_offset_t pmap_kmem_choose(vm_offset_t addr); static unsigned pdir4mb; @@ -3304,8 +3304,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/platform/pc32/i386/sys_machdep.c b/sys/platform/pc32/i386/sys_machdep.c index e2ce38bccf..f6aeacad06 100644 --- a/sys/platform/pc32/i386/sys_machdep.c +++ b/sys/platform/pc32/i386/sys_machdep.c @@ -32,7 +32,7 @@ * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 * $FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.47.2.3 2002/10/07 17:20:00 jhb Exp $ - * $DragonFly: src/sys/platform/pc32/i386/sys_machdep.c,v 1.10 2003/07/30 00:19:13 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/sys_machdep.c,v 1.11 2003/08/26 21:42:18 rob Exp $ * */ @@ -72,12 +72,12 @@ #ifdef USER_LDT -static int i386_get_ldt __P((struct proc *, char *, int *)); -static int i386_set_ldt __P((struct proc *, char *, int *)); +static int i386_get_ldt (struct proc *, char *, int *); +static int i386_set_ldt (struct proc *, char *, int *); #endif -static int i386_get_ioperm __P((struct proc *, char *)); -static int i386_set_ioperm __P((struct proc *, char *)); -int i386_extend_pcb __P((struct proc *)); +static int i386_get_ioperm (struct proc *, char *); +static int i386_set_ioperm (struct proc *, char *); +int i386_extend_pcb (struct proc *); /* * sysarch_args(int op, char *params) diff --git a/sys/platform/pc32/i386/trap.c b/sys/platform/pc32/i386/trap.c index 10288d883b..c91e0dbe47 100644 --- a/sys/platform/pc32/i386/trap.c +++ b/sys/platform/pc32/i386/trap.c @@ -36,7 +36,7 @@ * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 * $FreeBSD: src/sys/i386/i386/trap.c,v 1.147.2.11 2003/02/27 19:09:59 luoqi Exp $ - * $DragonFly: src/sys/platform/pc32/i386/trap.c,v 1.33 2003/08/25 19:50:28 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/trap.c,v 1.34 2003/08/26 21:42:18 rob Exp $ */ /* @@ -103,16 +103,16 @@ #include #include -int (*pmath_emulate) __P((struct trapframe *)); +int (*pmath_emulate) (struct trapframe *); -extern void trap __P((struct trapframe frame)); -extern int trapwrite __P((unsigned addr)); -extern void syscall2 __P((struct trapframe frame)); -extern void sendsys2 __P((struct trapframe frame)); +extern void trap (struct trapframe frame); +extern int trapwrite (unsigned addr); +extern void syscall2 (struct trapframe frame); +extern void sendsys2 (struct trapframe frame); -static int trap_pfault __P((struct trapframe *, int, vm_offset_t)); -static void trap_fatal __P((struct trapframe *, vm_offset_t)); -void dblfault_handler __P((void)); +static int trap_pfault (struct trapframe *, int, vm_offset_t); +static void trap_fatal (struct trapframe *, vm_offset_t); +void dblfault_handler (void); extern inthand_t IDTVEC(syscall); @@ -284,7 +284,7 @@ userret(struct proc *p, struct trapframe *frame, u_quad_t oticks) #ifdef DEVICE_POLLING extern u_int32_t poll_in_trap; -extern int ether_poll __P((int count)); +extern int ether_poll (int count); #endif /* DEVICE_POLLING */ /* diff --git a/sys/platform/pc32/i386/vm86.c b/sys/platform/pc32/i386/vm86.c index a691831c2f..473c937891 100644 --- a/sys/platform/pc32/i386/vm86.c +++ b/sys/platform/pc32/i386/vm86.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/vm86.c,v 1.31.2.2 2001/10/05 06:18:55 peter Exp $ - * $DragonFly: src/sys/platform/pc32/i386/vm86.c,v 1.7 2003/07/08 06:27:26 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/vm86.c,v 1.8 2003/08/26 21:42:18 rob Exp $ */ #include @@ -47,7 +47,7 @@ #include #include -extern int i386_extend_pcb __P((struct proc *)); +extern int i386_extend_pcb (struct proc *); extern int vm86pa; extern struct pcb *vm86pcb; diff --git a/sys/platform/pc32/i386/vm_machdep.c b/sys/platform/pc32/i386/vm_machdep.c index 9f509f30bb..beeba382f1 100644 --- a/sys/platform/pc32/i386/vm_machdep.c +++ b/sys/platform/pc32/i386/vm_machdep.c @@ -39,7 +39,7 @@ * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.132.2.9 2003/01/25 19:02:23 dillon Exp $ - * $DragonFly: src/sys/platform/pc32/i386/vm_machdep.c,v 1.23 2003/08/07 21:17:22 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/vm_machdep.c,v 1.24 2003/08/26 21:42:18 rob Exp $ */ #include "use_npx.h" @@ -91,9 +91,9 @@ #include #endif -static void cpu_reset_real __P((void)); +static void cpu_reset_real (void); #ifdef SMP -static void cpu_reset_proxy __P((void)); +static void cpu_reset_proxy (void); static u_int cpu_reset_proxyid; static volatile u_int cpu_reset_proxy_active; #endif @@ -236,7 +236,7 @@ cpu_fork(p1, p2, flags) void cpu_set_fork_handler(p, func, arg) struct proc *p; - void (*func) __P((void *)); + void (*func) (void *); void *arg; { /* diff --git a/sys/platform/pc32/icu/icu.h b/sys/platform/pc32/icu/icu.h index aa44d4cb0d..67bc70b896 100644 --- a/sys/platform/pc32/icu/icu.h +++ b/sys/platform/pc32/icu/icu.h @@ -35,7 +35,7 @@ * * from: @(#)icu.h 5.6 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/isa/icu.h,v 1.18 1999/12/26 12:43:47 bde Exp $ - * $DragonFly: src/sys/platform/pc32/icu/icu.h,v 1.3 2003/06/29 03:28:43 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/icu/icu.h,v 1.4 2003/08/26 21:42:19 rob Exp $ */ /* @@ -48,8 +48,8 @@ #ifndef LOCORE -void INTREN __P((u_int)); -void INTRDIS __P((u_int)); +void INTREN (u_int); +void INTRDIS (u_int); #endif /* LOCORE */ diff --git a/sys/platform/pc32/include/apm_bios.h b/sys/platform/pc32/include/apm_bios.h index 72248be11e..2867f0662c 100644 --- a/sys/platform/pc32/include/apm_bios.h +++ b/sys/platform/pc32/include/apm_bios.h @@ -13,7 +13,7 @@ * Aug, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * * $FreeBSD: src/sys/i386/include/apm_bios.h,v 1.27.2.2 2002/04/12 16:47:00 bmah Exp $ - * $DragonFly: src/sys/platform/pc32/include/apm_bios.h,v 1.2 2003/06/17 04:28:35 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/include/apm_bios.h,v 1.3 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_APM_BIOS_H_ @@ -145,7 +145,7 @@ /* C definitions */ struct apmhook { struct apmhook *ah_next; - int (*ah_fun) __P((void *ah_arg)); + int (*ah_fun) (void *ah_arg); void *ah_arg; const char *ah_name; int ah_order; diff --git a/sys/platform/pc32/include/bus_pc98.h b/sys/platform/pc32/include/bus_pc98.h index f25b7b4d0e..0832996faa 100644 --- a/sys/platform/pc32/include/bus_pc98.h +++ b/sys/platform/pc32/include/bus_pc98.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/i386/include/bus_pc98.h,v 1.8.2.5 2002/03/03 05:42:50 nyan Exp $ */ -/* $DragonFly: src/sys/platform/pc32/include/Attic/bus_pc98.h,v 1.3 2003/08/07 21:17:22 dillon Exp $ */ +/* $DragonFly: src/sys/platform/pc32/include/Attic/bus_pc98.h,v 1.4 2003/08/26 21:42:18 rob Exp $ */ /* $NecBSD: busio.h,v 3.25.4.2.2.1 2000/06/12 03:53:08 honda Exp $ */ /* $NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $ */ @@ -76,7 +76,7 @@ struct resource; /* * bus space tag */ -#define _PASCAL_CALL __P((void)) +#define _PASCAL_CALL (void) #define _BUS_SPACE_CALL_FUNCS_TAB(NAME,TYPE,BWN) \ NAME##_space_read_##BWN##, \ @@ -216,28 +216,28 @@ void i386_memio_free(bus_space_tag_t t, bus_space_handle_t bsh, */ #define _BUS_ACCESS_METHODS_PROTO(TYPE,BWN) \ static __inline TYPE bus_space_read_##BWN \ - __P((bus_space_tag_t, bus_space_handle_t, bus_size_t offset)); \ + (bus_space_tag_t, bus_space_handle_t, bus_size_t offset); \ static __inline void bus_space_read_multi_##BWN \ - __P((bus_space_tag_t, bus_space_handle_t, \ - bus_size_t, TYPE *, size_t)); \ + (bus_space_tag_t, bus_space_handle_t, \ + bus_size_t, TYPE *, size_t); \ static __inline void bus_space_read_region_##BWN \ - __P((bus_space_tag_t, bus_space_handle_t, \ - bus_size_t, TYPE *, size_t)); \ + (bus_space_tag_t, bus_space_handle_t, \ + bus_size_t, TYPE *, size_t); \ static __inline void bus_space_write_##BWN \ - __P((bus_space_tag_t, bus_space_handle_t, bus_size_t, TYPE)); \ + (bus_space_tag_t, bus_space_handle_t, bus_size_t, TYPE); \ static __inline void bus_space_write_multi_##BWN \ - __P((bus_space_tag_t, bus_space_handle_t, \ - bus_size_t, const TYPE *, size_t)); \ + (bus_space_tag_t, bus_space_handle_t, \ + bus_size_t, const TYPE *, size_t); \ static __inline void bus_space_write_region_##BWN \ - __P((bus_space_tag_t, bus_space_handle_t, \ - bus_size_t, const TYPE *, size_t)); \ + (bus_space_tag_t, bus_space_handle_t, \ + bus_size_t, const TYPE *, size_t); \ static __inline void bus_space_set_multi_##BWN \ - __P((bus_space_tag_t, bus_space_handle_t, bus_size_t, TYPE, size_t));\ + (bus_space_tag_t, bus_space_handle_t, bus_size_t, TYPE, size_t);\ static __inline void bus_space_set_region_##BWN \ - __P((bus_space_tag_t, bus_space_handle_t, bus_size_t, TYPE, size_t));\ + (bus_space_tag_t, bus_space_handle_t, bus_size_t, TYPE, size_t);\ static __inline void bus_space_copy_region_##BWN \ - __P((bus_space_tag_t, bus_space_handle_t, bus_size_t, \ - bus_space_handle_t, bus_size_t, size_t)); + (bus_space_tag_t, bus_space_handle_t, bus_size_t, \ + bus_space_handle_t, bus_size_t, size_t); _BUS_ACCESS_METHODS_PROTO(u_int8_t,1) _BUS_ACCESS_METHODS_PROTO(u_int16_t,2) diff --git a/sys/platform/pc32/include/clock.h b/sys/platform/pc32/include/clock.h index 4c891702ee..b2366c2e9d 100644 --- a/sys/platform/pc32/include/clock.h +++ b/sys/platform/pc32/include/clock.h @@ -4,7 +4,7 @@ * This file is in the public domain. * * $FreeBSD: src/sys/i386/include/clock.h,v 1.38.2.1 2002/11/02 04:41:50 iwasaki Exp $ - * $DragonFly: src/sys/platform/pc32/include/clock.h,v 1.3 2003/08/03 11:51:25 hmp Exp $ + * $DragonFly: src/sys/platform/pc32/include/clock.h,v 1.4 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -32,19 +32,19 @@ extern int apic_8254_intr; */ struct clockframe; -int acquire_timer0 __P((int rate, - void (*function)(struct clockframe *frame))); -int acquire_timer2 __P((int mode)); -int release_timer0 __P((void)); -int release_timer2 __P((void)); +int acquire_timer0 (int rate, + void (*function)(struct clockframe *frame)); +int acquire_timer2 (int mode); +int release_timer0 (void); +int release_timer2 (void); #ifndef PC98 -int rtcin __P((int val)); +int rtcin (int val); #else -int acquire_timer1 __P((int mode)); -int release_timer1 __P((void)); +int acquire_timer1 (int mode); +int release_timer1 (void); #endif -int sysbeep __P((int pitch, int period)); -void timer_restore __P((void)); +int sysbeep (int pitch, int period); +void timer_restore (void); #endif /* _KERNEL */ diff --git a/sys/platform/pc32/include/dvcfg.h b/sys/platform/pc32/include/dvcfg.h index 658fac1d4b..7e94dd5d12 100644 --- a/sys/platform/pc32/include/dvcfg.h +++ b/sys/platform/pc32/include/dvcfg.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/i386/include/dvcfg.h,v 1.2.6.1 2000/08/03 01:01:19 peter Exp $ */ -/* $DragonFly: src/sys/platform/pc32/include/Attic/dvcfg.h,v 1.3 2003/06/28 04:16:03 dillon Exp $ */ +/* $DragonFly: src/sys/platform/pc32/include/Attic/dvcfg.h,v 1.4 2003/08/26 21:42:18 rob Exp $ */ /* $NetBSD$ */ /* * [NetBSD for NEC PC98 series] @@ -51,7 +51,7 @@ struct dvcfg_hwsel { #define DVCFG_HWSEL_SZ(array) (sizeof(array) / sizeof(dvcfg_hw_t)) -static __inline dvcfg_hw_t dvcfg_hw __P((struct dvcfg_hwsel *, u_int)); +static __inline dvcfg_hw_t dvcfg_hw (struct dvcfg_hwsel *, u_int); static __inline dvcfg_hw_t dvcfg_hw(selp, num) diff --git a/sys/platform/pc32/include/in_cksum.h b/sys/platform/pc32/include/in_cksum.h index ef688aaad6..ac3739e668 100644 --- a/sys/platform/pc32/include/in_cksum.h +++ b/sys/platform/pc32/include/in_cksum.h @@ -34,7 +34,7 @@ * from: @(#)in_cksum.c 1.3 (Berkeley) 1/19/91 * from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp * $FreeBSD: src/sys/i386/include/in_cksum.h,v 1.7.2.2 2002/07/02 04:03:04 jdp Exp $ - * $DragonFly: src/sys/platform/pc32/include/Attic/in_cksum.h,v 1.3 2003/07/26 19:07:48 rob Exp $ + * $DragonFly: src/sys/platform/pc32/include/Attic/in_cksum.h,v 1.4 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_IN_CKSUM_H_ @@ -110,7 +110,7 @@ in_pseudo(u_int sum, u_int b, u_int c) } #else -u_int in_cksum_hdr __P((const struct ip *)); +u_int in_cksum_hdr (const struct ip *); #define in_cksum_update(ip) \ do { \ int __tmpsum; \ diff --git a/sys/platform/pc32/include/md_var.h b/sys/platform/pc32/include/md_var.h index a34edce89a..3449fb941c 100644 --- a/sys/platform/pc32/include/md_var.h +++ b/sys/platform/pc32/include/md_var.h @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/md_var.h,v 1.35.2.4 2003/01/22 20:14:53 jhb Exp $ - * $DragonFly: src/sys/platform/pc32/include/md_var.h,v 1.9 2003/07/23 02:30:18 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/include/md_var.h,v 1.10 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -39,12 +39,12 @@ extern int Maxmem; extern u_int atdevbase; /* offset in virtual memory of ISA io mem */ -extern void (*bcopy_vector) __P((const void *from, void *to, size_t len)); +extern void (*bcopy_vector) (const void *from, void *to, size_t len); extern int busdma_swi_pending; -extern int (*copyin_vector) __P((const void *udaddr, void *kaddr, - size_t len)); -extern int (*copyout_vector) __P((const void *kaddr, void *udaddr, - size_t len)); +extern int (*copyin_vector) (const void *udaddr, void *kaddr, + size_t len); +extern int (*copyout_vector) (const void *kaddr, void *udaddr, + size_t len); extern u_int cpu_exthigh; extern u_int cpu_feature; extern u_int cpu_fxsr; @@ -59,11 +59,11 @@ extern int need_pre_dma_flush; extern int need_post_dma_flush; #endif extern int nfs_diskless_valid; -extern void (*ovbcopy_vector) __P((const void *from, void *to, size_t len)); +extern void (*ovbcopy_vector) (const void *from, void *to, size_t len); extern char sigcode[]; extern int szsigcode, szosigcode; -typedef void alias_for_inthand_t __P((u_int cs, u_int ef, u_int esp, u_int ss)); +typedef void alias_for_inthand_t (u_int cs, u_int ef, u_int esp, u_int ss); struct proc; struct reg; struct fpreg; @@ -71,46 +71,46 @@ struct dbreg; struct mdglobaldata; struct thread; -void bcopyb __P((const void *from, void *to, size_t len)); -void busdma_swi __P((void)); -void cpu_gdinit __P((struct mdglobaldata *gd, int cpu)); -void cpu_halt __P((void)); -void cpu_idle __P((void)); -void cpu_reset __P((void)); -void cpu_setregs __P((void)); -void cpu_switch_load_gs __P((void)) __asm(__STRING(cpu_switch_load_gs)); -void cpu_heavy_restore __P((void)); /* cannot be called from C */ -void cpu_lwkt_restore __P((void)); /* cannot be called from C */ -void cpu_idle_restore __P((void)); /* cannot be called from C */ -void cpu_kthread_restore __P((void));/* cannot be called from C */ -void cpu_exit_idleptd __P((void)); /* disassociate proc MMU */ -void cpu_exit_switch __P((struct thread *next)); -void doreti_iret __P((void)) __asm(__STRING(doreti_iret)); -void doreti_iret_fault __P((void)) __asm(__STRING(doreti_iret_fault)); -void doreti_popl_ds __P((void)) __asm(__STRING(doreti_popl_ds)); -void doreti_popl_ds_fault __P((void)) __asm(__STRING(doreti_popl_ds_fault)); -void doreti_popl_es __P((void)) __asm(__STRING(doreti_popl_es)); -void doreti_popl_es_fault __P((void)) __asm(__STRING(doreti_popl_es_fault)); -void doreti_popl_fs __P((void)) __asm(__STRING(doreti_popl_fs)); -void doreti_popl_fs_fault __P((void)) __asm(__STRING(doreti_popl_fs_fault)); -void enable_sse __P((void)); -int fill_fpregs __P((struct proc *, struct fpreg *)); -int fill_regs __P((struct proc *p, struct reg *regs)); -int fill_dbregs __P((struct proc *p, struct dbreg *dbregs)); -void fillw __P((int /*u_short*/ pat, void *base, size_t cnt)); -void i486_bzero __P((volatile void *buf, size_t len)); -void i586_bzero __P((volatile void *buf, size_t len)); -void i586_bcopy __P((const void *from, void *to, size_t len)); -int i586_copyin __P((const void *udaddr, void *kaddr, size_t len)); -int i586_copyout __P((const void *kaddr, void *udaddr, size_t len)); -void i686_pagezero __P((void *addr)); +void bcopyb (const void *from, void *to, size_t len); +void busdma_swi (void); +void cpu_gdinit (struct mdglobaldata *gd, int cpu); +void cpu_halt (void); +void cpu_idle (void); +void cpu_reset (void); +void cpu_setregs (void); +void cpu_switch_load_gs (void) __asm(__STRING(cpu_switch_load_gs)); +void cpu_heavy_restore (void); /* cannot be called from C */ +void cpu_lwkt_restore (void); /* cannot be called from C */ +void cpu_idle_restore (void); /* cannot be called from C */ +void cpu_kthread_restore (void);/* cannot be called from C */ +void cpu_exit_idleptd (void); /* disassociate proc MMU */ +void cpu_exit_switch (struct thread *next); +void doreti_iret (void) __asm(__STRING(doreti_iret)); +void doreti_iret_fault (void) __asm(__STRING(doreti_iret_fault)); +void doreti_popl_ds (void) __asm(__STRING(doreti_popl_ds)); +void doreti_popl_ds_fault (void) __asm(__STRING(doreti_popl_ds_fault)); +void doreti_popl_es (void) __asm(__STRING(doreti_popl_es)); +void doreti_popl_es_fault (void) __asm(__STRING(doreti_popl_es_fault)); +void doreti_popl_fs (void) __asm(__STRING(doreti_popl_fs)); +void doreti_popl_fs_fault (void) __asm(__STRING(doreti_popl_fs_fault)); +void enable_sse (void); +int fill_fpregs (struct proc *, struct fpreg *); +int fill_regs (struct proc *p, struct reg *regs); +int fill_dbregs (struct proc *p, struct dbreg *dbregs); +void fillw (int /*u_short*/ pat, void *base, size_t cnt); +void i486_bzero (volatile void *buf, size_t len); +void i586_bzero (volatile void *buf, size_t len); +void i586_bcopy (const void *from, void *to, size_t len); +int i586_copyin (const void *udaddr, void *kaddr, size_t len); +int i586_copyout (const void *kaddr, void *udaddr, size_t len); +void i686_pagezero (void *addr); void init_AMD_Elan_sc520(void); -int is_physical_memory __P((vm_offset_t addr)); -u_long kvtop __P((void *addr)); -void setidt __P((int idx, alias_for_inthand_t *func, int typ, int dpl, - int selec)); -void userconfig __P((void)); -int user_dbreg_trap __P((void)); -int vm_page_zero_idle __P((void)); +int is_physical_memory (vm_offset_t addr); +u_long kvtop (void *addr); +void setidt (int idx, alias_for_inthand_t *func, int typ, int dpl, + int selec); +void userconfig (void); +int user_dbreg_trap (void); +int vm_page_zero_idle (void); #endif /* !_MACHINE_MD_VAR_H_ */ diff --git a/sys/platform/pc32/include/pcb.h b/sys/platform/pc32/include/pcb.h index b278ac6dbe..fbb3f32efd 100644 --- a/sys/platform/pc32/include/pcb.h +++ b/sys/platform/pc32/include/pcb.h @@ -35,7 +35,7 @@ * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 * $FreeBSD: src/sys/i386/include/pcb.h,v 1.32.2.1 2001/08/15 01:23:52 peter Exp $ - * $DragonFly: src/sys/platform/pc32/include/pcb.h,v 1.6 2003/08/07 21:17:22 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/include/pcb.h,v 1.7 2003/08/26 21:42:18 rob Exp $ */ #ifndef _I386_PCB_H_ @@ -86,7 +86,7 @@ struct pcb { #ifdef _KERNEL -void savectx __P((struct pcb *)); +void savectx (struct pcb *); #endif #endif /* _I386_PCB_H_ */ diff --git a/sys/platform/pc32/include/pcb_ext.h b/sys/platform/pc32/include/pcb_ext.h index 36ebb51445..215ea53329 100644 --- a/sys/platform/pc32/include/pcb_ext.h +++ b/sys/platform/pc32/include/pcb_ext.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/pcb_ext.h,v 1.4 1999/12/29 04:33:04 peter Exp $ - * $DragonFly: src/sys/platform/pc32/include/pcb_ext.h,v 1.3 2003/08/07 21:17:22 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/include/pcb_ext.h,v 1.4 2003/08/26 21:42:18 rob Exp $ */ #ifndef _I386_PCB_EXT_H_ @@ -55,9 +55,9 @@ struct pcb_ldt { #ifdef _KERNEL #ifdef USER_LDT -void set_user_ldt __P((struct pcb *)); -struct pcb_ldt *user_ldt_alloc __P((struct pcb *, int)); -void user_ldt_free __P((struct pcb *)); +void set_user_ldt (struct pcb *); +struct pcb_ldt *user_ldt_alloc (struct pcb *, int); +void user_ldt_free (struct pcb *); #endif #endif diff --git a/sys/platform/pc32/include/physio_proc.h b/sys/platform/pc32/include/physio_proc.h index 56b2faf244..e34a3a93ad 100644 --- a/sys/platform/pc32/include/physio_proc.h +++ b/sys/platform/pc32/include/physio_proc.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/i386/include/physio_proc.h,v 1.1.2.1 2000/10/29 11:05:48 non Exp $ */ -/* $DragonFly: src/sys/platform/pc32/include/Attic/physio_proc.h,v 1.3 2003/06/28 04:16:03 dillon Exp $ */ +/* $DragonFly: src/sys/platform/pc32/include/Attic/physio_proc.h,v 1.4 2003/08/26 21:42:18 rob Exp $ */ /* $NecBSD: physio_proc.h,v 3.4 1999/07/23 20:47:03 honda Exp $ */ /* $NetBSD$ */ @@ -46,8 +46,8 @@ struct physio_proc { struct proc *pp_proc; }; -static __inline struct physio_proc *physio_proc_enter __P((struct buf *)); -static __inline void physio_proc_leave __P((struct physio_proc *)); +static __inline struct physio_proc *physio_proc_enter (struct buf *); +static __inline void physio_proc_leave (struct physio_proc *); static __inline struct physio_proc * physio_proc_enter(bp) @@ -87,5 +87,5 @@ physio_proc_leave(pp) splx(s); } -void physio_proc_init __P((void)); +void physio_proc_init (void); #endif /* _MACHINE_PHYSIO_PROC_H_ */ diff --git a/sys/platform/pc32/include/ptrace.h b/sys/platform/pc32/include/ptrace.h index c2545eafa6..3a15084b2b 100644 --- a/sys/platform/pc32/include/ptrace.h +++ b/sys/platform/pc32/include/ptrace.h @@ -32,7 +32,7 @@ * * @(#)ptrace.h 8.1 (Berkeley) 6/11/93 * $FreeBSD: src/sys/i386/include/ptrace.h,v 1.9 1999/12/29 04:33:06 peter Exp $ - * $DragonFly: src/sys/platform/pc32/include/ptrace.h,v 1.2 2003/06/17 04:28:36 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/include/ptrace.h,v 1.3 2003/08/26 21:42:18 rob Exp $ */ #ifndef _MACHINE_PTRACE_H_ @@ -49,7 +49,7 @@ #define PT_SETDBREGS (PT_FIRSTMACH + 6) #ifdef _KERNEL -int ptrace_read_u_check __P((struct proc *p, vm_offset_t off, size_t len)); +int ptrace_read_u_check (struct proc *p, vm_offset_t off, size_t len); #endif #endif diff --git a/sys/platform/pc32/include/smp.h b/sys/platform/pc32/include/smp.h index 4fbe05b73d..9ebbaa2630 100644 --- a/sys/platform/pc32/include/smp.h +++ b/sys/platform/pc32/include/smp.h @@ -7,7 +7,7 @@ * ---------------------------------------------------------------------------- * * $FreeBSD: src/sys/i386/include/smp.h,v 1.50.2.5 2001/02/13 22:32:45 tegge Exp $ - * $DragonFly: src/sys/platform/pc32/include/smp.h,v 1.6 2003/08/07 21:17:22 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/include/smp.h,v 1.7 2003/08/26 21:42:18 rob Exp $ * */ @@ -45,19 +45,19 @@ extern int current_postcode; /** XXX currently in mp_machdep.c */ extern int bootMP_size; /* functions in mpboot.s */ -void bootMP __P((void)); +void bootMP (void); /* global data in apic_vector.s */ extern volatile u_int stopped_cpus; extern volatile u_int started_cpus; extern volatile u_int checkstate_probed_cpus; -extern void (*cpustop_restartfunc) __P((void)); +extern void (*cpustop_restartfunc) (void); /* functions in apic_ipl.s */ -void apic_eoi __P((void)); -u_int io_apic_read __P((int, int)); -void io_apic_write __P((int, int, u_int)); +void apic_eoi (void); +u_int io_apic_read (int, int); +void io_apic_write (int, int, u_int); /* global data in mp_machdep.c */ extern int bsp_apic_ready; @@ -85,70 +85,70 @@ extern u_int all_cpus; extern struct pcb stoppcbs[]; /* functions in mp_machdep.c */ -u_int mp_bootaddress __P((u_int)); -int mp_probe __P((void)); -void mp_start __P((void)); -void mp_announce __P((void)); -u_int isa_apic_mask __P((u_int)); -int isa_apic_irq __P((int)); -int pci_apic_irq __P((int, int, int)); -int apic_irq __P((int, int)); -int next_apic_irq __P((int)); -int undirect_isa_irq __P((int)); -int undirect_pci_irq __P((int)); -int apic_bus_type __P((int)); -int apic_src_bus_id __P((int, int)); -int apic_src_bus_irq __P((int, int)); -int apic_int_type __P((int, int)); -int apic_trigger __P((int, int)); -int apic_polarity __P((int, int)); -void assign_apic_irq __P((int apic, int intpin, int irq)); -void revoke_apic_irq __P((int irq)); -void bsp_apic_configure __P((void)); -void init_secondary __P((void)); -int stop_cpus __P((u_int)); -void ap_init __P((void)); -int restart_cpus __P((u_int)); +u_int mp_bootaddress (u_int); +int mp_probe (void); +void mp_start (void); +void mp_announce (void); +u_int isa_apic_mask (u_int); +int isa_apic_irq (int); +int pci_apic_irq (int, int, int); +int apic_irq (int, int); +int next_apic_irq (int); +int undirect_isa_irq (int); +int undirect_pci_irq (int); +int apic_bus_type (int); +int apic_src_bus_id (int, int); +int apic_src_bus_irq (int, int); +int apic_int_type (int, int); +int apic_trigger (int, int); +int apic_polarity (int, int); +void assign_apic_irq (int apic, int intpin, int irq); +void revoke_apic_irq (int irq); +void bsp_apic_configure (void); +void init_secondary (void); +int stop_cpus (u_int); +void ap_init (void); +int restart_cpus (u_int); #ifdef BETTER_CLOCK -void forward_statclock __P((int pscnt)); -void forward_hardclock __P((int pscnt)); +void forward_statclock (int pscnt); +void forward_hardclock (int pscnt); #endif /* BETTER_CLOCK */ -void forward_signal __P((struct proc *)); -void forward_roundrobin __P((void)); +void forward_signal (struct proc *); +void forward_roundrobin (void); #ifdef APIC_INTR_REORDER -void set_lapic_isrloc __P((int, int)); +void set_lapic_isrloc (int, int); #endif /* APIC_INTR_REORDER */ -void smp_rendezvous_action __P((void)); -void smp_rendezvous __P((void (*)(void *), +void smp_rendezvous_action (void); +void smp_rendezvous (void (*)(void *), void (*)(void *), void (*)(void *), - void *arg)); + void *arg); /* global data in mpapic.c */ extern volatile lapic_t lapic; extern volatile ioapic_t **ioapic; /* functions in mpapic.c */ -void apic_dump __P((char*)); -void apic_initialize __P((void)); -void imen_dump __P((void)); -int apic_ipi __P((int, int, int)); -int selected_apic_ipi __P((u_int, int, int)); -int io_apic_setup __P((int)); -void io_apic_setup_intpin __P((int, int)); -void io_apic_set_id __P((int, int)); -int io_apic_get_id __P((int)); -int ext_int_setup __P((int, int)); +void apic_dump (char*); +void apic_initialize (void); +void imen_dump (void); +int apic_ipi (int, int, int); +int selected_apic_ipi (u_int, int, int); +int io_apic_setup (int); +void io_apic_setup_intpin (int, int); +void io_apic_set_id (int, int); +int io_apic_get_id (int); +int ext_int_setup (int, int); #if defined(READY) -void clr_io_apic_mask24 __P((int, u_int32_t)); -void set_io_apic_mask24 __P((int, u_int32_t)); +void clr_io_apic_mask24 (int, u_int32_t); +void set_io_apic_mask24 (int, u_int32_t); #endif /* READY */ -void set_apic_timer __P((int)); -int read_apic_timer __P((void)); -void u_sleep __P((int)); -void cpu_send_ipiq __P((int)); +void set_apic_timer (int); +int read_apic_timer (void); +void u_sleep (int); +void cpu_send_ipiq (int); /* global data in init_smp.c */ extern int invltlb_ok; diff --git a/sys/platform/pc32/isa/clock.c b/sys/platform/pc32/isa/clock.c index 8b2fbf8868..e21dfbf91c 100644 --- a/sys/platform/pc32/isa/clock.c +++ b/sys/platform/pc32/isa/clock.c @@ -35,7 +35,7 @@ * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 * $FreeBSD: src/sys/i386/isa/clock.c,v 1.149.2.6 2002/11/02 04:41:50 iwasaki Exp $ - * $DragonFly: src/sys/platform/pc32/isa/clock.c,v 1.5 2003/08/07 21:17:23 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/isa/clock.c,v 1.6 2003/08/26 21:42:19 rob Exp $ */ /* @@ -95,8 +95,8 @@ #include /* The interrupt triggered by the 8254 (timer) chip */ int apic_8254_intr; -static u_long read_intr_count __P((int vec)); -static void setup_8254_mixed_mode __P((void)); +static u_long read_intr_count (int vec); +static void setup_8254_mixed_mode (void); #endif /* @@ -152,7 +152,7 @@ static int i8254_ticked; * timer0_state == 0 case. We should use inthand_add()/inthand_remove() * to switch between clkintr() and a slightly different timerintr(). */ -static void (*new_function) __P((struct clockframe *frame)); +static void (*new_function) (struct clockframe *frame); static u_int new_rate; static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; static u_char rtc_statusb = RTCSB_24HR | RTCSB_PINTR; @@ -166,11 +166,11 @@ static u_int timer0_prescaler_count; static u_char timer0_state; static u_char timer2_state; -static void (*timer_func) __P((struct clockframe *frame)) = hardclock; +static void (*timer_func) (struct clockframe *frame) = hardclock; static u_int tsc_present; -static unsigned i8254_get_timecount __P((struct timecounter *tc)); -static unsigned tsc_get_timecount __P((struct timecounter *tc)); +static unsigned i8254_get_timecount (struct timecounter *tc); +static unsigned tsc_get_timecount (struct timecounter *tc); static void set_timer_freq(u_int freq, int intr_freq); static struct timecounter tsc_timecounter = { @@ -270,7 +270,7 @@ clkintr(struct clockframe frame) * The acquire and release functions must be called at ipl >= splclock(). */ int -acquire_timer0(int rate, void (*function) __P((struct clockframe *frame))) +acquire_timer0(int rate, void (*function) (struct clockframe *frame)) { static int old_rate; diff --git a/sys/platform/pc32/isa/icu.h b/sys/platform/pc32/isa/icu.h index cb69a833a8..b1221ee606 100644 --- a/sys/platform/pc32/isa/icu.h +++ b/sys/platform/pc32/isa/icu.h @@ -35,7 +35,7 @@ * * from: @(#)icu.h 5.6 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/isa/icu.h,v 1.18 1999/12/26 12:43:47 bde Exp $ - * $DragonFly: src/sys/platform/pc32/isa/Attic/icu.h,v 1.3 2003/06/29 03:28:43 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/isa/Attic/icu.h,v 1.4 2003/08/26 21:42:19 rob Exp $ */ /* @@ -48,8 +48,8 @@ #ifndef LOCORE -void INTREN __P((u_int)); -void INTRDIS __P((u_int)); +void INTREN (u_int); +void INTRDIS (u_int); #endif /* LOCORE */ diff --git a/sys/platform/pc32/isa/intr_machdep.h b/sys/platform/pc32/isa/intr_machdep.h index 666b37a3ef..2d0e458a66 100644 --- a/sys/platform/pc32/isa/intr_machdep.h +++ b/sys/platform/pc32/isa/intr_machdep.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/intr_machdep.h,v 1.19.2.2 2001/10/14 20:05:50 luigi Exp $ - * $DragonFly: src/sys/platform/pc32/isa/intr_machdep.h,v 1.7 2003/07/12 16:55:50 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/isa/intr_machdep.h,v 1.8 2003/08/26 21:42:19 rob Exp $ */ #ifndef _I386_ISA_INTR_MACHDEP_H_ @@ -212,14 +212,14 @@ inthand_t #endif /* SMP */ void call_fast_unpend(int irq); -void isa_defaultirq __P((void)); -int isa_nmi __P((int cd)); -int icu_setup __P((int intr, inthand2_t *func, void *arg, - u_int *maskptr, int flags)); -int icu_unset __P((int intr, inthand2_t *handler)); -int update_intr_masks __P((void)); - -intrmask_t splq __P((intrmask_t mask)); +void isa_defaultirq (void); +int isa_nmi (int cd); +int icu_setup (int intr, inthand2_t *func, void *arg, + u_int *maskptr, int flags); +int icu_unset (int intr, inthand2_t *handler); +int update_intr_masks (void); + +intrmask_t splq (intrmask_t mask); #define INTR_FAST 0x00000001 /* fast interrupt handler */ #define INTR_EXCL 0x00010000 /* excl. intr, default is shared */ diff --git a/sys/platform/pc32/isa/npx.c b/sys/platform/pc32/isa/npx.c index 85b9de24fe..ba108c4fa8 100644 --- a/sys/platform/pc32/isa/npx.c +++ b/sys/platform/pc32/isa/npx.c @@ -33,7 +33,7 @@ * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 * $FreeBSD: src/sys/i386/isa/npx.c,v 1.80.2.3 2001/10/20 19:04:38 tegge Exp $ - * $DragonFly: src/sys/platform/pc32/isa/npx.c,v 1.12 2003/08/07 21:17:23 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/isa/npx.c,v 1.13 2003/08/26 21:42:19 rob Exp $ */ #include "opt_cpu.h" @@ -109,21 +109,21 @@ #else /* not __GNUC__ */ -void fldcw __P((caddr_t addr)); -void fnclex __P((void)); -void fninit __P((void)); -void fnop __P((void)); -void fnsave __P((caddr_t addr)); -void fnstcw __P((caddr_t addr)); -void fnstsw __P((caddr_t addr)); -void fp_divide_by_0 __P((void)); -void frstor __P((caddr_t addr)); +void fldcw (caddr_t addr); +void fnclex (void); +void fninit (void); +void fnop (void); +void fnsave (caddr_t addr); +void fnstcw (caddr_t addr); +void fnstsw (caddr_t addr); +void fp_divide_by_0 (void); +void frstor (caddr_t addr); #ifndef CPU_DISABLE_SSE -void fxsave __P((caddr_t addr)); -void fxrstor __P((caddr_t addr)); +void fxsave (caddr_t addr); +void fxrstor (caddr_t addr); #endif -void start_emulating __P((void)); -void stop_emulating __P((void)); +void start_emulating (void); +void stop_emulating (void); #endif /* __GNUC__ */ @@ -139,16 +139,16 @@ void stop_emulating __P((void)); typedef u_char bool_t; -static int npx_attach __P((device_t dev)); - void npx_intr __P((void *)); -static void npx_identify __P((driver_t *driver, device_t parent)); -static int npx_probe __P((device_t dev)); -static int npx_probe1 __P((device_t dev)); -static void fpusave __P((union savefpu *)); -static void fpurstor __P((union savefpu *)); +static int npx_attach (device_t dev); + void npx_intr (void *); +static void npx_identify (driver_t *driver, device_t parent); +static int npx_probe (device_t dev); +static int npx_probe1 (device_t dev); +static void fpusave (union savefpu *); +static void fpurstor (union savefpu *); #ifdef I586_CPU -static long timezero __P((const char *funcname, - void (*func)(volatile void *buf, size_t len))); +static long timezero (const char *funcname, + void (*func)(volatile void *buf, size_t len)); #endif /* I586_CPU */ int hw_float; /* XXX currently just alias for npx_exists */ @@ -947,7 +947,7 @@ fpurstor(addr) static long timezero(funcname, func) const char *funcname; - void (*func) __P((volatile void *buf, size_t len)); + void (*func) (volatile void *buf, size_t len); { void *buf; diff --git a/sys/sys/ccbque.h b/sys/sys/ccbque.h index 53cbf59ed9..240870e468 100644 --- a/sys/sys/ccbque.h +++ b/sys/sys/ccbque.h @@ -28,7 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/ccbque.h,v 1.3.6.2 2000/10/21 07:44:24 nyan Exp $ - * $DragonFly: src/sys/sys/ccbque.h,v 1.3 2003/07/26 19:07:48 rob Exp $ + * $DragonFly: src/sys/sys/ccbque.h,v 1.4 2003/08/26 21:42:19 rob Exp $ */ /* * Common command control queue funcs. @@ -50,9 +50,9 @@ struct CCBTYPE##que { \ u_int flags; \ }; \ \ -void DEV##_init_ccbque __P((int)); \ -struct CCBTYPE *DEV##_get_ccb __P((void)); \ -void DEV##_free_ccb __P((struct CCBTYPE *)); +void DEV##_init_ccbque (int); \ +struct CCBTYPE *DEV##_get_ccb (void); \ +void DEV##_free_ccb (struct CCBTYPE *); /* (II) static allocated memory */ #define GENERIC_CCB_STATIC_ALLOC(DEV, CCBTYPE) \ -- 2.23.0