diff options
Diffstat (limited to 'sys/arch/mvmeppc')
31 files changed, 408 insertions, 411 deletions
diff --git a/sys/arch/mvmeppc/ddb/db_interface.c b/sys/arch/mvmeppc/ddb/db_interface.c index fa9bda71272..5bc4ffe6a4d 100644 --- a/sys/arch/mvmeppc/ddb/db_interface.c +++ b/sys/arch/mvmeppc/ddb/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.1 2001/06/26 21:57:39 smurph Exp $ */ +/* $OpenBSD: db_interface.c,v 1.2 2002/03/14 01:26:41 millert Exp $ */ #include <sys/param.h> #include <sys/proc.h> @@ -15,8 +15,8 @@ extern label_t *db_recover; -void ddb_trap __P((void)); /* Call into trap_subr.S */ -int ddb_trap_glue __P((struct trapframe *)); /* Called from trap_subr.S */ +void ddb_trap(void); /* Call into trap_subr.S */ +int ddb_trap_glue(struct trapframe *); /* Called from trap_subr.S */ void Debugger() diff --git a/sys/arch/mvmeppc/dev/bugtty.c b/sys/arch/mvmeppc/dev/bugtty.c index 6a7a8350a23..2067fded26c 100644 --- a/sys/arch/mvmeppc/dev/bugtty.c +++ b/sys/arch/mvmeppc/dev/bugtty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bugtty.c,v 1.3 2002/02/15 20:45:30 nordin Exp $ */ +/* $OpenBSD: bugtty.c,v 1.4 2002/03/14 01:26:41 millert Exp $ */ /* Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1995 Dale Rahn. * All rights reserved. @@ -46,8 +46,8 @@ #include "bugtty.h" -int bugttymatch __P((struct device *parent, void *self, void *aux)); -void bugttyattach __P((struct device *parent, struct device *self, void *aux)); +int bugttymatch(struct device *parent, void *self, void *aux); +void bugttyattach(struct device *parent, struct device *self, void *aux); struct cfattach bugtty_ca = { sizeof(struct device), bugttymatch, bugttyattach @@ -58,21 +58,21 @@ struct cfdriver bugtty_cd = { }; /* prototypes */ -int bugttycnprobe __P((struct consdev *cp)); -int bugttycninit __P((struct consdev *cp)); -int bugttycngetc __P((dev_t dev)); -void bugttycnputc __P((dev_t dev, char c)); - -int bugttyopen __P((dev_t dev, int flag, int mode, struct proc *p)); -int bugttyclose __P((dev_t dev, int flag, int mode, struct proc *p)); -int bugttyread __P((dev_t dev, struct uio *uio, int flag)); -int bugttywrite __P((dev_t dev, struct uio *uio, int flag)); -int bugttyioctl __P((dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)); -int bugttystop __P((struct tty *tp, int flag)); - -struct tty *bugttytty __P((dev_t dev)); -int bugttymctl __P((dev_t dev, int bits, int how)); -int bugttyparam __P((struct tty *tp, struct termios *tm)); +int bugttycnprobe(struct consdev *cp); +int bugttycninit(struct consdev *cp); +int bugttycngetc(dev_t dev); +void bugttycnputc(dev_t dev, char c); + +int bugttyopen(dev_t dev, int flag, int mode, struct proc *p); +int bugttyclose(dev_t dev, int flag, int mode, struct proc *p); +int bugttyread(dev_t dev, struct uio *uio, int flag); +int bugttywrite(dev_t dev, struct uio *uio, int flag); +int bugttyioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p); +int bugttystop(struct tty *tp, int flag); + +struct tty *bugttytty(dev_t dev); +int bugttymctl(dev_t dev, int bits, int how); +int bugttyparam(struct tty *tp, struct termios *tm); #define DIALOUT(x) ((x) & 0x80) #define SWFLAGS(dev) (bugttyswflags | (DIALOUT(dev) ? TIOCFLAG_SOFTCAR : 0)) @@ -115,7 +115,7 @@ bugttyattach(parent, self, aux) } #define BUGTTYUNIT(x) ((x) & (0x7f)) -void bugttyoutput __P((struct tty *tp)); +void bugttyoutput(struct tty *tp); int bugttydefaultrate = TTYDEF_SPEED; int bugttyswflags; diff --git a/sys/arch/mvmeppc/dev/clock.c b/sys/arch/mvmeppc/dev/clock.c index 604912e9dd4..c5cf7eb219a 100644 --- a/sys/arch/mvmeppc/dev/clock.c +++ b/sys/arch/mvmeppc/dev/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.3 2001/11/06 22:45:54 miod Exp $ */ +/* $OpenBSD: clock.c,v 1.4 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: clock.c,v 1.1 1996/09/30 16:34:40 ws Exp $ */ /* @@ -61,7 +61,7 @@ static volatile u_long lasttb; #define YEAR0 1900 static u_long -chiptotime __P((int sec, int min, int hour, int day, int mon, int year)); +chiptotime(int sec, int min, int hour, int day, int mon, int year); struct chiptime { int sec; @@ -73,7 +73,7 @@ struct chiptime { int year; }; -static void timetochip __P((struct chiptime *c)); +static void timetochip(struct chiptime *c); /* * For now we let the machine run with boot time, not changing the clock diff --git a/sys/arch/mvmeppc/dev/mainbus.c b/sys/arch/mvmeppc/dev/mainbus.c index 53c8bb892a2..e05f756d126 100644 --- a/sys/arch/mvmeppc/dev/mainbus.c +++ b/sys/arch/mvmeppc/dev/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.2 2001/11/06 22:45:54 miod Exp $ */ +/* $OpenBSD: mainbus.c,v 1.3 2002/03/14 01:26:41 millert Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -40,9 +40,9 @@ struct mainbus_softc { }; /* Definition of the mainbus driver. */ -static int mbmatch __P((struct device *, void *, void *)); -static void mbattach __P((struct device *, struct device *, void *)); -static int mbprint __P((void *, const char *)); +static int mbmatch(struct device *, void *, void *); +static void mbattach(struct device *, struct device *, void *); +static int mbprint(void *, const char *); struct cfattach mainbus_ca = { sizeof(struct device), mbmatch, mbattach @@ -52,9 +52,9 @@ struct cfdriver mainbus_cd = { }; void mb_intr_establish __P((struct confargs *, int (*)(void *), void *)); -void mb_intr_disestablish __P((struct confargs *)); -caddr_t mb_cvtaddr __P((struct confargs *)); -int mb_matchname __P((struct confargs *, char *)); +void mb_intr_disestablish(struct confargs *); +caddr_t mb_cvtaddr(struct confargs *); +int mb_matchname(struct confargs *, char *); static int attached = 0; @@ -126,7 +126,7 @@ mbprint(aux, pnp) void mb_intr_establish(ca, handler, val) struct confargs *ca; - int (*handler) __P((void *)); + int (*handler)(void *); void *val; { panic("can never mb_intr_establish"); diff --git a/sys/arch/mvmeppc/dev/openpic.c b/sys/arch/mvmeppc/dev/openpic.c index 50130548f12..a01dc38ebe7 100644 --- a/sys/arch/mvmeppc/dev/openpic.c +++ b/sys/arch/mvmeppc/dev/openpic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: openpic.c,v 1.6 2001/11/06 22:45:54 miod Exp $ */ +/* $OpenBSD: openpic.c,v 1.7 2002/03/14 01:26:41 millert Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -85,7 +85,7 @@ static int virq_max = 0; struct evcnt evirq[ICU_LEN]; -static int fakeintr __P((void *)); +static int fakeintr(void *); static char *intr_typename(int type); static void intr_calculatemasks(); static __inline int cntlzw(int x); @@ -97,29 +97,29 @@ static struct raven_reg *ravenp = (struct raven_reg *)NULL; #define HWIRQ_MAX 27 #define HWIRQ_MASK 0x0fffffff -static __inline u_int openpic_read __P((int)); -static __inline void openpic_write __P((int, u_int)); -void openpic_enable_irq __P((int, int)); -void openpic_disable_irq __P((int)); +static __inline u_int openpic_read(int); +static __inline void openpic_write(int, u_int); +void openpic_enable_irq(int, int); +void openpic_disable_irq(int); void openpic_init(); -void openpic_set_priority __P((int, int)); -void openpic_set_vec_pri __P((int, int)); -static __inline int openpic_read_irq __P((int)); -static __inline void openpic_eoi __P((int)); - -void i8259_init __P((void)); -int i8259_intr __P((void)); -void i8259_enable_irq __P((int, int)); -void i8259_disable_irq __P((int)); +void openpic_set_priority(int, int); +void openpic_set_vec_pri(int, int); +static __inline int openpic_read_irq(int); +static __inline void openpic_eoi(int); + +void i8259_init(void); +int i8259_intr(void); +void i8259_enable_irq(int, int); +void i8259_disable_irq(int); void *i8259_intr_establish( void * lcv, int irq, int type, int level, - int (*ih_fun) __P((void *)), void *ih_arg, char *name); + int (*ih_fun)(void *), void *ih_arg, char *name); struct openpic_softc { struct device sc_dev; }; -int openpic_match __P((struct device *parent, void *cf, void *aux)); -void openpic_attach __P((struct device *, struct device *, void *)); +int openpic_match(struct device *parent, void *cf, void *aux); +void openpic_attach(struct device *, struct device *, void *); void openpic_do_pending_int(); void ext_intr_openpic(); @@ -176,11 +176,11 @@ typedef int mac_intr_handle_t; typedef void *(intr_establish_t) __P((void *, mac_intr_handle_t, int, int, int (*func)(void *), void *, char *)); -typedef void (intr_disestablish_t) __P((void *, void *)); +typedef void (intr_disestablish_t)(void *, void *); static vaddr_t openpic_base; void * openpic_intr_establish( void * lcv, int irq, int type, int level, - int (*ih_fun) __P((void *)), void *ih_arg, char *name); + int (*ih_fun)(void *), void *ih_arg, char *name); void openpic_intr_disestablish( void *lcp, void *arg); void openpic_collect_preconf_intr(); @@ -279,7 +279,7 @@ void * lcv; int irq; int type; int level; -int (*ih_fun) __P((void *)); +int (*ih_fun)(void *); void *ih_arg; char *name; { @@ -365,7 +365,7 @@ void * lcv; int irq; int type; int level; -int (*ih_fun) __P((void *)); +int (*ih_fun)(void *); void *ih_arg; char *name; { diff --git a/sys/arch/mvmeppc/dev/raven.c b/sys/arch/mvmeppc/dev/raven.c index c6139eeb5bc..72ccc831778 100644 --- a/sys/arch/mvmeppc/dev/raven.c +++ b/sys/arch/mvmeppc/dev/raven.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raven.c,v 1.3 2001/11/06 22:45:54 miod Exp $ */ +/* $OpenBSD: raven.c,v 1.4 2002/03/14 01:26:41 millert Exp $ */ /* * Copyright (c) 2001 Steve Murphree, Jr. @@ -49,8 +49,8 @@ #include <mvmeppc/dev/ravenreg.h> #include <mvmeppc/dev/ravenvar.h> -int raven_match __P((struct device *, void *, void *)); -void raven_attach __P((struct device *, struct device *, void *)); +int raven_match(struct device *, void *, void *); +void raven_attach(struct device *, struct device *, void *); struct cfattach raven_ca = { sizeof(struct raven_softc), raven_match, raven_attach, diff --git a/sys/arch/mvmeppc/include/autoconf.h b/sys/arch/mvmeppc/include/autoconf.h index d23d3cc9f0e..db01a912a72 100644 --- a/sys/arch/mvmeppc/include/autoconf.h +++ b/sys/arch/mvmeppc/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.1 2001/06/26 21:57:43 smurph Exp $ */ +/* $OpenBSD: autoconf.h,v 1.2 2002/03/14 01:26:41 millert Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -54,17 +54,14 @@ extern int system_type; /**/ struct confargs; -typedef int (*intr_handler_t) __P((void *)); +typedef int (*intr_handler_t)(void *); typedef struct bushook { struct device *bh_dv; int bh_type; - void (*bh_intr_establish) - __P((struct confargs *, intr_handler_t, void *)); - void (*bh_intr_disestablish) - __P((struct confargs *)); - int (*bh_matchname) - __P((struct confargs *, char *)); + void (*bh_intr_establish)(struct confargs *, intr_handler_t, void *); + void (*bh_intr_disestablish)(struct confargs *); + int (*bh_matchname)(struct confargs *, char *); } bushook_t; #define BUS_MAIN 1 /* mainbus */ @@ -98,6 +95,6 @@ struct confargs { void set_clockintr __P((void (*)(struct clockframe *))); void set_iointr __P((void (*)(void *, int))); -int badaddr __P((void *, u_int32_t)); +int badaddr(void *, u_int32_t); #endif /* _MACHINE_AUTOCONF_H_ */ diff --git a/sys/arch/mvmeppc/include/bus_mi.h b/sys/arch/mvmeppc/include/bus_mi.h index a2cc5b80ba3..80bd5ea12bd 100644 --- a/sys/arch/mvmeppc/include/bus_mi.h +++ b/sys/arch/mvmeppc/include/bus_mi.h @@ -1,5 +1,5 @@ /* $NetBSD: bus.h,v 1.1 2001/06/06 17:37:37 matt Exp $ */ -/* $OpenBSD: bus_mi.h,v 1.3 2001/11/05 17:25:58 art Exp $ */ +/* $OpenBSD: bus_mi.h,v 1.4 2002/03/14 01:26:41 millert Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -119,14 +119,14 @@ struct ppc_bus_space { bus_addr_t pbs_offset; bus_addr_t pbs_base; bus_addr_t pbs_limit; - int (*pbs_map) __P((bus_space_tag_t, bus_addr_t, bus_size_t, int, - bus_space_handle_t *)); - void (*pbs_unmap) __P((bus_space_tag_t, bus_space_handle_t, - bus_size_t)); - int (*pbs_alloc) __P((bus_space_tag_t, bus_addr_t, bus_addr_t, + int (*pbs_map)(bus_space_tag_t, bus_addr_t, bus_size_t, int, + bus_space_handle_t *); + void (*pbs_unmap)(bus_space_tag_t, bus_space_handle_t, + bus_size_t); + int (*pbs_alloc)(bus_space_tag_t, bus_addr_t, bus_addr_t, bus_size_t, bus_size_t align, bus_size_t, int, bus_addr_t *, - bus_space_handle_t *)); - void (*pbs_free) __P((bus_space_tag_t, bus_space_handle_t, bus_size_t)); + bus_space_handle_t *); + void (*pbs_free)(bus_space_tag_t, bus_space_handle_t, bus_size_t); }; #define BUS_SPACE_MAP_CACHEABLE 0x01 @@ -148,8 +148,8 @@ struct ppc_bus_space { #define __BUS_SPACE_HAS_STREAM_METHODS /* - * int bus_space_map __P((bus_space_tag_t t, bus_addr_t addr, - * bus_size_t size, int flags, bus_space_handle_t *bshp)); + * int bus_space_map(bus_space_tag_t t, bus_addr_t addr, + * bus_size_t size, int flags, bus_space_handle_t *bshp); * * Map a region of bus space. */ @@ -158,8 +158,8 @@ struct ppc_bus_space { ((*(t)->pbs_map)((t), (a), (s), (f), (hp))) /* - * int bus_space_unmap __P((bus_space_tag_t t, - * bus_space_handle_t bsh, bus_size_t size)); + * int bus_space_unmap(bus_space_tag_t t, + * bus_space_handle_t bsh, bus_size_t size); * * Unmap a region of bus space. */ @@ -168,9 +168,9 @@ struct ppc_bus_space { ((void)(*(t)->pbs_unmap)((t), (h), (s))) /* - * int bus_space_subregion __P((bus_space_tag_t t, + * int bus_space_subregion(bus_space_tag_t t, * bus_space_handle_t bsh, bus_size_t offset, bus_size_t size, - * bus_space_handle_t *nbshp)); + * bus_space_handle_t *nbshp); * * Get a new handle for a subregion of an already-mapped area of bus space. */ @@ -179,10 +179,10 @@ struct ppc_bus_space { ((*(hp) = (h) + (o)), 0) /* - * int bus_space_alloc __P((bus_space_tag_t t, bus_addr_t rstart, + * int bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart, * bus_addr_t rend, bus_size_t size, bus_size_t align, * bus_size_t boundary, int flags, bus_addr_t *bpap, - * bus_space_handle_t *bshp)); + * bus_space_handle_t *bshp); * * Allocate a region of bus space. */ @@ -191,8 +191,8 @@ struct ppc_bus_space { ((*(t)->pbs_alloc)((t), (rs), (re), (s), (a), (b), (f), (ap), (hp))) /* - * int bus_space_free __P((bus_space_tag_t t, - * bus_space_handle_t bsh, bus_size_t size)); + * int bus_space_free(bus_space_tag_t t, + * bus_space_handle_t bsh, bus_size_t size); * * Free a region of bus space. */ @@ -201,8 +201,8 @@ struct ppc_bus_space { ((void)(*(t)->pbs_free)((t), (h), (s))) /* - * u_intN_t bus_space_read_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset)); + * u_intN_t bus_space_read_N(bus_space_tag_t tag, + * bus_space_handle_t bsh, bus_size_t offset); * * Read a 1, 2, 4, or 8 byte quantity from bus space * described by tag/handle/offset. @@ -222,8 +222,8 @@ bus_space_read(4,32) #define bus_space_read_8 !!! bus_space_read_8 unimplemented !!! /* - * u_intN_t bus_space_read_stream_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset)); + * u_intN_t bus_space_read_stream_N(bus_space_tag_t tag, + * bus_space_handle_t bsh, bus_size_t offset); * * Read a 2, 4, or 8 byte stream quantity from bus space * described by tag/handle/offset. @@ -242,9 +242,9 @@ bus_space_read_stream(4,32) #define bus_space_read_stream_8 !!! bus_space_read_stream_8 unimplemented !!! /* - * void bus_space_read_multi_N __P((bus_space_tag_t tag, + * void bus_space_read_multi_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t *addr, size_t count)); + * u_intN_t *addr, size_t count); * * Read `count' 1, 2, 4, or 8 byte quantities from bus space * described by tag/handle/offset and copy into buffer provided. @@ -265,9 +265,9 @@ bus_space_read_multi(4,32) #define bus_space_read_multi_8 !!! bus_space_read_multi_8 not implemented !!! /* - * void bus_space_read_multi_stream_N __P((bus_space_tag_t tag, + * void bus_space_read_multi_stream_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t *addr, size_t count)); + * u_intN_t *addr, size_t count); * * Read `count' 2, 4, or 8 byte stream quantities from bus space * described by tag/handle/offset and copy into buffer provided. @@ -289,9 +289,9 @@ bus_space_read_multi_stream(4,32) !!! bus_space_read_multi_stream_8 not implemented !!! /* - * void bus_space_write_N __P((bus_space_tag_t tag, + * void bus_space_write_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t value)); + * u_intN_t value); * * Write the 1, 2, 4, or 8 byte value `value' to bus space * described by tag/handle/offset. @@ -311,9 +311,9 @@ bus_space_write(4,32) #define bus_space_write_8 !!! bus_space_write_8 unimplemented !!! /* - * void bus_space_write_stream_N __P((bus_space_tag_t tag, + * void bus_space_write_stream_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t value)); + * u_intN_t value); * * Write the 2, 4, or 8 byte stream value `value' to bus space * described by tag/handle/offset. @@ -332,9 +332,9 @@ bus_space_write_stream(4,32) #define bus_space_write_stream_8 !!! bus_space_write_stream_8 unimplemented !!! /* - * void bus_space_write_multi_N __P((bus_space_tag_t tag, + * void bus_space_write_multi_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * const u_intN_t *addr, size_t count)); + * const u_intN_t *addr, size_t count); * * Write `count' 1, 2, 4, or 8 byte quantities from the buffer * provided to bus space described by tag/handle/offset. @@ -355,9 +355,9 @@ bus_space_write_multi(4,32) #define bus_space_write_multi_8 !!! bus_space_write_multi_8 not implemented !!! /* - * void bus_space_write_multi_stream_N __P((bus_space_tag_t tag, + * void bus_space_write_multi_stream_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * const u_intN_t *addr, size_t count)); + * const u_intN_t *addr, size_t count); * * Write `count' 2, 4, or 8 byte stream quantities from the buffer * provided to bus space described by tag/handle/offset. @@ -379,20 +379,20 @@ bus_space_write_multi_stream(4,32) !!! bus_space_write_multi_stream_8 not implemented !!! /* - * void bus_space_read_region_N __P((bus_space_tag_t tag, + * void bus_space_read_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t *addr, size_t count)); + * u_intN_t *addr, size_t count); * * Read `count' 1, 2, 4, or 8 byte quantities from bus space * described by tag/handle and starting at `offset' and copy into * buffer provided. */ -static __inline void bus_space_read_region_1 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int8_t *, size_t)); -static __inline void bus_space_read_region_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int16_t *, size_t)); -static __inline void bus_space_read_region_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int32_t *, size_t)); +static __inline void bus_space_read_region_1(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int8_t *, size_t); +static __inline void bus_space_read_region_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int16_t *, size_t); +static __inline void bus_space_read_region_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int32_t *, size_t); static __inline void bus_space_read_region_1(tag, bsh, offset, addr, count) @@ -447,18 +447,18 @@ bus_space_read_region_4(tag, bsh, offset, addr, count) #define bus_space_read_region_8 !!! bus_space_read_region_8 unimplemented !!! /* - * void bus_space_read_region_stream_N __P((bus_space_tag_t tag, + * void bus_space_read_region_stream_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t *addr, size_t count)); + * u_intN_t *addr, size_t count); * * Read `count' 2, 4, or 8 byte stream quantities from bus space * described by tag/handle and starting at `offset' and copy into * buffer provided. */ -static __inline void bus_space_read_region_stream_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int16_t *, size_t)); -static __inline void bus_space_read_region_stream_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int32_t *, size_t)); +static __inline void bus_space_read_region_stream_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int16_t *, size_t); +static __inline void bus_space_read_region_stream_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int32_t *, size_t); static __inline void bus_space_read_region_stream_2(tag, bsh, offset, addr, count) @@ -496,19 +496,19 @@ bus_space_read_region_stream_4(tag, bsh, offset, addr, count) !!! bus_space_read_region_stream_8 unimplemented !!! /* - * void bus_space_write_region_N __P((bus_space_tag_t tag, + * void bus_space_write_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * const u_intN_t *addr, size_t count)); + * const u_intN_t *addr, size_t count); * * Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided * to bus space described by tag/handle starting at `offset'. */ -static __inline void bus_space_write_region_1 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, const u_int8_t *, size_t)); -static __inline void bus_space_write_region_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, const u_int16_t *, size_t)); -static __inline void bus_space_write_region_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, const u_int32_t *, size_t)); +static __inline void bus_space_write_region_1(bus_space_tag_t, + bus_space_handle_t, bus_size_t, const u_int8_t *, size_t); +static __inline void bus_space_write_region_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, const u_int16_t *, size_t); +static __inline void bus_space_write_region_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, const u_int32_t *, size_t); static __inline void bus_space_write_region_1(tag, bsh, offset, addr, count) @@ -563,17 +563,17 @@ bus_space_write_region_4(tag, bsh, offset, addr, count) #define bus_space_write_region_8 !!! bus_space_write_region_8 unimplemented !!! /* - * void bus_space_write_region_stream_N __P((bus_space_tag_t tag, + * void bus_space_write_region_stream_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * const u_intN_t *addr, size_t count)); + * const u_intN_t *addr, size_t count); * * Write `count' 2, 4, or 8 byte stream quantities from the buffer provided * to bus space described by tag/handle starting at `offset'. */ -static __inline void bus_space_write_region_stream_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, const u_int16_t *, size_t)); -static __inline void bus_space_write_region_stream_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, const u_int32_t *, size_t)); +static __inline void bus_space_write_region_stream_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, const u_int16_t *, size_t); +static __inline void bus_space_write_region_stream_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, const u_int32_t *, size_t); static __inline void bus_space_write_region_stream_2(tag, bsh, offset, addr, count) @@ -611,19 +611,19 @@ bus_space_write_region_stream_4(tag, bsh, offset, addr, count) !!! bus_space_write_region_stream_8 unimplemented !!! /* - * void bus_space_set_multi_N __P((bus_space_tag_t tag, + * void bus_space_set_multi_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, u_intN_t val, - * size_t count)); + * size_t count); * * Write the 1, 2, 4, or 8 byte value `val' to bus space described * by tag/handle/offset `count' times. */ -static __inline void bus_space_set_multi_1 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int8_t, size_t)); -static __inline void bus_space_set_multi_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int16_t, size_t)); -static __inline void bus_space_set_multi_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int32_t, size_t)); +static __inline void bus_space_set_multi_1(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int8_t, size_t); +static __inline void bus_space_set_multi_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int16_t, size_t); +static __inline void bus_space_set_multi_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int32_t, size_t); static __inline void bus_space_set_multi_1(tag, bsh, offset, val, count) @@ -678,17 +678,17 @@ bus_space_set_multi_4(tag, bsh, offset, val, count) #define bus_space_set_multi_8 !!! bus_space_set_multi_8 unimplemented !!! /* - * void bus_space_set_multi_stream_N __P((bus_space_tag_t tag, + * void bus_space_set_multi_stream_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, u_intN_t val, - * size_t count)); + * size_t count); * * Write the 2, 4, or 8 byte stream value `val' to bus space described * by tag/handle/offset `count' times. */ -static __inline void bus_space_set_multi_stream_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int16_t, size_t)); -static __inline void bus_space_set_multi_stream_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int32_t, size_t)); +static __inline void bus_space_set_multi_stream_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int16_t, size_t); +static __inline void bus_space_set_multi_stream_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int32_t, size_t); static __inline void bus_space_set_multi_stream_2(tag, bsh, offset, val, count) @@ -726,19 +726,19 @@ bus_space_set_multi_stream_4(tag, bsh, offset, val, count) !!! bus_space_set_multi_stream_8 unimplemented !!! /* - * void bus_space_set_region_N __P((bus_space_tag_t tag, + * void bus_space_set_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, u_intN_t val, - * size_t count)); + * size_t count); * * Write `count' 1, 2, 4, or 8 byte value `val' to bus space described * by tag/handle starting at `offset'. */ -static __inline void bus_space_set_region_1 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int8_t, size_t)); -static __inline void bus_space_set_region_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int16_t, size_t)); -static __inline void bus_space_set_region_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int32_t, size_t)); +static __inline void bus_space_set_region_1(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int8_t, size_t); +static __inline void bus_space_set_region_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int16_t, size_t); +static __inline void bus_space_set_region_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int32_t, size_t); static __inline void bus_space_set_region_1(tag, bsh, offset, val, count) @@ -793,17 +793,17 @@ bus_space_set_region_4(tag, bsh, offset, val, count) #define bus_space_set_region_8 !!! bus_space_set_region_8 unimplemented !!! /* - * void bus_space_set_region_stream_N __P((bus_space_tag_t tag, + * void bus_space_set_region_stream_N(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, u_intN_t val, - * size_t count)); + * size_t count); * * Write `count' 2, 4, or 8 byte stream value `val' to bus space described * by tag/handle starting at `offset'. */ -static __inline void bus_space_set_region_stream_2 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int16_t, size_t)); -static __inline void bus_space_set_region_stream_4 __P((bus_space_tag_t, - bus_space_handle_t, bus_size_t, u_int32_t, size_t)); +static __inline void bus_space_set_region_stream_2(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int16_t, size_t); +static __inline void bus_space_set_region_stream_4(bus_space_tag_t, + bus_space_handle_t, bus_size_t, u_int32_t, size_t); static __inline void @@ -842,24 +842,24 @@ bus_space_set_region_stream_4(tag, bsh, offset, val, count) !!! bus_space_set_region_stream_8 unimplemented !!! /* - * void bus_space_copy_region_N __P((bus_space_tag_t tag, + * void bus_space_copy_region_N(bus_space_tag_t tag, * bus_space_handle_t bsh1, bus_size_t off1, * bus_space_handle_t bsh2, bus_size_t off2, - * size_t count)); + * size_t count); * * Copy `count' 1, 2, 4, or 8 byte values from bus space starting * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2. */ -static __inline void bus_space_copy_region_1 __P((bus_space_tag_t, +static __inline void bus_space_copy_region_1(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_space_handle_t, - bus_size_t, size_t)); -static __inline void bus_space_copy_region_2 __P((bus_space_tag_t, + bus_size_t, size_t); +static __inline void bus_space_copy_region_2(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_space_handle_t, - bus_size_t, size_t)); -static __inline void bus_space_copy_region_4 __P((bus_space_tag_t, + bus_size_t, size_t); +static __inline void bus_space_copy_region_4(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_space_handle_t, - bus_size_t, size_t)); + bus_size_t, size_t); static __inline void bus_space_copy_region_1(t, h1, o1, h2, o2, c) @@ -944,9 +944,9 @@ bus_space_copy_region_4(t, h1, o1, h2, o2, c) /* * Bus read/write barrier methods. * - * void bus_space_barrier __P((bus_space_tag_t tag, + * void bus_space_barrier(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, - * bus_size_t len, int flags)); + * bus_size_t len, int flags); * */ #define bus_space_barrier(t, h, o, l, f) \ @@ -1018,33 +1018,33 @@ struct powerpc_bus_dma_tag { /* * DMA mapping methods. */ - int (*_dmamap_create) __P((bus_dma_tag_t, bus_size_t, int, - bus_size_t, bus_size_t, int, bus_dmamap_t *)); - void (*_dmamap_destroy) __P((bus_dma_tag_t, bus_dmamap_t)); - int (*_dmamap_load) __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); - int (*_dmamap_load_mbuf) __P((bus_dma_tag_t, bus_dmamap_t, - struct mbuf *, int)); - int (*_dmamap_load_uio) __P((bus_dma_tag_t, bus_dmamap_t, - struct uio *, int)); - int (*_dmamap_load_raw) __P((bus_dma_tag_t, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int)); - void (*_dmamap_unload) __P((bus_dma_tag_t, bus_dmamap_t)); - void (*_dmamap_sync) __P((bus_dma_tag_t, bus_dmamap_t, - bus_addr_t, bus_size_t, int)); + int (*_dmamap_create)(bus_dma_tag_t, bus_size_t, int, + bus_size_t, bus_size_t, int, bus_dmamap_t *); + void (*_dmamap_destroy)(bus_dma_tag_t, bus_dmamap_t); + int (*_dmamap_load)(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int); + int (*_dmamap_load_mbuf)(bus_dma_tag_t, bus_dmamap_t, + struct mbuf *, int); + int (*_dmamap_load_uio)(bus_dma_tag_t, bus_dmamap_t, + struct uio *, int); + int (*_dmamap_load_raw)(bus_dma_tag_t, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int); + void (*_dmamap_unload)(bus_dma_tag_t, bus_dmamap_t); + void (*_dmamap_sync)(bus_dma_tag_t, bus_dmamap_t, + bus_addr_t, bus_size_t, int); /* * DMA memory utility functions. */ - int (*_dmamem_alloc) __P((bus_dma_tag_t, bus_size_t, bus_size_t, - bus_size_t, bus_dma_segment_t *, int, int *, int)); - void (*_dmamem_free) __P((bus_dma_tag_t, - bus_dma_segment_t *, int)); - int (*_dmamem_map) __P((bus_dma_tag_t, bus_dma_segment_t *, - int, size_t, caddr_t *, int)); - void (*_dmamem_unmap) __P((bus_dma_tag_t, caddr_t, size_t)); - paddr_t (*_dmamem_mmap) __P((bus_dma_tag_t, bus_dma_segment_t *, - int, off_t, int, int)); + int (*_dmamem_alloc)(bus_dma_tag_t, bus_size_t, bus_size_t, + bus_size_t, bus_dma_segment_t *, int, int *, int); + void (*_dmamem_free)(bus_dma_tag_t, + bus_dma_segment_t *, int); + int (*_dmamem_map)(bus_dma_tag_t, bus_dma_segment_t *, + int, size_t, caddr_t *, int); + void (*_dmamem_unmap)(bus_dma_tag_t, caddr_t, size_t); + paddr_t (*_dmamem_mmap)(bus_dma_tag_t, bus_dma_segment_t *, + int, off_t, int, int); }; #define bus_dmamap_create(t, s, n, m, b, f, p) \ @@ -1103,36 +1103,36 @@ struct powerpc_bus_dmamap { }; #ifdef _POWERPC_BUS_DMA_PRIVATE -int _bus_dmamap_create __P((bus_dma_tag_t, bus_size_t, int, bus_size_t, - bus_size_t, int, bus_dmamap_t *)); -void _bus_dmamap_destroy __P((bus_dma_tag_t, bus_dmamap_t)); -int _bus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); -int _bus_dmamap_load_mbuf __P((bus_dma_tag_t, bus_dmamap_t, - struct mbuf *, int)); -int _bus_dmamap_load_uio __P((bus_dma_tag_t, bus_dmamap_t, - struct uio *, int)); -int _bus_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int)); -void _bus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t)); -void _bus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t, bus_addr_t, - bus_size_t, int)); - -int _bus_dmamem_alloc __P((bus_dma_tag_t tag, bus_size_t size, +int _bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t, + bus_size_t, int, bus_dmamap_t *); +void _bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t); +int _bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int); +int _bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t, + struct mbuf *, int); +int _bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t, + struct uio *, int); +int _bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int); +void _bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t); +void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t, + bus_size_t, int); + +int _bus_dmamem_alloc(bus_dma_tag_t tag, bus_size_t size, bus_size_t alignment, bus_size_t boundary, - bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags)); -void _bus_dmamem_free __P((bus_dma_tag_t tag, bus_dma_segment_t *segs, - int nsegs)); -int _bus_dmamem_map __P((bus_dma_tag_t tag, bus_dma_segment_t *segs, - int nsegs, size_t size, caddr_t *kvap, int flags)); -void _bus_dmamem_unmap __P((bus_dma_tag_t tag, caddr_t kva, - size_t size)); -paddr_t _bus_dmamem_mmap __P((bus_dma_tag_t tag, bus_dma_segment_t *segs, - int nsegs, off_t off, int prot, int flags)); - -int _bus_dmamem_alloc_range __P((bus_dma_tag_t tag, bus_size_t size, + bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags); +void _bus_dmamem_free(bus_dma_tag_t tag, bus_dma_segment_t *segs, + int nsegs); +int _bus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs, + int nsegs, size_t size, caddr_t *kvap, int flags); +void _bus_dmamem_unmap(bus_dma_tag_t tag, caddr_t kva, + size_t size); +paddr_t _bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs, + int nsegs, off_t off, int prot, int flags); + +int _bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size, bus_size_t alignment, bus_size_t boundary, bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags, - paddr_t low, paddr_t high)); + paddr_t low, paddr_t high); #endif /* _POWERPC_BUS_DMA_PRIVATE */ #endif /* _POWERPC_BUS_H_ */ diff --git a/sys/arch/mvmeppc/include/db_machdep.h b/sys/arch/mvmeppc/include/db_machdep.h index e46b1e5ebed..5d5738c1e14 100644 --- a/sys/arch/mvmeppc/include/db_machdep.h +++ b/sys/arch/mvmeppc/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.5 2001/11/06 00:30:38 art Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.6 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: db_machdep.h,v 1.13 1996/04/29 20:50:08 leo Exp $ */ /* @@ -93,8 +93,8 @@ db_regs_t ddb_regs; /* register state */ #ifdef _KERNEL -void kdb_kintr __P((void *)); -int kdb_trap __P((int, void *)); +void kdb_kintr(void *); +int kdb_trap(int, void *); #endif /* _KERNEL */ diff --git a/sys/arch/mvmeppc/include/disklabel.h b/sys/arch/mvmeppc/include/disklabel.h index 44a54eae871..fc120486117 100644 --- a/sys/arch/mvmeppc/include/disklabel.h +++ b/sys/arch/mvmeppc/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.2 2001/11/06 22:45:57 miod Exp $ */ +/* $OpenBSD: disklabel.h,v 1.3 2002/03/14 01:26:41 millert Exp $ */ /* * Copyright (c) 1994 Christopher G. Demetriou @@ -90,7 +90,7 @@ struct cpu_disklabel { #define DPSECT(s) ((s) & 0x3f) #define DPCYL(c, s) ((c) + (((s) & 0xc0) << 2)) -static __inline u_int32_t get_le __P((void *p)); +static __inline u_int32_t get_le(void *p); static __inline u_int32_t #ifdef __cplusplus diff --git a/sys/arch/mvmeppc/include/pmap.h b/sys/arch/mvmeppc/include/pmap.h index c19ed6904b3..328a389235c 100644 --- a/sys/arch/mvmeppc/include/pmap.h +++ b/sys/arch/mvmeppc/include/pmap.h @@ -1,7 +1,7 @@ -/* $OpenBSD: pmap.h,v 1.5 2001/09/10 17:52:06 drahn Exp $ */ +/* $OpenBSD: pmap.h,v 1.6 2002/03/14 01:26:41 millert Exp $ */ #include <powerpc/pmap.h> #ifndef _LOCORE -paddr_t vtophys __P((vaddr_t)); +paddr_t vtophys(vaddr_t); #endif /* _LOCORE */ diff --git a/sys/arch/mvmeppc/include/powerpc.h b/sys/arch/mvmeppc/include/powerpc.h index b79ed38d610..5ef80509dba 100644 --- a/sys/arch/mvmeppc/include/powerpc.h +++ b/sys/arch/mvmeppc/include/powerpc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: powerpc.h,v 1.1 2001/06/26 21:57:47 smurph Exp $ */ +/* $OpenBSD: powerpc.h,v 1.2 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: powerpc.h,v 1.1 1996/09/30 16:34:30 ws Exp $ */ /* @@ -39,30 +39,30 @@ struct mem_region { vm_size_t size; }; -void mem_regions __P((struct mem_region **, struct mem_region **)); +void mem_regions(struct mem_region **, struct mem_region **); /* * These two functions get used solely in boot() in machdep.c. * * Not sure whether boot itself should be implementation dependent instead. XXX */ -typedef void (exit_f) __P((void)) /*__attribute__((__noreturn__))*/ ; -typedef void (boot_f) __P((char *bootspec)) /* __attribute__((__noreturn__))*/ ; -typedef void (vmon_f) __P((void)); -typedef unsigned char (nvram_rd_f) __P((unsigned long offset)); -typedef void (nvram_wr_f) __P((unsigned long offset, unsigned char val)); -typedef unsigned long (tps_f) __P((void)); +typedef void (exit_f)(void) /*__attribute__((__noreturn__))*/ ; +typedef void (boot_f)(char *bootspec) /* __attribute__((__noreturn__))*/ ; +typedef void (vmon_f)(void); +typedef unsigned char (nvram_rd_f)(unsigned long offset); +typedef void (nvram_wr_f)(unsigned long offset, unsigned char val); +typedef unsigned long (tps_f)(void); -typedef void (mem_regions_f) __P((struct mem_region **memp, - struct mem_region **availp)); +typedef void (mem_regions_f)(struct mem_region **memp, + struct mem_region **availp); -typedef int (clock_read_f) __P((int *sec, int *min, int *hour, int *day, - int *mon, int *yr)); -typedef int (clock_write_f) __P((int sec, int min, int hour, int day, - int mon, int yr)); -typedef int (time_read_f) __P((u_long *sec)); -typedef int (time_write_f) __P((u_long sec)); +typedef int (clock_read_f)(int *sec, int *min, int *hour, int *day, + int *mon, int *yr); +typedef int (clock_write_f)(int sec, int min, int hour, int day, + int mon, int yr); +typedef int (time_read_f)(u_long *sec); +typedef int (time_write_f)(u_long sec); /* firmware interface. * regardless of type of firmware used several items diff --git a/sys/arch/mvmeppc/isa/isa_machdep.c b/sys/arch/mvmeppc/isa/isa_machdep.c index 7f42c67857b..ddbafafe7d1 100644 --- a/sys/arch/mvmeppc/isa/isa_machdep.c +++ b/sys/arch/mvmeppc/isa/isa_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.c,v 1.3 2001/11/06 19:53:15 miod Exp $ */ +/* $OpenBSD: isa_machdep.c,v 1.4 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $ */ #define ISA_DMA_STATS @@ -136,7 +136,7 @@ #include <mvmeppc/isa/isa_machdep.h> void *i8259_intr_establish( void * lcv, int irq, int type, int level, - int (*ih_fun) __P((void *)), void *ih_arg, char *name); + int (*ih_fun)(void *), void *ih_arg, char *name); int isa_has_been_seen = 0; @@ -150,7 +150,7 @@ isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg, ih_what) int irq; int type; int level; - int (*ih_fun) __P((void *)); + int (*ih_fun)(void *); void *ih_arg; char *ih_what; { diff --git a/sys/arch/mvmeppc/isa/isa_machdep.h b/sys/arch/mvmeppc/isa/isa_machdep.h index a8174c14808..562a793fa1f 100644 --- a/sys/arch/mvmeppc/isa/isa_machdep.h +++ b/sys/arch/mvmeppc/isa/isa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.h,v 1.1 2001/06/26 21:57:51 smurph Exp $ */ +/* $OpenBSD: isa_machdep.h,v 1.2 2002/03/14 01:26:41 millert Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -52,11 +52,11 @@ struct isabus_attach_args; /* XXX */ /* * Functions provided to machine-independent ISA code. */ -void isa_attach_hook __P((struct device *, struct device *, - struct isabus_attach_args *)); +void isa_attach_hook(struct device *, struct device *, + struct isabus_attach_args *); void *isa_intr_establish __P((isa_chipset_tag_t ic, int irq, int type, int level, int (*ih_fun)(void *), void *ih_arg, char *ih_what)); -void isa_intr_disestablish __P((isa_chipset_tag_t ic, void *handler)); +void isa_intr_disestablish(isa_chipset_tag_t ic, void *handler); #define __NO_ISA_INTR_CHECK /* diff --git a/sys/arch/mvmeppc/mvmeppc/autoconf.c b/sys/arch/mvmeppc/mvmeppc/autoconf.c index 0281d7b3b67..96265c7d4d3 100644 --- a/sys/arch/mvmeppc/mvmeppc/autoconf.c +++ b/sys/arch/mvmeppc/mvmeppc/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.3 2001/12/05 23:58:41 tdeval Exp $ */ +/* $OpenBSD: autoconf.c,v 1.4 2002/03/14 01:26:41 millert Exp $ */ /* * Copyright (c) 1996, 1997 Per Fogelstrom * Copyright (c) 1995 Theo de Raadt @@ -41,7 +41,7 @@ * from: Utah Hdr: autoconf.c 1.31 91/01/21 * * from: @(#)autoconf.c 8.1 (Berkeley) 6/10/93 - * $Id: autoconf.c,v 1.3 2001/12/05 23:58:41 tdeval Exp $ + * $Id: autoconf.c,v 1.4 2002/03/14 01:26:41 millert Exp $ */ /* @@ -62,17 +62,17 @@ #include <machine/autoconf.h> -struct device *parsedisk __P((char *, int, int, dev_t *)); -void setroot __P((void)); -void swapconf __P((void)); -extern void dumpconf __P((void)); -int findblkmajor __P((struct device *)); -char *findblkname __P((int)); -static struct device * getdisk __P((char *, int, int, dev_t *)); -struct device * getdevunit __P((char *, int)); -static struct devmap * findtype __P((char **)); -void makebootdev __P((char *cp)); -int getpno __P((char **)); +struct device *parsedisk(char *, int, int, dev_t *); +void setroot(void); +void swapconf(void); +extern void dumpconf(void); +int findblkmajor(struct device *); +char *findblkname(int); +static struct device * getdisk(char *, int, int, dev_t *); +struct device * getdevunit(char *, int); +static struct devmap * findtype(char **); +void makebootdev(char *cp); +int getpno(char **); void diskconf(); /* diff --git a/sys/arch/mvmeppc/mvmeppc/disksubr.c b/sys/arch/mvmeppc/mvmeppc/disksubr.c index 15b04b2cd28..229b1232619 100644 --- a/sys/arch/mvmeppc/mvmeppc/disksubr.c +++ b/sys/arch/mvmeppc/mvmeppc/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.3 2002/02/19 02:46:40 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.4 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -79,7 +79,7 @@ dk_establish(dk, dev) char * readdisklabel(dev, strat, lp, osdep, spoofonly) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); register struct disklabel *lp; struct cpu_disklabel *osdep; int spoofonly; @@ -395,7 +395,7 @@ setdisklabel(olp, nlp, openmask, osdep) int writedisklabel(dev, strat, lp, osdep) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); register struct disklabel *lp; struct cpu_disklabel *osdep; { diff --git a/sys/arch/mvmeppc/mvmeppc/machdep.c b/sys/arch/mvmeppc/mvmeppc/machdep.c index 8a1b130ded0..8ddb0773321 100644 --- a/sys/arch/mvmeppc/mvmeppc/machdep.c +++ b/sys/arch/mvmeppc/mvmeppc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.21 2002/02/17 22:59:53 maja Exp $ */ +/* $OpenBSD: machdep.c,v 1.22 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -96,11 +96,11 @@ extern struct user *proc0paddr; */ #include <dev/cons.h> -int bootcnprobe __P((struct consdev *)); -int bootcninit __P((struct consdev *)); -void bootcnputc __P((dev_t, char)); -int bootcngetc __P((dev_t)); -extern void nullcnpollc __P((dev_t, int)); +int bootcnprobe(struct consdev *); +int bootcninit(struct consdev *); +void bootcnputc(dev_t, char); +int bootcngetc(dev_t); +extern void nullcnpollc(dev_t, int); #define bootcnpollc nullcnpollc static struct consdev bootcons = { (void (*))NULL, @@ -113,8 +113,8 @@ static struct consdev bootcons = { 1 }; -u_int32_t ppc_get_msr __P((void)); -u_int32_t ppc_set_msr __P((u_int32_t)); +u_int32_t ppc_get_msr(void); +u_int32_t ppc_set_msr(u_int32_t); /* * Declare these as initialized data so we can patch them. @@ -157,7 +157,7 @@ char bootpathbuf[512]; struct firmware *fw = NULL; extern struct firmware ppc1_firmware; -caddr_t allocsys __P((caddr_t)); +caddr_t allocsys(caddr_t); /* * Extent maps to manage I/O. Allocate storage for 8 regions in each, @@ -194,8 +194,8 @@ initppc(startkernel, endkernel, args) #if NIPKDB > 0 extern caddr_t ipkdblow, ipkdbsize; #endif - extern void consinit __P((void)); - extern void callback __P((void *)); + extern void consinit(void); + extern void callback(void *); int exc, scratch; proc0.p_addr = proc0paddr; @@ -470,7 +470,7 @@ initppc(startkernel, endkernel, args) void install_extint(handler) - void (*handler) __P((void)); + void (*handler)(void); { extern caddr_t extint, extsize; extern u_long extint_call; @@ -986,7 +986,7 @@ systype(char *name) #include <dev/pci/pcivar.h> typedef void *(intr_establish_t) __P((void *, pci_intr_handle_t, int, int, int (*func)(void *), void *, char *)); -typedef void (intr_disestablish_t) __P((void *, void *)); +typedef void (intr_disestablish_t)(void *, void *); int ppc_configed_intr_cnt = 0; struct intrhand ppc_configed_intr[MAX_PRECONF_INTR]; @@ -997,7 +997,7 @@ ppc_intr_establish(lcv, ih, type, level, func, arg, name) pci_intr_handle_t ih; int type; int level; - int (*func) __P((void *)); + int (*func)(void *); void *arg; char *name; { @@ -1109,10 +1109,10 @@ bus_space_map(t, bpa, size, cacheable, bshp) } return 0; } -bus_addr_t bus_space_unmap_p __P((bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t size)); -void bus_space_unmap __P((bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t size)); +bus_addr_t bus_space_unmap_p(bus_space_tag_t t, bus_space_handle_t bsh, + bus_size_t size); +void bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, + bus_size_t size); bus_addr_t bus_space_unmap_p(t, bsh, size) bus_space_tag_t t; diff --git a/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c b/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c index 29c786e462c..b0465c7fa98 100644 --- a/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c +++ b/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ppc1_machdep.c,v 1.4 2001/11/06 22:46:00 miod Exp $ */ +/* $OpenBSD: ppc1_machdep.c,v 1.5 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: ofw_machdep.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */ /* @@ -52,18 +52,18 @@ #include <dev/cons.h> -void PPC1_exit __P((void)) __attribute__((__noreturn__)); -void PPC1_boot __P((char *bootspec)) __attribute__((__noreturn__)); -void PPC1_mem_regions __P((struct mem_region **memp, struct mem_region **availp)); -void PPC1_vmon __P((void)); -unsigned char PPC1_nvram_rd __P((unsigned long offset)); -void PPC1_nvram_wr __P((unsigned long offset, unsigned char val)); -unsigned long PPC1_tps __P((void)); - -int PPC1_clock_read __P((int *sec, int *min, int *hour, int *day, - int *mon, int *yr)); -int PPC1_clock_write __P((int sec, int min, int hour, int day, - int mon, int yr)); +void PPC1_exit(void) __attribute__((__noreturn__)); +void PPC1_boot(char *bootspec) __attribute__((__noreturn__)); +void PPC1_mem_regions(struct mem_region **memp, struct mem_region **availp); +void PPC1_vmon(void); +unsigned char PPC1_nvram_rd(unsigned long offset); +void PPC1_nvram_wr(unsigned long offset, unsigned char val); +unsigned long PPC1_tps(void); + +int PPC1_clock_read(int *sec, int *min, int *hour, int *day, + int *mon, int *yr); +int PPC1_clock_write(int sec, int min, int hour, int day, + int mon, int yr); struct firmware ppc1_firmware = { PPC1_mem_regions, diff --git a/sys/arch/mvmeppc/mvmeppc/swapgeneric.c b/sys/arch/mvmeppc/mvmeppc/swapgeneric.c index 6d59e1a50b3..00654d0f62f 100644 --- a/sys/arch/mvmeppc/mvmeppc/swapgeneric.c +++ b/sys/arch/mvmeppc/mvmeppc/swapgeneric.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapgeneric.c,v 1.2 2001/09/29 18:40:32 miod Exp $ */ +/* $OpenBSD: swapgeneric.c,v 1.3 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: swapgeneric.c,v 1.1 1996/09/30 16:34:55 ws Exp $ */ /*- @@ -43,7 +43,7 @@ #include <sys/param.h> #include <sys/conf.h> -int (*mountroot) __P((void *)) = NULL; /* tells autoconf.c that we are "generic" */ +int (*mountroot)(void *) = NULL; /* tells autoconf.c that we are "generic" */ dev_t rootdev = NODEV; dev_t dumpdev = NODEV; diff --git a/sys/arch/mvmeppc/mvmeppc/wscons_machdep.c b/sys/arch/mvmeppc/mvmeppc/wscons_machdep.c index 0d3616ad7b7..7371902db65 100644 --- a/sys/arch/mvmeppc/mvmeppc/wscons_machdep.c +++ b/sys/arch/mvmeppc/mvmeppc/wscons_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wscons_machdep.c,v 1.1 2001/06/26 21:57:56 smurph Exp $ */ +/* $OpenBSD: wscons_machdep.c,v 1.2 2002/03/14 01:26:41 millert Exp $ */ /* * Copyright (c) 2001 Aaron Campbell @@ -47,11 +47,11 @@ #include <dev/wscons/wsdisplayvar.h> #endif -void wscnprobe __P((struct consdev *)); -void wscninit __P((struct consdev *)); -void wscnputc __P((dev_t, char)); -int wscngetc __P((dev_t)); -void wscnpollc __P((dev_t, int)); +void wscnprobe(struct consdev *); +void wscninit(struct consdev *); +void wscnputc(dev_t, char); +int wscngetc(dev_t); +void wscnpollc(dev_t, int); void wscnprobe(cp) diff --git a/sys/arch/mvmeppc/pci/mpcpcibr.c b/sys/arch/mvmeppc/pci/mpcpcibr.c index 6a075a6b785..fd3377490b8 100644 --- a/sys/arch/mvmeppc/pci/mpcpcibr.c +++ b/sys/arch/mvmeppc/pci/mpcpcibr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpcpcibr.c,v 1.7 2001/11/06 22:46:00 miod Exp $ */ +/* $OpenBSD: mpcpcibr.c,v 1.8 2002/03/14 01:26:41 millert Exp $ */ /* * Copyright (c) 2001 Steve Murphree, Jr. @@ -55,24 +55,24 @@ #include <mvmeppc/pci/pcibrvar.h> #include <mvmeppc/dev/ravenreg.h> -int mpcpcibrmatch __P((struct device *, void *, void *)); -void mpcpcibrattach __P((struct device *, struct device *, void *)); +int mpcpcibrmatch(struct device *, void *, void *); +void mpcpcibrattach(struct device *, struct device *, void *); -void mpc_attach_hook __P((struct device *, struct device *, - struct pcibus_attach_args *)); -int mpc_bus_maxdevs __P((void *, int)); -pcitag_t mpc_make_tag __P((void *, int, int, int)); -void mpc_decompose_tag __P((void *, pcitag_t, int *, int *, int *)); -pcireg_t mpc_conf_read __P((void *, pcitag_t, int)); -void mpc_conf_write __P((void *, pcitag_t, int, pcireg_t)); +void mpc_attach_hook(struct device *, struct device *, + struct pcibus_attach_args *); +int mpc_bus_maxdevs(void *, int); +pcitag_t mpc_make_tag(void *, int, int, int); +void mpc_decompose_tag(void *, pcitag_t, int *, int *, int *); +pcireg_t mpc_conf_read(void *, pcitag_t, int); +void mpc_conf_write(void *, pcitag_t, int, pcireg_t); -int mpc_intr_map __P((void *, pcitag_t, int, int, pci_intr_handle_t *)); -const char *mpc_intr_string __P((void *, pci_intr_handle_t)); -int mpc_intr_line __P((void *, pci_intr_handle_t)); +int mpc_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *); +const char *mpc_intr_string(void *, pci_intr_handle_t); +int mpc_intr_line(void *, pci_intr_handle_t); void *mpc_intr_establish __P((void *, pci_intr_handle_t, int, int (*func)(void *), void *, char *)); -void mpc_intr_disestablish __P((void *, void *)); -int mpc_ether_hw_addr __P((struct ppc_pci_chipset *, u_int8_t *)); +void mpc_intr_disestablish(void *, void *); +int mpc_ether_hw_addr(struct ppc_pci_chipset *, u_int8_t *); void mpc_cfg_write_1( struct pcibr_config *cp, u_int32_t reg, u_int8_t val); @@ -98,7 +98,7 @@ struct cfdriver mpcpcibr_cd = { NULL, "mpcpcibr", DV_DULL, }; -static int mpcpcibrprint __P((void *, const char *pnp)); +static int mpcpcibrprint(void *, const char *pnp); struct pcibr_config mpc_config; @@ -539,7 +539,7 @@ mpc_intr_line(lcv, ih) typedef void *(intr_establish_t) __P((void *, pci_intr_handle_t, int, int, int (*func)(void *), void *, char *)); -typedef void (intr_disestablish_t) __P((void *, void *)); +typedef void (intr_disestablish_t)(void *, void *); extern intr_establish_t *intr_establish_func; extern intr_disestablish_t *intr_disestablish_func; @@ -548,7 +548,7 @@ mpc_intr_establish(lcv, ih, level, func, arg, name) void *lcv; pci_intr_handle_t ih; int level; -int (*func) __P((void *)); +int (*func)(void *); void *arg; char *name; { diff --git a/sys/arch/mvmeppc/pci/pchb.c b/sys/arch/mvmeppc/pci/pchb.c index 0fa85f3183f..a592a3a0982 100644 --- a/sys/arch/mvmeppc/pci/pchb.c +++ b/sys/arch/mvmeppc/pci/pchb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pchb.c,v 1.3 2001/11/06 22:46:00 miod Exp $ */ +/* $OpenBSD: pchb.c,v 1.4 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: pchb.c,v 1.4 2000/01/25 07:19:11 tsubai Exp $ */ /*- @@ -48,8 +48,8 @@ #include <dev/pci/pcireg.h> #include <dev/pci/pcidevs.h> -int pchbmatch __P((struct device *, void *, void *)); -void pchbattach __P((struct device *, struct device *, void *)); +int pchbmatch(struct device *, void *, void *); +void pchbattach(struct device *, struct device *, void *); struct cfattach pchb_ca = { sizeof(struct device), pchbmatch, pchbattach diff --git a/sys/arch/mvmeppc/pci/pcib.c b/sys/arch/mvmeppc/pci/pcib.c index 2f7a56b5193..b442e174d92 100644 --- a/sys/arch/mvmeppc/pci/pcib.c +++ b/sys/arch/mvmeppc/pci/pcib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcib.c,v 1.1 2001/06/26 21:57:57 smurph Exp $ */ +/* $OpenBSD: pcib.c,v 1.2 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: pcib.c,v 1.6 1997/06/06 23:29:16 thorpej Exp $ */ /*- @@ -53,10 +53,10 @@ #include "isa.h" -int pcibmatch __P((struct device *, void *, void *)); -void pcibattach __P((struct device *, struct device *, void *)); -void pcib_callback __P((struct device *)); -int pcib_print __P((void *, const char *)); +int pcibmatch(struct device *, void *, void *); +void pcibattach(struct device *, struct device *, void *); +void pcib_callback(struct device *); +int pcib_print(void *, const char *); struct ppc_bus_space ppc_isa_io, ppc_isa_mem; diff --git a/sys/arch/mvmeppc/pci/raven.c b/sys/arch/mvmeppc/pci/raven.c index 5df8ca8e3aa..c94ab28c367 100644 --- a/sys/arch/mvmeppc/pci/raven.c +++ b/sys/arch/mvmeppc/pci/raven.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raven.c,v 1.5 2001/11/06 19:53:15 miod Exp $ */ +/* $OpenBSD: raven.c,v 1.6 2002/03/14 01:26:41 millert Exp $ */ /* * Copyright (c) 2001 Steve Murphree, Jr. @@ -55,24 +55,24 @@ #include <mvmeppc/pci/pcibrvar.h> #include <mvmeppc/pci/ravenreg.h> -int mpcpcibrmatch __P((struct device *, void *, void *)); -void mpcpcibrattach __P((struct device *, struct device *, void *)); +int mpcpcibrmatch(struct device *, void *, void *); +void mpcpcibrattach(struct device *, struct device *, void *); -void mpc_attach_hook __P((struct device *, struct device *, - struct pcibus_attach_args *)); -int mpc_bus_maxdevs __P((void *, int)); -pcitag_t mpc_make_tag __P((void *, int, int, int)); -void mpc_decompose_tag __P((void *, pcitag_t, int *, int *, int *)); -pcireg_t mpc_conf_read __P((void *, pcitag_t, int)); -void mpc_conf_write __P((void *, pcitag_t, int, pcireg_t)); +void mpc_attach_hook(struct device *, struct device *, + struct pcibus_attach_args *); +int mpc_bus_maxdevs(void *, int); +pcitag_t mpc_make_tag(void *, int, int, int); +void mpc_decompose_tag(void *, pcitag_t, int *, int *, int *); +pcireg_t mpc_conf_read(void *, pcitag_t, int); +void mpc_conf_write(void *, pcitag_t, int, pcireg_t); -int mpc_intr_map __P((void *, pcitag_t, int, int, pci_intr_handle_t *)); -const char *mpc_intr_string __P((void *, pci_intr_handle_t)); -int mpc_intr_line __P((void *, pci_intr_handle_t)); +int mpc_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *); +const char *mpc_intr_string(void *, pci_intr_handle_t); +int mpc_intr_line(void *, pci_intr_handle_t); void *mpc_intr_establish __P((void *, pci_intr_handle_t, int, int (*func)(void *), void *, char *)); -void mpc_intr_disestablish __P((void *, void *)); -int mpc_ether_hw_addr __P((struct ppc_pci_chipset *, u_int8_t *)); +void mpc_intr_disestablish(void *, void *); +int mpc_ether_hw_addr(struct ppc_pci_chipset *, u_int8_t *); struct cfattach mpcpcibr_ca = { sizeof(struct pcibr_softc), mpcpcibrmatch, mpcpcibrattach, @@ -82,7 +82,7 @@ struct cfdriver mpcpcibr_cd = { NULL, "mpcpcibr", DV_DULL, }; -static int mpcpcibrprint __P((void *, const char *pnp)); +static int mpcpcibrprint(void *, const char *pnp); struct pcibr_config mpc_config; @@ -485,7 +485,7 @@ mpc_intr_string(lcv, ih) typedef void *(intr_establish_t) __P((void *, pci_intr_handle_t, int, int, int (*func)(void *), void *, char *)); -typedef void (intr_disestablish_t) __P((void *, void *)); +typedef void (intr_disestablish_t)(void *, void *); extern intr_establish_t *intr_establish_func; extern intr_disestablish_t *intr_disestablish_func; @@ -494,7 +494,7 @@ mpc_intr_establish(lcv, ih, level, func, arg, name) void *lcv; pci_intr_handle_t ih; int level; - int (*func) __P((void *)); + int (*func)(void *); void *arg; char *name; { diff --git a/sys/arch/mvmeppc/stand/installboot/installboot.c b/sys/arch/mvmeppc/stand/installboot/installboot.c index ffc76cde913..f7edc6a8277 100644 --- a/sys/arch/mvmeppc/stand/installboot/installboot.c +++ b/sys/arch/mvmeppc/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.2 2001/07/04 08:31:34 niklas Exp $ */ +/* $OpenBSD: installboot.c,v 1.3 2002/03/14 01:26:41 millert Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -69,12 +69,12 @@ daddr_t *block_table; /* block number array in prototype image */ int maxblocknum; /* size of this array */ -char *loadprotoblocks __P((char *, long *)); -int loadblocknums __P((char *, int)); -static void devread __P((int, void *, daddr_t, size_t, char *)); -static void usage __P((void)); -int main __P((int, char *[])); -static void vid_to_disklabel __P((char *, char*)); +char *loadprotoblocks(char *, long *); +int loadblocknums(char *, int); +static void devread(int, void *, daddr_t, size_t, char *); +static void usage(void); +int main(int, char *[]); +static void vid_to_disklabel(char *, char*); static void diff --git a/sys/arch/mvmeppc/stand/libbug/libbug.h b/sys/arch/mvmeppc/stand/libbug/libbug.h index c282cfaac9e..fb2148fa7a5 100644 --- a/sys/arch/mvmeppc/stand/libbug/libbug.h +++ b/sys/arch/mvmeppc/stand/libbug/libbug.h @@ -1,24 +1,24 @@ -/* $OpenBSD: libbug.h,v 1.1 2001/06/26 21:58:04 smurph Exp $ */ +/* $OpenBSD: libbug.h,v 1.2 2002/03/14 01:26:41 millert Exp $ */ /* * prototypes and such. note that get/put char are in stand.h */ -void mvmeprom_delay __P((int)); -int mvmeprom_diskrd __P((struct mvmeprom_dskio *)); -int mvmeprom_diskwr __P((struct mvmeprom_dskio *)); -struct mvmeprom_brdid *mvmeprom_getbrdid __P((void)); -int peekchar __P((void)); -void mvmeprom_outln __P((char *, char *)); -void mvmeprom_outstr __P((char *, char *)); -void mvmeprom_rtc_rd __P((struct mvmeprom_time *)); -int mvmeprom_netctrl __P((struct mvmeprom_netctrl *)); -int mvmeprom_netctrl_init __P((u_char, u_char)); -int mvmeprom_netctrl_hwa __P((u_char, u_char, void *, u_long *)); -int mvmeprom_netctrl_tx __P((u_char, u_char, void *, u_long *)); -int mvmeprom_netctrl_rx __P((u_char, u_char, void *, u_long *)); -int mvmeprom_netctrl_flush_rx __P((u_char, u_char)); -int mvmeprom_netctrl_reset __P((u_char, u_char)); +void mvmeprom_delay(int); +int mvmeprom_diskrd(struct mvmeprom_dskio *); +int mvmeprom_diskwr(struct mvmeprom_dskio *); +struct mvmeprom_brdid *mvmeprom_getbrdid(void); +int peekchar(void); +void mvmeprom_outln(char *, char *); +void mvmeprom_outstr(char *, char *); +void mvmeprom_rtc_rd(struct mvmeprom_time *); +int mvmeprom_netctrl(struct mvmeprom_netctrl *); +int mvmeprom_netctrl_init(u_char, u_char); +int mvmeprom_netctrl_hwa(u_char, u_char, void *, u_long *); +int mvmeprom_netctrl_tx(u_char, u_char, void *, u_long *); +int mvmeprom_netctrl_rx(u_char, u_char, void *, u_long *); +int mvmeprom_netctrl_flush_rx(u_char, u_char); +int mvmeprom_netctrl_reset(u_char, u_char); /* * bugcrt stuff diff --git a/sys/arch/mvmeppc/stand/libsa/libsa.h b/sys/arch/mvmeppc/stand/libsa/libsa.h index dcb9fbe441c..153583cb967 100644 --- a/sys/arch/mvmeppc/stand/libsa/libsa.h +++ b/sys/arch/mvmeppc/stand/libsa/libsa.h @@ -1,4 +1,4 @@ -/* $OpenBSD: libsa.h,v 1.2 2001/07/04 08:31:38 niklas Exp $ */ +/* $OpenBSD: libsa.h,v 1.3 2002/03/14 01:26:41 millert Exp $ */ /* * libsa prototypes @@ -7,24 +7,24 @@ #include "libbug.h" /* bugdev.c */ -int dsk_open __P((struct open_file *, ...)); -int dsk_close __P((struct open_file *)); -int dsk_ioctl __P((struct open_file *, u_long, void *)); -int dsk_strategy __P((void *, int, daddr_t, size_t, void *, size_t *)); -int net_open __P((struct open_file *, ...)); -int net_close __P((struct open_file *)); -int net_ioctl __P((struct open_file *, u_long, void *)); -int net_strategy __P((void *, int, daddr_t, size_t, void *, size_t *)); -int tape_open __P((struct open_file *, ...)); -int tape_close __P((struct open_file *)); -int tape_ioctl __P((struct open_file *, u_long, void *)); -int tape_strategy __P((void *, int, daddr_t, size_t, void *, size_t *)); +int dsk_open(struct open_file *, ...); +int dsk_close(struct open_file *); +int dsk_ioctl(struct open_file *, u_long, void *); +int dsk_strategy(void *, int, daddr_t, size_t, void *, size_t *); +int net_open(struct open_file *, ...); +int net_close(struct open_file *); +int net_ioctl(struct open_file *, u_long, void *); +int net_strategy(void *, int, daddr_t, size_t, void *, size_t *); +int tape_open(struct open_file *, ...); +int tape_close(struct open_file *); +int tape_ioctl(struct open_file *, u_long, void *); +int tape_strategy(void *, int, daddr_t, size_t, void *, size_t *); /* exec_mvme.c */ -void exec_mvme __P((char *, int)); +void exec_mvme(char *, int); /* parse_args.c */ -int parse_args __P((char **, int *)); +int parse_args(char **, int *); #define BUGDEV_DISK 0 #define BUGDEV_NET 1 diff --git a/sys/arch/mvmeppc/stand/libsa/rawfs.c b/sys/arch/mvmeppc/stand/libsa/rawfs.c index 3784175b92d..3682697b0be 100644 --- a/sys/arch/mvmeppc/stand/libsa/rawfs.c +++ b/sys/arch/mvmeppc/stand/libsa/rawfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rawfs.c,v 1.1 2001/06/26 21:58:08 smurph Exp $ */ +/* $OpenBSD: rawfs.c,v 1.2 2002/03/14 01:26:41 millert Exp $ */ /* * Copyright (c) 1995 Gordon W. Ross @@ -55,7 +55,7 @@ struct cfile { }; static int -rawfs_get_block __P((struct open_file *)); +rawfs_get_block(struct open_file *); int rawfs_open(path, f) char *path; diff --git a/sys/arch/mvmeppc/stand/libsa/rawfs.h b/sys/arch/mvmeppc/stand/libsa/rawfs.h index cf29be5800b..e84ce28b373 100644 --- a/sys/arch/mvmeppc/stand/libsa/rawfs.h +++ b/sys/arch/mvmeppc/stand/libsa/rawfs.h @@ -1,15 +1,15 @@ -/* $OpenBSD: rawfs.h,v 1.1 2001/06/26 21:58:08 smurph Exp $ */ +/* $OpenBSD: rawfs.h,v 1.2 2002/03/14 01:26:41 millert Exp $ */ /* * Raw file system - for stream devices like tapes. * No random access, only sequential read allowed. */ -int rawfs_open __P((char *path, struct open_file *f)); -int rawfs_close __P((struct open_file *f)); -int rawfs_read __P((struct open_file *f, void *buf, - u_int size, u_int *resid)); -int rawfs_write __P((struct open_file *f, void *buf, - u_int size, u_int *resid)); -off_t rawfs_seek __P((struct open_file *f, off_t offset, int where)); -int rawfs_stat __P((struct open_file *f, struct stat *sb)); +int rawfs_open(char *path, struct open_file *f); +int rawfs_close(struct open_file *f); +int rawfs_read(struct open_file *f, void *buf, + u_int size, u_int *resid); +int rawfs_write(struct open_file *f, void *buf, + u_int size, u_int *resid); +off_t rawfs_seek(struct open_file *f, off_t offset, int where); +int rawfs_stat(struct open_file *f, struct stat *sb); diff --git a/sys/arch/mvmeppc/stand/libsa/tftpfs.c b/sys/arch/mvmeppc/stand/libsa/tftpfs.c index 0b2e90759b1..9e6a3c9e8e2 100644 --- a/sys/arch/mvmeppc/stand/libsa/tftpfs.c +++ b/sys/arch/mvmeppc/stand/libsa/tftpfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tftpfs.c,v 1.1 2001/06/26 21:58:08 smurph Exp $ */ +/* $OpenBSD: tftpfs.c,v 1.2 2002/03/14 01:26:41 millert Exp $ */ /*- * Copyright (c) 2001 Steve Murphree, Jr. @@ -59,11 +59,11 @@ struct tftp_file { #define TFTP_BLOCK_NO(x) ((x >> TFTP_BLOCK_SHIFT) + 1) #define TFTP_BLOCK_OFF(x) (x % TFTP_BLOCK_SIZE) -static int read_inode __P((ino_t, struct open_file *)); -static int block_map __P((struct open_file *, daddr_t, daddr_t *)); -static int tftp_read_file __P((struct open_file *, char **, size_t *)); +static int read_inode(ino_t, struct open_file *); +static int block_map(struct open_file *, daddr_t, daddr_t *); +static int tftp_read_file(struct open_file *, char **, size_t *); #ifdef COMPAT_UFS -static void ffs_oldfscompat __P((struct fs *)); +static void ffs_oldfscompat(struct fs *); #endif /* diff --git a/sys/arch/mvmeppc/stand/libsa/tftpfs.h b/sys/arch/mvmeppc/stand/libsa/tftpfs.h index f8ea6c53c0a..1f8da6441e2 100644 --- a/sys/arch/mvmeppc/stand/libsa/tftpfs.h +++ b/sys/arch/mvmeppc/stand/libsa/tftpfs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tftpfs.h,v 1.1 2001/06/26 21:58:08 smurph Exp $ */ +/* $OpenBSD: tftpfs.h,v 1.2 2002/03/14 01:26:41 millert Exp $ */ /*- * Copyright (c) 2001 Steve Murphree, Jr. @@ -30,14 +30,14 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -int tftpfs_open __P((char *path, struct open_file *f)); -int tftpfs_close __P((struct open_file *f)); -int tftpfs_read __P((struct open_file *f, void *buf, - size_t size, size_t *resid)); -int tftpfs_write __P((struct open_file *f, void *buf, - size_t size, size_t *resid)); -off_t tftpfs_seek __P((struct open_file *f, off_t offset, int where)); -int tftpfs_stat __P((struct open_file *f, struct stat *sb)); +int tftpfs_open(char *path, struct open_file *f); +int tftpfs_close(struct open_file *f); +int tftpfs_read(struct open_file *f, void *buf, + size_t size, size_t *resid); +int tftpfs_write(struct open_file *f, void *buf, + size_t size, size_t *resid); +off_t tftpfs_seek(struct open_file *f, off_t offset, int where); +int tftpfs_stat(struct open_file *f, struct stat *sb); #ifndef NO_READDIR -int tftpfs_readdir __P((struct open_file *f, char *name)); +int tftpfs_readdir(struct open_file *f, char *name); #endif |