Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/alpha/include And more ANSI'ification!
details: https://anonhg.NetBSD.org/src/rev/ff4be6f0e727
branches: trunk
changeset: 487457:ff4be6f0e727
user: thorpej <thorpej%NetBSD.org@localhost>
date: Thu Jun 08 03:10:06 2000 +0000
description:
And more ANSI'ification!
diffstat:
sys/arch/alpha/include/alpha.h | 92 ++++----
sys/arch/alpha/include/alpha_cpu.h | 4 +-
sys/arch/alpha/include/autoconf.h | 14 +-
sys/arch/alpha/include/bus.h | 280 +++++++++++++++---------------
sys/arch/alpha/include/cpu.h | 6 +-
sys/arch/alpha/include/cpuconf.h | 24 +-
sys/arch/alpha/include/float.h | 4 +-
sys/arch/alpha/include/loadfile_machdep.h | 8 +-
sys/arch/alpha/include/lock.h | 11 +-
sys/arch/alpha/include/logout.h | 4 +-
sys/arch/alpha/include/param.h | 8 +-
sys/arch/alpha/include/pio.h | 16 +-
sys/arch/alpha/include/pmap.h | 20 +-
sys/arch/alpha/include/prom.h | 28 +-
sys/arch/alpha/include/reg.h | 6 +-
sys/arch/alpha/include/sysarch.h | 24 +-
sys/arch/alpha/include/z8530var.h | 14 +-
17 files changed, 277 insertions(+), 286 deletions(-)
diffs (truncated from 933 to 300 lines):
diff -r c00012c6aede -r ff4be6f0e727 sys/arch/alpha/include/alpha.h
--- a/sys/arch/alpha/include/alpha.h Thu Jun 08 03:05:17 2000 +0000
+++ b/sys/arch/alpha/include/alpha.h Thu Jun 08 03:10:06 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: alpha.h,v 1.9 2000/06/01 17:12:42 thorpej Exp $ */
+/* $NetBSD: alpha.h,v 1.10 2000/06/08 03:10:06 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -56,54 +56,54 @@
extern int bootdev_debug;
-void XentArith __P((u_int64_t, u_int64_t, u_int64_t)); /* MAGIC */
-void XentIF __P((u_int64_t, u_int64_t, u_int64_t)); /* MAGIC */
-void XentInt __P((u_int64_t, u_int64_t, u_int64_t)); /* MAGIC */
-void XentMM __P((u_int64_t, u_int64_t, u_int64_t)); /* MAGIC */
-void XentRestart __P((void)); /* MAGIC */
-void XentSys __P((u_int64_t, u_int64_t, u_int64_t)); /* MAGIC */
-void XentUna __P((u_int64_t, u_int64_t, u_int64_t)); /* MAGIC */
-void alpha_init __P((u_long, u_long, u_long, u_long, u_long));
-int alpha_pa_access __P((u_long));
-void ast __P((struct trapframe *));
-int badaddr __P((void *, size_t));
-int badaddr_read __P((void *, size_t, void *));
-void child_return __P((void *));
-u_int64_t console_restart __P((struct trapframe *));
-void do_sir __P((void));
-void dumpconf __P((void));
-void exception_return __P((void)); /* MAGIC */
-void frametoreg __P((struct trapframe *, struct reg *));
-long fswintrberr __P((void)); /* MAGIC */
-void init_bootstrap_console __P((void));
-void init_prom_interface __P((struct rpb *));
-void interrupt
- __P((unsigned long, unsigned long, unsigned long, struct trapframe *));
-void machine_check
- __P((unsigned long, struct trapframe *, unsigned long, unsigned long));
-u_int64_t hwrpb_checksum __P((void));
-void hwrpb_restart_setup __P((void));
-void regdump __P((struct trapframe *));
-void regtoframe __P((struct reg *, struct trapframe *));
-void savectx __P((struct pcb *));
-void switch_exit __P((struct proc *)); /* MAGIC */
-void switch_trampoline __P((void)); /* MAGIC */
-void syscall __P((u_int64_t, struct trapframe *));
-void trap __P((unsigned long, unsigned long, unsigned long, unsigned long,
- struct trapframe *));
-void trap_init __P((void));
-void enable_nsio_ide __P((bus_space_tag_t));
-char * dot_conv __P((unsigned long));
+void XentArith(u_int64_t, u_int64_t, u_int64_t); /* MAGIC */
+void XentIF(u_int64_t, u_int64_t, u_int64_t); /* MAGIC */
+void XentInt(u_int64_t, u_int64_t, u_int64_t); /* MAGIC */
+void XentMM(u_int64_t, u_int64_t, u_int64_t); /* MAGIC */
+void XentRestart(void); /* MAGIC */
+void XentSys(u_int64_t, u_int64_t, u_int64_t); /* MAGIC */
+void XentUna(u_int64_t, u_int64_t, u_int64_t); /* MAGIC */
+void alpha_init(u_long, u_long, u_long, u_long, u_long);
+int alpha_pa_access(u_long);
+void ast(struct trapframe *);
+int badaddr(void *, size_t);
+int badaddr_read(void *, size_t, void *);
+void child_return(void *);
+u_int64_t console_restart(struct trapframe *);
+void do_sir(void);
+void dumpconf(void);
+void exception_return(void); /* MAGIC */
+void frametoreg(struct trapframe *, struct reg *);
+long fswintrberr(void); /* MAGIC */
+void init_bootstrap_console(void);
+void init_prom_interface(struct rpb *);
+void interrupt(unsigned long, unsigned long, unsigned long,
+ struct trapframe *);
+void machine_check(unsigned long, struct trapframe *, unsigned long,
+ unsigned long);
+u_int64_t hwrpb_checksum(void);
+void hwrpb_restart_setup(void);
+void regdump(struct trapframe *);
+void regtoframe(struct reg *, struct trapframe *);
+void savectx(struct pcb *);
+void switch_exit(struct proc *); /* MAGIC */
+void switch_trampoline(void); /* MAGIC */
+void syscall(u_int64_t, struct trapframe *);
+void trap(unsigned long, unsigned long, unsigned long, unsigned long,
+ struct trapframe *);
+void trap_init(void);
+void enable_nsio_ide(bus_space_tag_t);
+char * dot_conv(unsigned long);
/* Multiprocessor glue; cpu.c */
struct cpu_info;
-int cpu_iccb_send __P((long, const char *));
-void cpu_iccb_receive __P((void));
-void cpu_hatch __P((struct cpu_info *));
-void cpu_halt_secondary __P((unsigned long));
-void cpu_spinup_trampoline __P((void)); /* MAGIC */
-void cpu_pause __P((unsigned long));
-void cpu_resume __P((unsigned long));
+int cpu_iccb_send(long, const char *);
+void cpu_iccb_receive(void);
+void cpu_hatch(struct cpu_info *);
+void cpu_halt_secondary(unsigned long);
+void cpu_spinup_trampoline(void); /* MAGIC */
+void cpu_pause(unsigned long);
+void cpu_resume(unsigned long);
#endif /* _KERNEL */
#endif /* _ALPHA_H_ */
diff -r c00012c6aede -r ff4be6f0e727 sys/arch/alpha/include/alpha_cpu.h
--- a/sys/arch/alpha/include/alpha_cpu.h Thu Jun 08 03:05:17 2000 +0000
+++ b/sys/arch/alpha/include/alpha_cpu.h Thu Jun 08 03:10:06 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: alpha_cpu.h,v 1.40 2000/06/08 02:53:47 thorpej Exp $ */
+/* $NetBSD: alpha_cpu.h,v 1.41 2000/06/08 03:10:06 thorpej Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -315,7 +315,7 @@
/*
* Misc. support routines.
*/
-const char *alpha_dsr_sysname __P((void));
+const char *alpha_dsr_sysname(void);
/*
* Stubs for Alpha instructions normally inaccessible from C.
diff -r c00012c6aede -r ff4be6f0e727 sys/arch/alpha/include/autoconf.h
--- a/sys/arch/alpha/include/autoconf.h Thu Jun 08 03:05:17 2000 +0000
+++ b/sys/arch/alpha/include/autoconf.h Thu Jun 08 03:10:06 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.18 2000/06/05 21:47:18 thorpej Exp $ */
+/* $NetBSD: autoconf.h,v 1.19 2000/06/08 03:10:06 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -72,9 +72,9 @@
char booted_kernel[64]; /* 80: name of booted kernel */
void *hwrpb; /* 144: hwrpb pointer (BEVA) */
u_long hwrpbsize; /* 152: size of hwrpb data */
- int (*cngetc) __P((void)); /* 160: console getc pointer */
- void (*cnputc) __P((int)); /* 168: console putc pointer */
- void (*cnpollc) __P((int)); /* 176: console pollc pointer */
+ int (*cngetc)(void); /* 160: console getc pointer */
+ void (*cnputc)(int); /* 168: console putc pointer */
+ void (*cnpollc)(int); /* 176: console pollc pointer */
u_long pad[9]; /* 184: rsvd for future use */
/* 256: total size */
};
@@ -112,7 +112,7 @@
extern struct bootdev_data *bootdev_data;
extern struct bootinfo_kernel bootinfo;
-const char *alpha_variation_name __P((u_int64_t,
- const struct alpha_variation_table *));
-const char *alpha_unknown_sysname __P((void));
+const char *alpha_variation_name(u_int64_t,
+ const struct alpha_variation_table *);
+const char *alpha_unknown_sysname(void);
#endif /* _KERNEL */
diff -r c00012c6aede -r ff4be6f0e727 sys/arch/alpha/include/bus.h
--- a/sys/arch/alpha/include/bus.h Thu Jun 08 03:05:17 2000 +0000
+++ b/sys/arch/alpha/include/bus.h Thu Jun 08 03:10:06 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.38 2000/04/17 17:30:48 drochner Exp $ */
+/* $NetBSD: bus.h,v 1.39 2000/06/08 03:10:06 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -124,122 +124,122 @@
void *abs_cookie;
/* mapping/unmapping */
- int (*abs_map) __P((void *, bus_addr_t, bus_size_t,
- int, bus_space_handle_t *, int));
- void (*abs_unmap) __P((void *, bus_space_handle_t,
- bus_size_t, int));
- int (*abs_subregion) __P((void *, bus_space_handle_t,
- bus_size_t, bus_size_t, bus_space_handle_t *));
+ int (*abs_map)(void *, bus_addr_t, bus_size_t,
+ int, bus_space_handle_t *, int);
+ void (*abs_unmap)(void *, bus_space_handle_t,
+ bus_size_t, int);
+ int (*abs_subregion)(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, bus_space_handle_t *);
/* ALPHA SPECIFIC MAPPING METHOD */
- int (*abs_translate) __P((void *, bus_addr_t, bus_size_t,
- int, struct alpha_bus_space_translation *));
- int (*abs_get_window) __P((void *, int,
- struct alpha_bus_space_translation *));
+ int (*abs_translate)(void *, bus_addr_t, bus_size_t,
+ int, struct alpha_bus_space_translation *);
+ int (*abs_get_window)(void *, int,
+ struct alpha_bus_space_translation *);
/* allocation/deallocation */
- int (*abs_alloc) __P((void *, bus_addr_t, bus_addr_t,
+ int (*abs_alloc)(void *, bus_addr_t, bus_addr_t,
bus_size_t, bus_size_t, bus_size_t, int,
- bus_addr_t *, bus_space_handle_t *));
- void (*abs_free) __P((void *, bus_space_handle_t,
- bus_size_t));
+ bus_addr_t *, bus_space_handle_t *);
+ void (*abs_free)(void *, bus_space_handle_t,
+ bus_size_t);
/* get kernel virtual address */
- void * (*abs_vaddr) __P((void *, bus_space_handle_t));
+ void * (*abs_vaddr)(void *, bus_space_handle_t);
/* barrier */
- void (*abs_barrier) __P((void *, bus_space_handle_t,
- bus_size_t, bus_size_t, int));
+ void (*abs_barrier)(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, int);
/* read (single) */
- u_int8_t (*abs_r_1) __P((void *, bus_space_handle_t,
- bus_size_t));
- u_int16_t (*abs_r_2) __P((void *, bus_space_handle_t,
- bus_size_t));
- u_int32_t (*abs_r_4) __P((void *, bus_space_handle_t,
- bus_size_t));
- u_int64_t (*abs_r_8) __P((void *, bus_space_handle_t,
- bus_size_t));
+ u_int8_t (*abs_r_1)(void *, bus_space_handle_t,
+ bus_size_t);
+ u_int16_t (*abs_r_2)(void *, bus_space_handle_t,
+ bus_size_t);
+ u_int32_t (*abs_r_4)(void *, bus_space_handle_t,
+ bus_size_t);
+ u_int64_t (*abs_r_8)(void *, bus_space_handle_t,
+ bus_size_t);
/* read multiple */
- void (*abs_rm_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
- void (*abs_rm_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
- void (*abs_rm_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
- void (*abs_rm_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+ void (*abs_rm_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+ void (*abs_rm_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+ void (*abs_rm_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+ void (*abs_rm_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* read region */
- void (*abs_rr_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
- void (*abs_rr_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
- void (*abs_rr_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
- void (*abs_rr_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+ void (*abs_rr_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+ void (*abs_rr_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+ void (*abs_rr_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+ void (*abs_rr_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* write (single) */
- void (*abs_w_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t));
- void (*abs_w_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t));
- void (*abs_w_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t));
- void (*abs_w_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t));
+ void (*abs_w_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t);
+ void (*abs_w_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t);
+ void (*abs_w_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t);
+ void (*abs_w_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t);
/* write multiple */
- void (*abs_wm_1) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
- void (*abs_wm_2) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
- void (*abs_wm_4) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
- void (*abs_wm_8) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+ void (*abs_wm_1)(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
Home |
Main Index |
Thread Index |
Old Index