Date: Fri, 14 Jun 2002 15:28:21 -0700 (PDT) From: Bosko Milekic <bmilekic@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 12943 for review Message-ID: <200206142228.g5EMSLY74695@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12943 Change 12943 by bmilekic@bmilekic_freefall on 2002/06/14 15:28:10 IFC. Affected files ... ... //depot/projects/interrupt/sys/alpha/alpha/api_up1000.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/autoconf.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/busdma_machdep.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/clock.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/cpuconf.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/critical.c#1 branch ... //depot/projects/interrupt/sys/alpha/alpha/db_disasm.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/db_instruction.h#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/db_interface.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/db_trace.c#3 integrate ... //depot/projects/interrupt/sys/alpha/alpha/dec_1000a.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/dec_2100_a50.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/dec_2100_a500.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/dec_axppci_33.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/dec_eb164.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/dec_eb64plus.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/dec_kn20aa.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/dec_kn300.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/dec_st550.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/dec_st6600.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/dump_machdep.c#1 branch ... //depot/projects/interrupt/sys/alpha/alpha/elf_machdep.c#3 integrate ... //depot/projects/interrupt/sys/alpha/alpha/exception.s#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/genassym.c#3 integrate ... //depot/projects/interrupt/sys/alpha/alpha/interrupt.c#5 integrate ... //depot/projects/interrupt/sys/alpha/alpha/machdep.c#4 integrate ... //depot/projects/interrupt/sys/alpha/alpha/mem.c#3 integrate ... //depot/projects/interrupt/sys/alpha/alpha/mp_machdep.c#4 integrate ... //depot/projects/interrupt/sys/alpha/alpha/pal.s#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/pmap.c#4 integrate ... //depot/projects/interrupt/sys/alpha/alpha/prom.c#3 integrate ... //depot/projects/interrupt/sys/alpha/alpha/prom_disp.s#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/promcons.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/support.s#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/sys_machdep.c#4 integrate ... //depot/projects/interrupt/sys/alpha/alpha/trap.c#5 integrate ... //depot/projects/interrupt/sys/alpha/alpha/vm_machdep.c#3 integrate ... //depot/projects/interrupt/sys/alpha/conf/GENERIC#3 integrate ... //depot/projects/interrupt/sys/alpha/conf/SIMOS#2 integrate ... //depot/projects/interrupt/sys/alpha/include/ansi.h#3 integrate ... //depot/projects/interrupt/sys/alpha/include/asm.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/atomic.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/bootinfo.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/clock.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/cpu.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/cpuconf.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/cpufunc.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/critical.h#1 branch ... //depot/projects/interrupt/sys/alpha/include/db_machdep.h#3 integrate ... //depot/projects/interrupt/sys/alpha/include/elf.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/endian.h#5 integrate ... //depot/projects/interrupt/sys/alpha/include/float.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/md_var.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/param.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/pmap.h#3 integrate ... //depot/projects/interrupt/sys/alpha/include/proc.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/profile.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/prom.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/reg.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/runq.h#1 branch ... //depot/projects/interrupt/sys/alpha/include/stdarg.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/sysarch.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/varargs.h#2 integrate ... //depot/projects/interrupt/sys/alpha/isa/isa_dma.c#2 integrate ... //depot/projects/interrupt/sys/alpha/linux/linux_dummy.c#2 integrate ... //depot/projects/interrupt/sys/alpha/linux/linux_proto.h#3 integrate ... //depot/projects/interrupt/sys/alpha/linux/linux_sysvec.c#3 integrate ... //depot/projects/interrupt/sys/alpha/mcbus/mcbus.c#2 integrate ... //depot/projects/interrupt/sys/alpha/mcbus/mcbusvar.h#2 integrate ... //depot/projects/interrupt/sys/alpha/mcbus/mcpcia.c#3 integrate ... //depot/projects/interrupt/sys/alpha/mcbus/mcpciavar.h#2 integrate ... //depot/projects/interrupt/sys/alpha/osf1/imgact_osf1.c#3 integrate ... //depot/projects/interrupt/sys/alpha/osf1/osf1.h#2 integrate ... //depot/projects/interrupt/sys/alpha/osf1/osf1_ioctl.c#2 integrate ... //depot/projects/interrupt/sys/alpha/osf1/osf1_misc.c#4 integrate ... //depot/projects/interrupt/sys/alpha/osf1/osf1_mount.c#3 integrate ... //depot/projects/interrupt/sys/alpha/osf1/osf1_proto.h#2 integrate ... //depot/projects/interrupt/sys/alpha/osf1/osf1_signal.c#2 integrate ... //depot/projects/interrupt/sys/alpha/osf1/osf1_signal.h#2 integrate ... //depot/projects/interrupt/sys/alpha/osf1/osf1_sysvec.c#2 integrate ... //depot/projects/interrupt/sys/alpha/osf1/osf1_util.h#2 integrate ... //depot/projects/interrupt/sys/alpha/pci/cia.c#2 integrate ... //depot/projects/interrupt/sys/alpha/pci/irongate_pci.c#3 integrate ... //depot/projects/interrupt/sys/alpha/pci/lca.c#2 integrate ... //depot/projects/interrupt/sys/alpha/pci/lca_pci.c#3 integrate ... //depot/projects/interrupt/sys/alpha/pci/t2.c#2 integrate ... //depot/projects/interrupt/sys/alpha/pci/t2_pci.c#3 integrate ... //depot/projects/interrupt/sys/alpha/pci/tsunami.c#2 integrate ... //depot/projects/interrupt/sys/alpha/pci/tsunami_pci.c#3 integrate ... //depot/projects/interrupt/sys/alpha/tc/am7990.c#3 integrate ... //depot/projects/interrupt/sys/alpha/tc/am7990var.h#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/ascvar.h#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/esp.c#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/if_le_dec.c#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/if_le_ioasic.c#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/if_levar.h#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/ioasic.c#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/ioasicvar.h#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/sticvar.h#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/tc.c#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/tcds.c#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/tcdsreg.h#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/tcdsvar.h#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/tcvar.h#2 integrate ... //depot/projects/interrupt/sys/alpha/tlsb/zs_tlsb.c#2 integrate Differences ... ==== //depot/projects/interrupt/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/interrupt/sys/alpha/alpha/autoconf.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/autoconf.c,v 1.49 2001/10/24 17:42:01 jlemon Exp $ + * $FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.51 2002/03/31 07:15:24 phk 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> @@ -71,9 +71,6 @@ extern int nfs_diskless_valid; /* XXX use include file */ -dev_t rootdev = NODEV; -dev_t dumpdev = NODEV; - static void configure_start() { ==== //depot/projects/interrupt/sys/alpha/alpha/busdma_machdep.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/busdma_machdep.c,v 1.22 2002/01/05 08:47:09 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.23 2002/04/04 21:03:13 jhb Exp $ */ #include <sys/param.h> @@ -600,7 +600,7 @@ count = 0; if (total_bpages == 0) { - mtx_init(&bounce_lock, "BouncePage", MTX_DEF); + mtx_init(&bounce_lock, "BouncePage", NULL, MTX_DEF); STAILQ_INIT(&bounce_page_list); STAILQ_INIT(&bounce_map_waitinglist); STAILQ_INIT(&bounce_map_callbacklist); ==== //depot/projects/interrupt/sys/alpha/alpha/clock.c#2 (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.31 2002/05/26 11:23:00 des Exp $ */ /* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */ /* @@ -124,9 +124,6 @@ "alpha" /* name */ }; -SYSCTL_OPAQUE(_debug, OID_AUTO, alpha_timecounter, CTLFLAG_RD, - &alpha_timecounter, sizeof(alpha_timecounter), "S,timecounter", ""); - static struct timecounter i8254_timecounter = { i8254_get_timecount, /* get_timecount */ 0, /* no poll_pps */ @@ -135,9 +132,6 @@ "i8254" /* name */ }; -SYSCTL_OPAQUE(_debug, OID_AUTO, i8254_timecounter, CTLFLAG_RD, - &i8254_timecounter, sizeof(i8254_timecounter), "S,timecounter", ""); - /* Values for timerX_state: */ #define RELEASED 0 #define RELEASE_PENDING 1 @@ -216,6 +210,8 @@ out: #ifdef EVCNT_COUNTERS evcnt_attach(dev, "intr", &clock_intr_evcnt); +#else + /* nothing */ ; #endif } @@ -286,7 +282,7 @@ } stathz = hz / 8; - platform.clockintr = (void (*) __P((void *))) handleclock; + platform.clockintr = (void (*)(void *)) handleclock; /* * Get the clock started. @@ -488,7 +484,7 @@ struct timespec ts; if (base < 5*SECYR) { - printf("WARNING: preposterous time in file system"); + printf("WARNING: preposterous time in filesystem"); /* read the system clock anyway */ base = 6*SECYR + 186*SECDAY + SECDAY/2; badbase = 1; @@ -515,7 +511,7 @@ if (ct.year < 70 || ct.mon < 1 || ct.mon > 12 || ct.day < 1 || ct.day > 31 || ct.hour > 23 || ct.min > 59 || ct.sec > 59) { /* - * Believe the time in the file system for lack of + * Believe the time in the filesystem for lack of * anything better, resetting the TODR. */ s = splclock(); ==== //depot/projects/interrupt/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/interrupt/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/interrupt/sys/alpha/alpha/db_instruction.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.4 2001/03/05 21:21:01 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.5 2002/04/13 22:21:28 obrien Exp $ */ /* $NetBSD: db_instruction.h,v 1.4 1997/09/16 22:53:32 thorpej Exp $ */ /* @@ -172,7 +172,7 @@ } alpha_instruction; -#endif !defined(ASSEMBLER) +#endif /* !defined(ASSEMBLER) */ /* * ==== //depot/projects/interrupt/sys/alpha/alpha/db_interface.c#2 (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/interrupt/sys/alpha/alpha/db_trace.c#3 (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/interrupt/sys/alpha/alpha/dec_1000a.c#2 (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/interrupt/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/interrupt/sys/alpha/alpha/dec_2100_a500.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_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/interrupt/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.15 2002/04/17 15:32:11 ticso 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 int dec_axppci_33_intr_route (device_t, device_t, 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); const struct alpha_variation_table dec_axppci_33_variations[] = { { 0, "Alpha PC AXPpci33 (\"NoName\")" }, @@ -93,7 +93,8 @@ platform.iobus = "lca"; platform.cons_init = dec_axppci_33_cons_init; - platform.pci_intr_map = dec_axppci_33_intr_map; + platform.pci_intr_route = dec_axppci_33_intr_route; + platform.pci_intr_map = NULL; lca_init(); @@ -167,16 +168,13 @@ #define SIO_PCIREG_PIRQ_RTCTRL 0x60 /* PIRQ0 Route Control */ -void -dec_axppci_33_intr_map(void *arg) +static int +dec_axppci_33_intr_route(device_t pcib, device_t dev, int pin) { - pcicfgregs *cfg; int pirq; u_int32_t pirqreg; u_int8_t pirqline; - cfg = (pcicfgregs *)arg; - #ifndef DIAGNOSTIC pirq = 0; /* XXX gcc -Wuninitialized */ #endif @@ -185,23 +183,22 @@ * Slot->interrupt translation. Taken from NetBSD. */ - if (cfg->intpin == 0) { + if (pin == 0) { /* No IRQ used. */ - return; + return -1; } - if (cfg->intpin > 4) { - printf("dec_axppci_33_intr_map: bad interrupt pin %d\n", - cfg->intpin); - return; + if (pin > 4) { + printf("dec_axppci_33_intr_route: bad interrupt pin %d\n", pin); + return -1; } - switch (cfg->slot) { + switch (pci_get_slot(dev)) { case 6: /* NCR SCSI */ pirq = 3; break; case 11: /* slot 1 */ - switch (cfg->intpin) { + switch (pin) { case 1: case 4: pirq = 0; @@ -214,14 +211,14 @@ break; #ifdef DIAGNOSTIC default: /* XXX gcc -Wuninitialized */ - panic("dec_axppci_33_intr_map: bogus PCI pin %d\n", - cfg->intpin); + panic("dec_axppci_33_intr_route: bogus PCI pin %d\n", + pin); #endif }; break; case 12: /* slot 2 */ - switch (cfg->intpin) { + switch (pin) { case 1: case 4: pirq = 1; @@ -234,14 +231,14 @@ break; #ifdef DIAGNOSTIC default: /* XXX gcc -Wuninitialized */ - panic("dec_axppci_33_intr_map: bogus PCI pin %d\n", - cfg->intpin); + panic("dec_axppci_33_intr_route: bogus PCI pin %d\n", + pin); #endif }; break; case 8: /* slot 3 */ - switch (cfg->intpin) { + switch (pin) { case 1: case 4: pirq = 2; @@ -254,33 +251,24 @@ break; #ifdef DIAGNOSTIC default: /* XXX gcc -Wuninitialized */ - panic("dec_axppci_33_intr_map bogus: PCI pin %d\n", - cfg->intpin); + panic("dec_axppci_33_intr_route bogus: PCI pin %d\n", + pin); #endif }; break; default: - printf("dec_axppci_33_intr_map: weird device number %d\n", - cfg->slot); - return; + printf("dec_axppci_33_intr_route: weird device number %d\n", + pci_get_slot(dev)); + return -1; } pirqreg = lca_pcib_read_config(0, 0, 7, 0, SIO_PCIREG_PIRQ_RTCTRL, 4); -#if 0 - printf("dec_axppci_33_intr_map: device %d pin %c: pirq %d, reg = %x\n", - device, '@' + cfg->intpin, pirq, pirqreg); -#endif pirqline = (pirqreg >> (pirq * 8)) & 0xff; if ((pirqline & 0x80) != 0) panic("bad pirqline %d",pirqline); pirqline &= 0xf; -#if 0 - printf("dec_axppci_33_intr_map: device %d pin %c: mapped to line %d\n", - device, '@' + cfg->intpin, pirqline); -#endif - - cfg->intline = pirqline; + return(pirqline); } ==== //depot/projects/interrupt/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/interrupt/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.11 2002/03/29 23:05:05 wilko Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. @@ -31,21 +31,20 @@ */ /* - * Port to based on NetBSD/axp by Wilko Bulte <wilko@freebsd.org> * FreeBSD version based on: * NetBSD: dec_eb64plus.c,v 1.15 1998/11/19 02:20:07 ross Exp * - * Some info on the Aspen Alpine as this might be hard to come by: + * Some info on the Aspen Alpine which might be hard to come by: * - Hardware is close enough to the DEC EB64+ design to allow it to run - * the EB64+ SRM console f/w - * - 3 PCI slots, closest to the SIMMs: Alpine calls this slot C - * the middle one Alpine calls this slot B - * the 3rd one is Alpine calls this slot A - * (A, B, C is silkscreened on the PCB) + * the EB64+ SRM console firmware + * - 3 PCI slots, closest to the SIMMs: Alpine calls this one slot C + * the middle one Alpine calls slot B + * the 3rd one Alpine calls slot A + * (A, B, C are silkscreened on the PCB) * - embedded NCR810, located at PCI slot 5 * - 3 ISA slots, hanging off an Intel 82378IB PCI-ISA bridge at PCI slot 8 - * - embedded floppy, PC keyboard interface, PS/2 mouse interface, 2x serial - * ports and a parallel port. All of this hiding after the ISA bridge + * - embedded floppy, PC keyboard interface, PS/2 mouse interface, 2 serial + * ports and a parallel port. All of this hanging off the ISA bridge */ #include "opt_ddb.h" @@ -73,9 +72,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 +82,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/interrupt/sys/alpha/alpha/dec_kn20aa.c#2 (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/interrupt/sys/alpha/alpha/dec_kn300.c#2 (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 $ */ >>> 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?200206142228.g5EMSLY74695>