Date: Thu, 21 Mar 2002 09:42:28 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 8163 for review Message-ID: <200203211742.g2LHgSX89318@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8163 Change 8163 by jhb@jhb_laptop on 2002/03/21 09:41:36 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/api_up1000.c#2 integrate ... //depot/projects/smpng/sys/alpha/alpha/autoconf.c#5 integrate ... //depot/projects/smpng/sys/alpha/alpha/clock.c#4 integrate ... //depot/projects/smpng/sys/alpha/alpha/cpuconf.c#2 integrate ... //depot/projects/smpng/sys/alpha/alpha/db_disasm.c#2 integrate ... //depot/projects/smpng/sys/alpha/alpha/db_interface.c#7 integrate ... //depot/projects/smpng/sys/alpha/alpha/db_trace.c#4 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_1000a.c#5 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_2100_a50.c#2 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_2100_a500.c#3 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_axppci_33.c#2 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_eb164.c#2 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_eb64plus.c#2 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_kn20aa.c#5 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_kn300.c#3 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_st550.c#5 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_st6600.c#2 integrate ... //depot/projects/smpng/sys/alpha/alpha/interrupt.c#14 integrate ... //depot/projects/smpng/sys/alpha/alpha/machdep.c#31 integrate ... //depot/projects/smpng/sys/alpha/alpha/pmap.c#26 integrate ... //depot/projects/smpng/sys/alpha/alpha/prom.c#8 integrate ... //depot/projects/smpng/sys/alpha/alpha/promcons.c#7 integrate ... //depot/projects/smpng/sys/alpha/alpha/trap.c#28 integrate ... //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#9 integrate ... //depot/projects/smpng/sys/alpha/include/bootinfo.h#2 integrate ... //depot/projects/smpng/sys/alpha/include/clock.h#2 integrate ... //depot/projects/smpng/sys/alpha/include/cpu.h#5 integrate ... //depot/projects/smpng/sys/alpha/include/cpuconf.h#2 integrate ... //depot/projects/smpng/sys/alpha/include/cpufunc.h#5 integrate ... //depot/projects/smpng/sys/alpha/include/db_machdep.h#3 integrate ... //depot/projects/smpng/sys/alpha/include/float.h#2 integrate ... //depot/projects/smpng/sys/alpha/include/md_var.h#5 integrate ... //depot/projects/smpng/sys/alpha/include/pmap.h#8 integrate ... //depot/projects/smpng/sys/alpha/include/profile.h#2 integrate ... //depot/projects/smpng/sys/alpha/include/prom.h#3 integrate ... //depot/projects/smpng/sys/alpha/include/reg.h#4 integrate ... //depot/projects/smpng/sys/alpha/include/sysarch.h#2 integrate ... //depot/projects/smpng/sys/alpha/linux/linux_proto.h#6 integrate ... //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#5 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_ioctl.c#5 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#10 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_mount.c#4 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_proto.h#3 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#6 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_signal.h#2 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_sysvec.c#2 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_util.h#3 integrate ... //depot/projects/smpng/sys/alpha/pci/cia.c#13 integrate ... //depot/projects/smpng/sys/alpha/pci/t2.c#14 integrate ... //depot/projects/smpng/sys/alpha/pci/t2_pci.c#7 integrate ... //depot/projects/smpng/sys/alpha/pci/tsunami.c#11 integrate ... //depot/projects/smpng/sys/alpha/tc/am7990.c#3 integrate ... //depot/projects/smpng/sys/alpha/tc/am7990var.h#2 integrate ... //depot/projects/smpng/sys/alpha/tc/ascvar.h#2 integrate ... //depot/projects/smpng/sys/alpha/tc/esp.c#2 integrate ... //depot/projects/smpng/sys/alpha/tc/if_le_dec.c#2 integrate ... //depot/projects/smpng/sys/alpha/tc/if_le_ioasic.c#2 integrate ... //depot/projects/smpng/sys/alpha/tc/if_levar.h#2 integrate ... //depot/projects/smpng/sys/alpha/tc/ioasic.c#2 integrate ... //depot/projects/smpng/sys/alpha/tc/ioasicvar.h#2 integrate ... //depot/projects/smpng/sys/alpha/tc/sticvar.h#2 integrate ... //depot/projects/smpng/sys/alpha/tc/tc.c#2 integrate ... //depot/projects/smpng/sys/alpha/tc/tcds.c#2 integrate ... //depot/projects/smpng/sys/alpha/tc/tcdsreg.h#2 integrate ... //depot/projects/smpng/sys/alpha/tc/tcdsvar.h#2 integrate ... //depot/projects/smpng/sys/alpha/tc/tcvar.h#2 integrate ... //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#5 integrate ... //depot/projects/smpng/sys/arm/include/types.h#2 integrate ... //depot/projects/smpng/sys/conf/kern.post.mk#7 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#8 integrate ... //depot/projects/smpng/sys/dev/ida/ida.c#2 integrate ... //depot/projects/smpng/sys/dev/ida/ida_disk.c#4 integrate ... //depot/projects/smpng/sys/dev/sio/sio_pci.c#6 integrate ... //depot/projects/smpng/sys/dev/usb/umass.c#11 integrate ... //depot/projects/smpng/sys/i386/i386/initcpu.c#9 integrate ... //depot/projects/smpng/sys/i386/i386/perfmon.c#8 integrate ... //depot/projects/smpng/sys/i386/i386/pmap.c#19 integrate ... //depot/projects/smpng/sys/i386/i386/sys_machdep.c#15 integrate ... //depot/projects/smpng/sys/i386/i386/trap.c#34 integrate ... //depot/projects/smpng/sys/i386/i386/vm_machdep.c#18 integrate ... //depot/projects/smpng/sys/i386/include/cpufunc.h#10 integrate ... //depot/projects/smpng/sys/i386/isa/npx.c#22 integrate ... //depot/projects/smpng/sys/ia64/ia64/autoconf.c#6 integrate ... //depot/projects/smpng/sys/ia64/ia64/db_interface.c#15 integrate ... //depot/projects/smpng/sys/ia64/ia64/db_trace.c#7 integrate ... //depot/projects/smpng/sys/ia64/ia64/machdep.c#27 integrate ... //depot/projects/smpng/sys/ia64/ia64/pmap.c#23 integrate ... //depot/projects/smpng/sys/ia64/ia64/sapic.c#7 integrate ... //depot/projects/smpng/sys/ia64/ia64/ssc.c#4 integrate ... //depot/projects/smpng/sys/ia64/ia64/trap.c#25 integrate ... //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#10 integrate ... //depot/projects/smpng/sys/ia64/include/clock.h#2 integrate ... //depot/projects/smpng/sys/ia64/include/cpu.h#7 integrate ... //depot/projects/smpng/sys/ia64/include/cpufunc.h#10 integrate ... //depot/projects/smpng/sys/ia64/include/md_var.h#6 integrate ... //depot/projects/smpng/sys/ia64/include/pmap.h#6 integrate ... //depot/projects/smpng/sys/ia64/include/profile.h#6 integrate ... //depot/projects/smpng/sys/ia64/include/reg.h#4 integrate ... //depot/projects/smpng/sys/kern/kern_fork.c#28 edit ... //depot/projects/smpng/sys/kern/kern_linker.c#13 integrate ... //depot/projects/smpng/sys/kern/kern_prot.c#46 integrate ... //depot/projects/smpng/sys/kern/subr_trap.c#30 integrate ... //depot/projects/smpng/sys/kern/subr_witness.c#34 integrate ... //depot/projects/smpng/sys/kern/uipc_socket.c#17 integrate ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#23 integrate ... //depot/projects/smpng/sys/modules/Makefile#24 integrate ... //depot/projects/smpng/sys/netinet/if_ether.c#10 integrate ... //depot/projects/smpng/sys/pccard/pccard.c#9 integrate ... //depot/projects/smpng/sys/pccard/pcic.c#14 integrate ... //depot/projects/smpng/sys/pccard/pcic_pci.h#8 integrate ... //depot/projects/smpng/sys/powerpc/include/bootinfo.h#2 integrate ... //depot/projects/smpng/sys/powerpc/include/bus.h#2 integrate ... //depot/projects/smpng/sys/powerpc/include/clock.h#2 integrate ... //depot/projects/smpng/sys/powerpc/include/cpu.h#8 integrate ... //depot/projects/smpng/sys/powerpc/include/cpufunc.h#9 integrate ... //depot/projects/smpng/sys/powerpc/include/db_machdep.h#3 integrate ... //depot/projects/smpng/sys/powerpc/include/intr.h#2 integrate ... //depot/projects/smpng/sys/powerpc/include/md_var.h#5 integrate ... //depot/projects/smpng/sys/powerpc/include/powerpc.h#2 integrate ... //depot/projects/smpng/sys/powerpc/include/pte.h#3 integrate ... //depot/projects/smpng/sys/powerpc/include/reg.h#4 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/autoconf.c#4 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/clock.c#4 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/extintr.c#4 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#14 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/syncicache.c#2 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/trap.c#14 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#11 integrate ... //depot/projects/smpng/sys/sparc64/include/cache.h#4 integrate ... //depot/projects/smpng/sys/sparc64/include/cpufunc.h#13 integrate ... //depot/projects/smpng/sys/sparc64/include/float.h#2 integrate ... //depot/projects/smpng/sys/sparc64/include/iommuvar.h#3 integrate ... //depot/projects/smpng/sys/sparc64/include/pv.h#6 integrate ... //depot/projects/smpng/sys/sparc64/include/reg.h#8 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/db_hwwatch.c#3 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#17 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#18 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/pv.c#10 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/trap.c#29 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/tsb.c#11 integrate ... //depot/projects/smpng/sys/sys/pcpu.h#6 integrate ... //depot/projects/smpng/sys/sys/proc.h#40 integrate ... //depot/projects/smpng/sys/sys/ucred.h#12 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#10 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/api_up1000.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.4 2001/02/02 01:48:40 peter Exp $ + * $FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.5 2002/03/20 18:58:44 obrien Exp $ */ #include "opt_ddb.h" @@ -52,12 +52,12 @@ #endif static int comcnrate = CONSPEED; -void api_up1000_init __P((void)); -static void api_up1000_cons_init __P((void)); +void api_up1000_init(void); +static void api_up1000_cons_init(void); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); void api_up1000_init() ==== //depot/projects/smpng/sys/alpha/alpha/autoconf.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.49 2001/10/24 17:42:01 jlemon Exp $ + * $FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.50 2002/03/20 18:58:44 obrien Exp $ */ #include "opt_bootp.h" @@ -58,11 +58,11 @@ #include <cam/cam_xpt_sim.h> #include <cam/cam_debug.h> -static void configure __P((void *)); +static void configure(void *); SYSINIT(configure, SI_SUB_CONFIGURE, SI_ORDER_THIRD, configure, NULL) -static void configure_finish __P((void)); -static void configure_start __P((void)); +static void configure_finish(void); +static void configure_start(void); #ifdef DEV_ISA #include <isa/isavar.h> ==== //depot/projects/smpng/sys/alpha/alpha/clock.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.27 2001/11/03 17:22:50 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.28 2002/03/20 18:58:44 obrien Exp $ */ /* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */ /* @@ -286,7 +286,7 @@ } stathz = hz / 8; - platform.clockintr = (void (*) __P((void *))) handleclock; + platform.clockintr = (void (*)(void *)) handleclock; /* * Get the clock started. ==== //depot/projects/smpng/sys/alpha/alpha/cpuconf.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.12 2000/12/08 22:11:07 msmith Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.13 2002/03/20 18:58:44 obrien Exp $ */ /* $NetBSD: cpuconf.c,v 1.10 1998/03/20 21:48:21 thorpej Exp $ */ /* @@ -40,91 +40,91 @@ #include "opt_cpu.h" #ifdef DEC_3000_500 -extern void dec_3000_500_init __P((int)); +extern void dec_3000_500_init(int); #else #define dec_3000_500_init platform_not_configured #endif #ifdef DEC_3000_300 -extern void dec_3000_300_init __P((int)); +extern void dec_3000_300_init(int); #else #define dec_3000_300_init platform_not_configured #endif #ifdef DEC_AXPPCI_33 -extern void dec_axppci_33_init __P((int)); +extern void dec_axppci_33_init(int); #else #define dec_axppci_33_init platform_not_configured #endif #ifdef DEC_KN8AE -extern void dec_kn8ae_init __P((int)); +extern void dec_kn8ae_init(int); #else #define dec_kn8ae_init platform_not_configured #endif #ifdef DEC_2100_A50 -extern void dec_2100_a50_init __P((int)); +extern void dec_2100_a50_init(int); #else #define dec_2100_a50_init platform_not_configured #endif #ifdef DEC_KN20AA -extern void dec_kn20aa_init __P((int)); +extern void dec_kn20aa_init(int); #else #define dec_kn20aa_init platform_not_configured #endif #ifdef DEC_EB64PLUS -extern void dec_eb64plus_init __P((int)); +extern void dec_eb64plus_init(int); #else #define dec_eb64plus_init platform_not_configured #endif #ifdef DEC_EB164 -extern void dec_eb164_init __P((int)); +extern void dec_eb164_init(int); #else #define dec_eb164_init platform_not_configured #endif #ifdef DEC_KN300 -extern void dec_kn300_init __P((int)); +extern void dec_kn300_init(int); #else #define dec_kn300_init platform_not_configured #endif #ifdef AVALON_A12 -extern void avalon_a12_init __P((int)); +extern void avalon_a12_init(int); #else #define avalon_a12_init platform_not_configured #endif #ifdef DEC_ST550 -extern void st550_init __P((int)); +extern void st550_init(int); #else #define st550_init platform_not_configured #endif #ifdef DEC_ST6600 -extern void st6600_init __P((int)); +extern void st6600_init(int); #else #define st6600_init platform_not_configured #endif #ifdef DEC_1000A -extern void dec_1000a_init __P((int)); +extern void dec_1000a_init(int); #else #define dec_1000a_init platform_not_configured #endif #ifdef DEC_2100_A500 -extern void dec_2100_a500_init __P((int)); +extern void dec_2100_a500_init(int); #else #define dec_2100_a500_init platform_not_configured #endif #ifdef API_UP1000 -extern void api_up1000_init __P((int)); +extern void api_up1000_init(int); #else #define api_up1000_init platform_not_configured #endif ==== //depot/projects/smpng/sys/alpha/alpha/db_disasm.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.5 2000/09/11 05:28:52 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.6 2002/03/20 18:58:44 obrien Exp $ */ /* $NetBSD: db_disasm.c,v 1.4 1997/09/16 22:52:40 thorpej Exp $ */ /* @@ -188,7 +188,7 @@ { NULL, -1 }, }; -static const char *pal_opname __P((int)); +static const char *pal_opname(int); static const char * pal_opname(op) @@ -244,7 +244,7 @@ arit_c0, arit_c2, 0, 0, arit_c9, arit_cB, arit_cD, arit_cF }; -static __inline const char *arit_name __P((int)); +static __inline const char *arit_name(int); static __inline const char * arit_name(op) int op; @@ -285,7 +285,7 @@ "andnot", "ornot", "xornot", 0 }; -static __inline const char *logical_name __P((int)); +static __inline const char *logical_name(int); static __inline const char * logical_name(op) int op; @@ -334,7 +334,7 @@ /* 7 */ { 0, "inswh", "inslh", "insqh" }, }; -static __inline const char *bitop_name __P((int)); +static __inline const char *bitop_name(int); static __inline const char * bitop_name(op) int op; @@ -364,7 +364,7 @@ "mull", "mulq", "mull/v", "mulq/v" }; -static __inline const char *mul_name __P((int)); +static __inline const char *mul_name(int); static __inline const char * mul_name(op) int op; @@ -389,7 +389,7 @@ "drain_t", 0, "mb", 0, "fetch", "fetch_m", "rpcc", "rc" }; -static __inline const char *special_name __P((int)); +static __inline const char *special_name(int); static __inline const char * special_name(op) int op; @@ -424,7 +424,7 @@ "maxuw4", "maxsb8", "maxsw4", }; -static __inline const char *intmisc_name __P((int)); +static __inline const char *intmisc_name(int); static __inline const char * intmisc_name(op) int op; @@ -445,7 +445,7 @@ return (unk); } -static const char *float_name __P((const struct tbl[], int, const char *type)); +static const char *float_name(const struct tbl[], int, const char *type); static const char * float_name(tbl, op, type) @@ -795,7 +795,7 @@ static int regcount; /* how many regs used in this inst */ static int regnum[3]; /* which regs used in this inst */ -static const char *register_name __P((int)); +static const char *register_name(int); static const char * register_name (ireg) @@ -816,7 +816,7 @@ * (optional) alternate format. Return address of start of * next instruction. */ -int alpha_print_instruction __P((db_addr_t, alpha_instruction, boolean_t)); +int alpha_print_instruction(db_addr_t, alpha_instruction, boolean_t); db_addr_t db_disasm(loc, altfmt) ==== //depot/projects/smpng/sys/alpha/alpha/db_interface.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: db_interface.c,v 1.2 1997/09/16 19:07:19 thorpej Exp $ */ -/* $FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.24 2001/12/18 00:27:14 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.26 2002/03/21 06:14:57 imp Exp $ */ /* * Mach Operating System @@ -81,7 +81,7 @@ static jmp_buf *db_nofault = 0; extern jmp_buf db_jmpbuf; -extern void gdb_handle_exception __P((db_regs_t *, int, int)); +extern void gdb_handle_exception(db_regs_t *, int, int); #if 0 extern char *trap_type[]; @@ -90,8 +90,8 @@ int db_active; -void ddbprinttrap __P((unsigned long, unsigned long, unsigned long, - unsigned long)); +void ddbprinttrap(unsigned long, unsigned long, unsigned long, + unsigned long); struct db_variable db_regs[] = { { "v0", &ddb_regs.tf_regs[FRAME_V0], FCN_NULL }, @@ -155,7 +155,7 @@ db_regs_t *regs; { int ddb_mode = !(boothowto & RB_GDB); - critical_t s; + register_t s; /* * Don't bother checking for usermode, since a benign entry @@ -192,7 +192,7 @@ ddb_regs = *regs; - s = cpu_critical_enter(); + s = intr_disable(); #ifdef SMP #ifdef DIAGNOSTIC @@ -219,7 +219,7 @@ restart_cpus(stopped_cpus); #endif - cpu_critical_exit(s); + intr_restore(s); *regs = ddb_regs; ==== //depot/projects/smpng/sys/alpha/alpha/db_trace.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.11 2002/02/07 20:58:42 julian Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.12 2002/03/20 18:58:44 obrien Exp $ */ /* $NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $ */ /*- @@ -97,9 +97,9 @@ }; -int db_md_set_watchpoint __P((db_expr_t addr, db_expr_t size)); -int db_md_clr_watchpoint __P((db_expr_t addr, db_expr_t size)); -void db_md_list_watchpoints __P((void)); +int db_md_set_watchpoint(db_expr_t addr, db_expr_t size); +int db_md_clr_watchpoint(db_expr_t addr, db_expr_t size); +void db_md_list_watchpoints(void); /* ==== //depot/projects/smpng/sys/alpha/alpha/dec_1000a.c#5 (text+ko) ==== @@ -70,7 +70,7 @@ /* * Additional Copyright (c) 1999 by Andrew Gallatin * - * $FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.11 2001/06/01 17:38:57 gallatin Exp $ + * $FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.12 2002/03/20 18:58:44 obrien Exp $ */ #include "opt_ddb.h" @@ -99,23 +99,23 @@ #endif static int comcnrate = CONSPEED; -void dec_1000a_init __P((int)); -static void dec_1000a_cons_init __P((void)); +void dec_1000a_init(int); +static void dec_1000a_cons_init(void); -static void dec_1000_intr_map __P((void *)); -static void dec_1000_intr_disable __P((int)); -static void dec_1000_intr_enable __P((int)); -static void dec_1000_intr_init __P((void)); +static void dec_1000_intr_map(void *); +static void dec_1000_intr_disable(int); +static void dec_1000_intr_enable(int); +static void dec_1000_intr_init(void); -static void dec_1000a_intr_map __P((void *)); -static void dec_1000a_intr_disable __P((int)); -static void dec_1000a_intr_enable __P((int)); -static void dec_1000a_intr_init __P((void)); +static void dec_1000a_intr_map(void *); +static void dec_1000a_intr_disable(int); +static void dec_1000a_intr_enable(int); +static void dec_1000a_intr_init(void); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); static const struct alpha_variation_table dec_1000_variations[] = { ==== //depot/projects/smpng/sys/alpha/alpha/dec_2100_a50.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: dec_2100_a50.c,v 1.39 1998/04/17 02:45:19 mjacob Exp $ */ -/* $FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.11 2001/06/01 17:38:57 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.12 2002/03/20 18:58:44 obrien Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. @@ -56,16 +56,16 @@ #endif static int comcnrate = CONSPEED; -void dec_2100_a50_init __P((void)); -static void dec_2100_a50_cons_init __P((void)); -static void dec_2100_a50_intr_map __P((void *)); -void sio_intr_establish __P((int)); -void sio_intr_disestablish __P((int)); -void sio_intr_setup __P((void)); +void dec_2100_a50_init(void); +static void dec_2100_a50_cons_init(void); +static void dec_2100_a50_intr_map(void *); +void sio_intr_establish(int); +void sio_intr_disestablish(int); +void sio_intr_setup(void); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); const struct alpha_variation_table dec_2100_a50_variations[] = { { SV_ST_AVANTI, "AlphaStation 400 4/233 (\"Avanti\")" }, ==== //depot/projects/smpng/sys/alpha/alpha/dec_2100_a500.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.10 2001/10/20 01:27:23 gallatin Exp $ + * $FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.11 2002/03/20 18:58:44 obrien Exp $ */ #include "opt_ddb.h" @@ -49,13 +49,13 @@ #endif static int comcnrate = CONSPEED; -void dec_2100_a500_init __P((int)); -static void dec_2100_a500_cons_init __P((void)); -static void dec_2100_a500_intr_init __P((void )); +void dec_2100_a500_init(int); +static void dec_2100_a500_cons_init(void); +static void dec_2100_a500_intr_init(void ); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); void dec_2100_a500_init(cputype) ==== //depot/projects/smpng/sys/alpha/alpha/dec_axppci_33.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.12 2001/06/01 17:38:57 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.13 2002/03/20 18:58:44 obrien Exp $ */ /* $NetBSD: dec_axppci_33.c,v 1.38 1998/07/07 08:49:12 ross Exp $ */ /* @@ -53,13 +53,13 @@ #endif static int comcnrate = CONSPEED; -void dec_axppci_33_init __P((void)); -static void dec_axppci_33_cons_init __P((void)); -static void dec_axppci_33_intr_map __P((void *)); +void dec_axppci_33_init(void); +static void dec_axppci_33_cons_init(void); +static void dec_axppci_33_intr_map(void *); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); const struct alpha_variation_table dec_axppci_33_variations[] = { { 0, "Alpha PC AXPpci33 (\"NoName\")" }, ==== //depot/projects/smpng/sys/alpha/alpha/dec_eb164.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_eb164.c,v 1.14 2001/06/01 17:38:57 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_eb164.c,v 1.15 2002/03/20 18:58:44 obrien Exp $ */ /* $NetBSD: dec_eb164.c,v 1.26 1998/04/17 02:45:19 mjacob Exp $ */ /* @@ -52,17 +52,17 @@ #endif static int comcnrate = CONSPEED; -void dec_eb164_init __P((void)); -static void dec_eb164_cons_init __P((void)); +void dec_eb164_init(void); +static void dec_eb164_cons_init(void); static void eb164_intr_init(void); extern void eb164_intr_enable(int irq); extern void eb164_intr_disable(int irq); extern void eb164_intr_enable_icsr(int irq); extern void eb164_intr_disable_icsr(int irq); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); void dec_eb164_init() ==== //depot/projects/smpng/sys/alpha/alpha/dec_eb64plus.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.9 2001/06/01 17:38:57 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.10 2002/03/20 18:58:44 obrien Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. @@ -73,9 +73,9 @@ #endif static int comcnrate = CONSPEED; -void dec_eb64plus_init __P((void)); -static void dec_eb64plus_cons_init __P((void)); -static void dec_eb64plus_intr_init __P((void)); +void dec_eb64plus_init(void); +static void dec_eb64plus_cons_init(void); +static void dec_eb64plus_intr_init(void); extern void eb64plus_intr_enable(int irq); /* ../pci/pci_eb64plus_intr.s */ extern void eb64plus_intr_disable(int irq); /* ../pci/pci_eb64plus_intr.s */ @@ -83,8 +83,8 @@ extern const char * bootdev_protocol(void); extern int bootdev_boot_dev_type(void); -extern int siocnattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int sccnattach(void); const struct alpha_variation_table dec_eb64plus_variations[] = { { 0, "DEC EB64-plus" }, ==== //depot/projects/smpng/sys/alpha/alpha/dec_kn20aa.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: dec_kn20aa.c,v 1.38 1998/04/17 02:45:19 mjacob Exp $ */ -/* $FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.12 2001/06/01 17:38:58 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.13 2002/03/20 18:58:44 obrien Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. @@ -54,19 +54,19 @@ #endif static int comcnrate = CONSPEED; -void dec_kn20aa_init __P((void)); -static void dec_kn20aa_cons_init __P((void)); -static void dec_kn20aa_intr_init __P((void)); -static void dec_kn20aa_intr_map __P((void *)); -static void dec_kn20aa_intr_disable __P((int)); -static void dec_kn20aa_intr_enable __P((int)); +void dec_kn20aa_init(void); +static void dec_kn20aa_cons_init(void); +static void dec_kn20aa_intr_init(void); +static void dec_kn20aa_intr_map(void *); +static void dec_kn20aa_intr_disable(int); +static void dec_kn20aa_intr_enable(int); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); #if 0 -static void dec_kn20aa_device_register __P((struct device *, void *)); +static void dec_kn20aa_device_register(struct device *, void *); #endif const struct alpha_variation_table dec_kn20aa_variations[] = { ==== //depot/projects/smpng/sys/alpha/alpha/dec_kn300.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.6 2001/10/11 21:48:02 mjacob Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.7 2002/03/20 18:58:44 obrien Exp $ */ /* * Copyright (c) 2000 by Matthew Jacob @@ -62,8 +62,8 @@ #endif static int comcnrate = CONSPEED; -void dec_kn300_init __P((void)); -void dec_kn300_cons_init __P((void)); +void dec_kn300_init(void); +void dec_kn300_cons_init(void); #define ALPHASERVER_4100 "AlphaServer 4100" @@ -73,9 +73,9 @@ }; -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); void dec_kn300_init() ==== //depot/projects/smpng/sys/alpha/alpha/dec_st550.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_st550.c,v 1.10 2001/06/01 17:38:58 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_st550.c,v 1.11 2002/03/20 18:58:44 obrien Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. * All rights reserved. @@ -59,20 +59,20 @@ #endif static int comcnrate = CONSPEED; -void st550_init __P((void)); -static void st550_cons_init __P((void)); -static void st550_intr_init __P((void)); -static void pyxis_intr_enable __P((int)); -static void pyxis_intr_disable __P((int)); -static void st550_intr_enable __P((int)); -static void st550_intr_disable __P((int)); -static void st550_intr_map __P((void *)); +void st550_init(void); +static void st550_cons_init(void); +static void st550_intr_init(void); +static void pyxis_intr_enable(int); +static void pyxis_intr_disable(int); +static void st550_intr_enable(int); +static void st550_intr_disable(int); +static void st550_intr_map(void *); #define ST550_PCI_IRQ_BEGIN 8 #define ST550_PCI_MAX_IRQ 47 -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); void st550_init() ==== //depot/projects/smpng/sys/alpha/alpha/dec_st6600.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/dec_st6600.c,v 1.11 2001/06/01 17:38:58 gallatin Exp $ + * $FreeBSD: src/sys/alpha/alpha/dec_st6600.c,v 1.12 2002/03/20 18:58:44 obrien Exp $ */ #include "opt_ddb.h" @@ -51,16 +51,16 @@ #endif static int comcnrate = CONSPEED; -void st6600_init __P((void)); -static void st6600_cons_init __P((void)); -static void st6600_intr_init __P((void)); +void st6600_init(void); +static void st6600_cons_init(void); +static void st6600_intr_init(void); #define ST6600_PCI_IRQ_BEGIN 8 #define ST6600_PCI_MAX_IRQ 63 -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); void st6600_init() ==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#14 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.64 2002/03/11 19:58:53 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.66 2002/03/21 06:14:57 imp Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ /* @@ -93,20 +93,20 @@ { struct thread *td; #ifdef SMP - critical_t s; + register_t s; #endif /* * Find our per-cpu globals. */ #ifdef SMP - s = cpu_critical_enter(); + s = intr_disable(); #endif pcpup = (struct pcpu *) alpha_pal_rdval(); td = curthread; #ifdef SMP td->td_md.md_kernnest++; - cpu_critical_exit(s); + intr_restore(s); #endif atomic_add_int(&td->td_intr_nesting_level, 1); #ifndef KSTACK_GUARD @@ -169,7 +169,7 @@ void set_iointr(niointr) - void (*niointr) __P((void *, unsigned long)); + void (*niointr)(void *, unsigned long); { if (platform.iointr) panic("set iointr twice"); ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#31 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.167 2002/03/13 19:16:41 des Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.169 2002/03/21 06:14:57 imp Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -186,7 +186,7 @@ SYSCTL_INT(_machdep, CPU_UNALIGNED_SIGBUS, unaligned_sigbus, CTLFLAG_RW, &alpha_unaligned_sigbus, 0, ""); -static void cpu_startup __P((void *)); +static void cpu_startup(void *); SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL) struct msgbuf *msgbufp=0; @@ -233,7 +233,7 @@ void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code); #endif -static void identifycpu __P((void)); +static void identifycpu(void); struct kva_md_info kmi; @@ -2020,13 +2020,13 @@ * For SMP, we should check the fpcurthread of each cpu. */ #ifndef SMP - critical_t s; + register_t s; - s = cpu_critical_enter(); + s = intr_disable(); if (td->td_pcb->pcb_hw.apcb_flags & ALPHA_PCB_FLAGS_FEN) if (td != PCPU_GET(fpcurthread)) panic("alpha_check_fpcurthread: bogus"); - cpu_critical_exit(s); + intr_restore(s); #endif } @@ -2046,9 +2046,9 @@ void alpha_fpstate_save(struct thread *td, int write) { - critical_t s; + register_t s; - s = cpu_critical_enter(); + s = intr_disable(); if (td != NULL && td == PCPU_GET(fpcurthread)) { /* * If curthread != fpcurthread, then we need to enable FEN @@ -2083,7 +2083,7 @@ alpha_pal_wrfen(0); } } - cpu_critical_exit(s); + intr_restore(s); } /* @@ -2094,9 +2094,9 @@ void alpha_fpstate_drop(struct thread *td) { - critical_t s; + register_t s; - s = cpu_critical_enter(); + s = intr_disable(); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203211742.g2LHgSX89318>