diff options
Diffstat (limited to 'sys/arch/sparc64')
29 files changed, 107 insertions, 109 deletions
diff --git a/sys/arch/sparc64/dev/ce4231.c b/sys/arch/sparc64/dev/ce4231.c index 92146092b3e..e9ac05101ce 100644 --- a/sys/arch/sparc64/dev/ce4231.c +++ b/sys/arch/sparc64/dev/ce4231.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ce4231.c,v 1.6 2002/03/14 01:26:44 millert Exp $ */ +/* $OpenBSD: ce4231.c,v 1.7 2002/03/14 03:16:00 millert Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -157,10 +157,10 @@ void * ce4231_alloc(void *, int, size_t, int, int); void ce4231_free(void *, void *, int); size_t ce4231_round_buffersize(void *, int, size_t); int ce4231_get_props(void *); -int ce4231_trigger_output __P((void *, void *, void *, int, - void (*intr)(void *), void *arg, struct audio_params *)); -int ce4231_trigger_input __P((void *, void *, void *, int, - void (*intr)(void *), void *arg, struct audio_params *)); +int ce4231_trigger_output(void *, void *, void *, int, + void (*intr)(void *), void *arg, struct audio_params *); +int ce4231_trigger_input(void *, void *, void *, int, + void (*intr)(void *), void *arg, struct audio_params *); struct audio_hw_if ce4231_sa_hw_if = { ce4231_open, diff --git a/sys/arch/sparc64/dev/ce4231var.h b/sys/arch/sparc64/dev/ce4231var.h index 33fb3387dea..b25ffe70769 100644 --- a/sys/arch/sparc64/dev/ce4231var.h +++ b/sys/arch/sparc64/dev/ce4231var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ce4231var.h,v 1.3 2002/01/24 03:06:54 jason Exp $ */ +/* $OpenBSD: ce4231var.h,v 1.4 2002/03/14 03:16:00 millert Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -66,10 +66,10 @@ struct ce4231_softc { int sc_open; /* already open? */ int sc_locked; /* locked? */ - void (*sc_rintr)(void*); /* input completion intr handler */ - void * sc_rarg; /* arg for sc_rintr() */ - void (*sc_pintr)(void*); /* output completion intr handler */ - void * sc_parg; /* arg for sc_pintr() */ + void (*sc_rintr)(void *); /* input completion intr handler */ + void *sc_rarg; /* arg for sc_rintr() */ + void (*sc_pintr)(void *); /* output completion intr handler */ + void *sc_parg; /* arg for sc_pintr() */ char sc_mute[9]; /* which devs are muted */ u_int8_t sc_out_port; /* output port */ diff --git a/sys/arch/sparc64/dev/ebus.c b/sys/arch/sparc64/dev/ebus.c index af8635e6bb7..cc3f022b634 100644 --- a/sys/arch/sparc64/dev/ebus.c +++ b/sys/arch/sparc64/dev/ebus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ebus.c,v 1.8 2002/03/14 01:26:44 millert Exp $ */ +/* $OpenBSD: ebus.c,v 1.9 2002/03/14 03:16:00 millert Exp $ */ /* $NetBSD: ebus.c,v 1.24 2001/07/25 03:49:54 eeh Exp $ */ /* @@ -103,8 +103,8 @@ static paddr_t ebus_bus_mmap(bus_space_tag_t, bus_addr_t, off_t, int, int); static int _ebus_bus_map(bus_space_tag_t, bus_type_t, bus_addr_t, bus_size_t, int, vaddr_t, bus_space_handle_t *); -static void *ebus_intr_establish __P((bus_space_tag_t, int, int, int, - int (*)(void *), void *)); +static void *ebus_intr_establish(bus_space_tag_t, int, int, int, + int (*)(void *), void *); static int ebus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *, bus_size_t, struct proc *, int); diff --git a/sys/arch/sparc64/dev/pcons.c b/sys/arch/sparc64/dev/pcons.c index 0a808fe4f06..7a7e1020851 100644 --- a/sys/arch/sparc64/dev/pcons.c +++ b/sys/arch/sparc64/dev/pcons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcons.c,v 1.4 2002/03/14 01:26:44 millert Exp $ */ +/* $OpenBSD: pcons.c,v 1.5 2002/03/14 03:16:00 millert Exp $ */ /* $NetBSD: pcons.c,v 1.7 2001/05/02 10:32:20 scw Exp $ */ /*- @@ -376,7 +376,7 @@ pcons_cnpollc(dev, on) void pcons_dopoll(void); void pcons_dopoll() { - pcons_poll((void*)pcons_cd.cd_devs[0]); + pcons_poll((void *)pcons_cd.cd_devs[0]); } /* XXXXXXXX --- more cnmagic stuff. */ diff --git a/sys/arch/sparc64/dev/psycho.c b/sys/arch/sparc64/dev/psycho.c index cebe0169b01..cc6307b70b0 100644 --- a/sys/arch/sparc64/dev/psycho.c +++ b/sys/arch/sparc64/dev/psycho.c @@ -1,4 +1,4 @@ -/* $OpenBSD: psycho.c,v 1.15 2002/03/14 01:26:44 millert Exp $ */ +/* $OpenBSD: psycho.c,v 1.16 2002/03/14 03:16:00 millert Exp $ */ /* $NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp $ */ /* @@ -96,8 +96,8 @@ void psycho_iommu_init(struct psycho_softc *, int); paddr_t psycho_bus_mmap(bus_space_tag_t, bus_addr_t, off_t, int, int); int _psycho_bus_map(bus_space_tag_t, bus_type_t, bus_addr_t, bus_size_t, int, vaddr_t, bus_space_handle_t *); -void *psycho_intr_establish __P((bus_space_tag_t, int, int, int, - int (*)(void *), void *)); +void *psycho_intr_establish(bus_space_tag_t, int, int, int, + int (*)(void *), void *); int psycho_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *, bus_size_t, struct proc *, int); diff --git a/sys/arch/sparc64/dev/sbus.c b/sys/arch/sparc64/dev/sbus.c index 3f8c463110c..b5da982b638 100644 --- a/sys/arch/sparc64/dev/sbus.c +++ b/sys/arch/sparc64/dev/sbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbus.c,v 1.12 2002/03/14 01:26:44 millert Exp $ */ +/* $OpenBSD: sbus.c,v 1.13 2002/03/14 03:16:00 millert Exp $ */ /* $NetBSD: sbus.c,v 1.46 2001/10/07 20:30:41 eeh Exp $ */ /*- @@ -155,13 +155,13 @@ static int _sbus_bus_map( int, /*flags*/ vaddr_t, /*preferred virtual address */ bus_space_handle_t *); -static void *sbus_intr_establish __P(( +static void *sbus_intr_establish( bus_space_tag_t, int, /*Sbus interrupt level*/ int, /*`device class' priority*/ int, /*flags*/ int (*)(void *), /*handler*/ - void *)); /*handler arg*/ + void *); /*handler arg*/ /* autoconfiguration driver */ diff --git a/sys/arch/sparc64/dev/upavar.h b/sys/arch/sparc64/dev/upavar.h index 697c57b48b8..67c51ce0873 100644 --- a/sys/arch/sparc64/dev/upavar.h +++ b/sys/arch/sparc64/dev/upavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: upavar.h,v 1.3 2002/03/14 01:26:44 millert Exp $ */ +/* $OpenBSD: upavar.h,v 1.4 2002/03/14 03:16:00 millert Exp $ */ /* $NetBSD: upavar.h,v 1.2 2000/01/14 14:33:31 pk Exp $ */ /*- @@ -118,7 +118,7 @@ struct upa_attach_args { int ua_node; /* PROM handle */ struct upa_reg *ua_reg; /* "reg" properties */ int ua_nreg; - void* *ua_address; /* "address" properties */ + void * *ua_address; /* "address" properties */ int ua_naddress; int *ua_interrupts; /* "interrupts" properties */ int ua_ninterrupts; diff --git a/sys/arch/sparc64/dev/vgafb.c b/sys/arch/sparc64/dev/vgafb.c index 3a6e84321b0..cb6130d2c00 100644 --- a/sys/arch/sparc64/dev/vgafb.c +++ b/sys/arch/sparc64/dev/vgafb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vgafb.c,v 1.6 2002/03/14 01:26:44 millert Exp $ */ +/* $OpenBSD: vgafb.c,v 1.7 2002/03/14 03:16:00 millert Exp $ */ /* * Copyright (c) 2001 Jason L. Wright (jason@thought.net) @@ -102,8 +102,8 @@ int vgafb_ioctl(void *, u_long, caddr_t, int, struct proc *); int vgafb_alloc_screen(void *, const struct wsscreen_descr *, void **, int *, int *, long *); void vgafb_free_screen(void *, void *); -int vgafb_show_screen __P((void *, void *, int, - void (*cb)(void *, int, int), void *)); +int vgafb_show_screen(void *, void *, int, + void (*cb)(void *, int, int), void *); paddr_t vgafb_mmap(void *, off_t, int); int vgafb_is_console(int); int vgafb_getcmap(struct vgafb_softc *, struct wsdisplay_cmap *); diff --git a/sys/arch/sparc64/include/autoconf.h b/sys/arch/sparc64/include/autoconf.h index cdf099f0dfc..079ea8a154a 100644 --- a/sys/arch/sparc64/include/autoconf.h +++ b/sys/arch/sparc64/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.6 2002/03/14 01:26:45 millert Exp $ */ +/* $OpenBSD: autoconf.h,v 1.7 2002/03/14 03:16:00 millert Exp $ */ /* $NetBSD: autoconf.h,v 1.10 2001/07/24 19:32:11 eeh Exp $ */ /*- @@ -168,8 +168,7 @@ int sd_crazymap(int); struct device *parsedisk(char *, int, int, dev_t *); /* Establish a mountroot_hook, for benefit of floppy drive, mostly. */ -void mountroot_hook_establish __P((void (*)(struct device *), - struct device *)); +void mountroot_hook_establish(void (*)(struct device *), struct device *); void bootstrap(int); int firstchild(int); diff --git a/sys/arch/sparc64/include/bus.h b/sys/arch/sparc64/include/bus.h index 692c7a43217..3e42fad0917 100644 --- a/sys/arch/sparc64/include/bus.h +++ b/sys/arch/sparc64/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.11 2002/03/14 01:26:45 millert Exp $ */ +/* $OpenBSD: bus.h,v 1.12 2002/03/14 03:16:00 millert Exp $ */ /* $NetBSD: bus.h,v 1.31 2001/09/21 15:30:41 wiz Exp $ */ /*- @@ -157,9 +157,9 @@ struct sparc_bus_space_tag { paddr_t (*sparc_bus_mmap)(bus_space_tag_t, bus_addr_t, off_t, int, int); - void *(*sparc_intr_establish) __P((bus_space_tag_t, + void *(*sparc_intr_establish)(bus_space_tag_t, int, int, int, - int (*)(void *), void *)); + int (*)(void *), void *); }; @@ -233,14 +233,14 @@ static paddr_t bus_space_mmap( off_t, /*offset*/ int, /*prot*/ int); /*flags*/ -static void *bus_intr_establish __P(( +static void *bus_intr_establish( bus_space_tag_t, int, /*bus-specific intr*/ int, /*device class level, see machine/intr.h*/ int, /*flags*/ int (*)(void *), /*handler*/ - void *)); /*handler arg*/ + void *); /*handler arg*/ /* This macro finds the first "upstream" implementation of method `f' */ @@ -383,7 +383,7 @@ void * bus_space_vaddr(bus_space_tag_t space, bus_space_handle_t handle); * the temporary virtual address * the passed `arg' argument */ -int bus_space_probe __P(( +int bus_space_probe( bus_space_tag_t, bus_type_t, bus_addr_t, @@ -391,7 +391,7 @@ int bus_space_probe __P(( size_t, /* offset */ int, /* flags */ int (*)(void *, void *), /* callback function */ - void *)); /* callback arg */ + void *); /* callback arg */ /* diff --git a/sys/arch/sparc64/include/cpu.h b/sys/arch/sparc64/include/cpu.h index 5f4d634f812..c9df2248502 100644 --- a/sys/arch/sparc64/include/cpu.h +++ b/sys/arch/sparc64/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.8 2002/03/14 01:26:45 millert Exp $ */ +/* $OpenBSD: cpu.h,v 1.9 2002/03/14 03:16:00 millert Exp $ */ /* $NetBSD: cpu.h,v 1.28 2001/06/14 22:56:58 thorpej Exp $ */ /* @@ -299,7 +299,7 @@ void amd7930_trap(void); /* cons.c */ int cnrom(void); /* zs.c */ -void zsconsole __P((struct tty *, int, int, void (**)(struct tty *, int))); +void zsconsole(struct tty *, int, int, void (**)(struct tty *, int)); #ifdef KGDB void zs_kgdb_init(void); #endif @@ -307,7 +307,7 @@ void zs_kgdb_init(void); void fb_unblank(void); /* kgdb_stub.c */ #ifdef KGDB -void kgdb_attach __P((int (*)(void *), void (*)(void *, int), void *)); +void kgdb_attach(int (*)(void *), void (*)(void *, int), void *); void kgdb_connect(int); void kgdb_panic(void); #endif diff --git a/sys/arch/sparc64/include/intr.h b/sys/arch/sparc64/include/intr.h index 4ea39b564b4..70dccdd829c 100644 --- a/sys/arch/sparc64/include/intr.h +++ b/sys/arch/sparc64/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.2 2002/03/14 01:26:45 millert Exp $ */ +/* $OpenBSD: intr.h,v 1.3 2002/03/14 03:16:00 millert Exp $ */ /* $NetBSD: intr.h,v 1.8 2001/01/14 23:50:30 thorpej Exp $ */ /*- @@ -55,7 +55,7 @@ #define IPL_HIGH PIL_HIGH /* everything */ void * -softintr_establish __P((int level, void (*fun)(void *), void *arg)); +softintr_establish(int level, void (*fun)(void *), void *arg); void softintr_disestablish(void *cookie); diff --git a/sys/arch/sparc64/include/openfirm.h b/sys/arch/sparc64/include/openfirm.h index 20be67c12c0..7d27aaff1ad 100644 --- a/sys/arch/sparc64/include/openfirm.h +++ b/sys/arch/sparc64/include/openfirm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: openfirm.h,v 1.2 2001/08/19 05:15:40 art Exp $ */ +/* $OpenBSD: openfirm.h,v 1.3 2002/03/14 03:16:00 millert Exp $ */ /* $NetBSD: openfirm.h,v 1.8 2001/07/20 00:07:14 eeh Exp $ */ /* @@ -47,9 +47,9 @@ typedef u_int64_t cell_t; #define ADR2CELL(x) (cell_t)(u_int)(int)(x) #endif -int OF_test (char* service); -int OF_test_method (int handle, char* method); -int OF_getproplen (int handle, char* prop); +int OF_test (char *service); +int OF_test_method (int handle, char *method); +int OF_getproplen (int handle, char *prop); int OF_stdin (void); int OF_stdout (void); diff --git a/sys/arch/sparc64/include/pmap.h b/sys/arch/sparc64/include/pmap.h index 250d5ffe4ea..81681aff364 100644 --- a/sys/arch/sparc64/include/pmap.h +++ b/sys/arch/sparc64/include/pmap.h @@ -172,8 +172,7 @@ void pmap_bootstrap(u_long kernelstart, u_long kernelend, u_int numctx); /* SPARC specific? */ void pmap_redzone(void); int pmap_dumpsize(void); -int pmap_dumpmmu __P((int (*)(dev_t, daddr_t, caddr_t, size_t), - daddr_t)); +int pmap_dumpmmu(int (*)(dev_t, daddr_t, caddr_t, size_t), daddr_t); int pmap_pa_exists(paddr_t); struct proc; void switchexit(struct proc *); diff --git a/sys/arch/sparc64/include/psl.h b/sys/arch/sparc64/include/psl.h index 392e4d4a738..520087e4af7 100644 --- a/sys/arch/sparc64/include/psl.h +++ b/sys/arch/sparc64/include/psl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psl.h,v 1.3 2002/03/14 01:26:45 millert Exp $ */ +/* $OpenBSD: psl.h,v 1.4 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: psl.h,v 1.20 2001/04/13 23:30:05 thorpej Exp $ */ /* @@ -310,8 +310,8 @@ void prom_printf(const char *fmt, ...); extern int printspl; #define SPLPRINT(x) if(printspl) { int i=10000000; prom_printf x ; while(i--); } #define SPL(name, newpil) \ -static __inline int name##X(const char*, int); \ -static __inline int name##X(const char* file, int line) \ +static __inline int name##X(const char *, int); \ +static __inline int name##X(const char *file, int line) \ { \ int oldpil; \ __asm __volatile("rdpr %%pil,%0" : "=r" (oldpil)); \ @@ -321,8 +321,8 @@ static __inline int name##X(const char* file, int line) \ } /* A non-priority-decreasing version of SPL */ #define SPLHOLD(name, newpil) \ -static __inline int name##X(const char*, int); \ -static __inline int name##X(const char* file, int line) \ +static __inline int name##X(const char *, int); \ +static __inline int name##X(const char * file, int line) \ { \ int oldpil; \ __asm __volatile("rdpr %%pil,%0" : "=r" (oldpil)); \ @@ -446,10 +446,10 @@ static __inline void splx(newpil) #define splhigh() splhighX(__FILE__, __LINE__) #define splx(x) splxX((x),__FILE__, __LINE__) -static __inline void splxX(int, const char*, int); +static __inline void splxX(int, const char *, int); static __inline void splxX(newpil, file, line) int newpil, line; - const char* file; + const char *file; #else static __inline void splx(newpil) int newpil; diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c index bc13591ce01..9cde49498cc 100644 --- a/sys/arch/sparc64/sparc64/autoconf.c +++ b/sys/arch/sparc64/sparc64/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.20 2002/03/14 01:26:45 millert Exp $ */ +/* $OpenBSD: autoconf.c,v 1.21 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */ /* @@ -320,7 +320,7 @@ bootpath_build() register long chosen; char buf[128]; - bzero((void*)bootpath, sizeof(bootpath)); + bzero((void *)bootpath, sizeof(bootpath)); bp = bootpath; /* @@ -1166,7 +1166,7 @@ extern struct sparc_bus_space_tag mainbus_space_tag; ma.ma_upaid = portid; if (getprop(node, "reg", sizeof(*ma.ma_reg), - &ma.ma_nreg, (void**)&ma.ma_reg) != 0) + &ma.ma_nreg, (void **)&ma.ma_reg) != 0) continue; #ifdef DEBUG if (autoconf_debug & ACDB_PROBE) { @@ -1179,7 +1179,7 @@ extern struct sparc_bus_space_tag mainbus_space_tag; } #endif rv = getprop(node, "interrupts", sizeof(*ma.ma_interrupts), - &ma.ma_ninterrupts, (void**)&ma.ma_interrupts); + &ma.ma_ninterrupts, (void **)&ma.ma_interrupts); if (rv != 0 && rv != ENOENT) { free(ma.ma_reg, M_DEVBUF); continue; @@ -1194,7 +1194,7 @@ extern struct sparc_bus_space_tag mainbus_space_tag; } #endif rv = getprop(node, "address", sizeof(*ma.ma_address), - &ma.ma_naddress, (void**)&ma.ma_address); + &ma.ma_naddress, (void **)&ma.ma_address); if (rv != 0 && rv != ENOENT) { free(ma.ma_reg, M_DEVBUF); if (ma.ma_ninterrupts) diff --git a/sys/arch/sparc64/sparc64/clock.c b/sys/arch/sparc64/sparc64/clock.c index 846a14798ff..9ffd293bf1b 100644 --- a/sys/arch/sparc64/sparc64/clock.c +++ b/sys/arch/sparc64/sparc64/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.9 2002/03/14 01:26:45 millert Exp $ */ +/* $OpenBSD: clock.c,v 1.10 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: clock.c,v 1.41 2001/07/24 19:29:25 eeh Exp $ */ /* @@ -570,10 +570,10 @@ timerattach(parent, self, aux) /* Install the appropriate interrupt vector here */ level10.ih_number = ma->ma_interrupts[0]; - level10.ih_clr = (void*)&timerreg_4u.t_clrintr[0]; + level10.ih_clr = (void *)&timerreg_4u.t_clrintr[0]; intr_establish(10, &level10); level14.ih_number = ma->ma_interrupts[1]; - level14.ih_clr = (void*)&timerreg_4u.t_clrintr[1]; + level14.ih_clr = (void *)&timerreg_4u.t_clrintr[1]; intr_establish(14, &level14); printf(" irq vectors %lx and %lx", diff --git a/sys/arch/sparc64/sparc64/db_disasm.c b/sys/arch/sparc64/sparc64/db_disasm.c index 9a34b5c05f5..36efa77f892 100644 --- a/sys/arch/sparc64/sparc64/db_disasm.c +++ b/sys/arch/sparc64/sparc64/db_disasm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_disasm.c,v 1.2 2001/08/20 20:23:53 jason Exp $ */ +/* $OpenBSD: db_disasm.c,v 1.3 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: db_disasm.c,v 1.9 2000/08/16 11:29:42 pk Exp $ */ /* @@ -114,18 +114,18 @@ struct sparc_insn { unsigned int match; - char* name; - char* format; + char *name; + char *format; }; -char* regs[] = { +char *regs[] = { "g0", "g1", "g2", "g3", "g4", "g5", "g6", "g7", "o0", "o1", "o2", "o3", "o4", "o5", "sp", "o7", "l0", "l1", "l2", "l3", "l4", "l5", "l6", "l7", "i0", "i1", "i2", "i3", "i4", "i5", "fp", "i7" }; -char* priv_regs[] = { +char *priv_regs[] = { "tpc", "tnpc", "tstate", "tt", "tick", "tba", "pstate", "tl", "pil", "cwp", "cansave", "canrestore", "cleanwin", "otherwin", "wstate", "fq", @@ -133,18 +133,18 @@ char* priv_regs[] = { "", "", "", "", "", "", "", "ver" }; -char* state_regs[] = { +char *state_regs[] = { "y", "", "ccr", "asi", "tick", "pc", "fprs", "asr", "", "", "", "", "", "", "", "", "pcr", "pic", "dcr", "gsr", "set_softint", "clr_softint", "softint", "tick_cmpr", "", "", "", "", "", "", "", "", "" }; -char* ccodes[] = { +char *ccodes[] = { "fcc0", "fcc1", "fcc2", "fcc3", "icc", "", "xcc", "" }; -char* prefetch[] = { +char *prefetch[] = { "n_reads", "one_read", "n_writes", "one_write", "page" }; @@ -882,7 +882,7 @@ db_disasm(loc, altfmt) unsigned int insn, you_lose, bitmask; int matchp; - char* f_ptr, *cp; + char *f_ptr, *cp; you_lose = 0; matchp = 0; diff --git a/sys/arch/sparc64/sparc64/db_interface.c b/sys/arch/sparc64/sparc64/db_interface.c index 70fbefc27b8..c52139d140c 100644 --- a/sys/arch/sparc64/sparc64/db_interface.c +++ b/sys/arch/sparc64/sparc64/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.5 2002/03/14 01:26:45 millert Exp $ */ +/* $OpenBSD: db_interface.c,v 1.6 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: db_interface.c,v 1.61 2001/07/31 06:55:47 eeh Exp $ */ /* @@ -970,7 +970,7 @@ db_uvmhistdump(addr, have_addr, count, modif) } #if NESP_SBUS -extern void db_esp(db_expr_t, int, db_expr_t, char*); +extern void db_esp(db_expr_t, int, db_expr_t, char *); #endif struct db_command db_machine_command_table[] = { diff --git a/sys/arch/sparc64/sparc64/db_trace.c b/sys/arch/sparc64/sparc64/db_trace.c index 44843390163..fa08ff82701 100644 --- a/sys/arch/sparc64/sparc64/db_trace.c +++ b/sys/arch/sparc64/sparc64/db_trace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_trace.c,v 1.3 2002/03/14 01:26:45 millert Exp $ */ +/* $OpenBSD: db_trace.c,v 1.4 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: db_trace.c,v 1.23 2001/07/10 06:06:16 eeh Exp $ */ /* @@ -526,7 +526,7 @@ db_dump_ts(addr, have_addr, count, modif) for (i=0; i<tl; i++) { printf("%d tt=%lx tstate=%lx tpc=%p tnpc=%p\n", i+1, (long)ts[i].tt, (u_long)ts[i].tstate, - (void*)(u_long)ts[i].tpc, (void*)(u_long)ts[i].tnpc); + (void *)(u_long)ts[i].tpc, (void *)(u_long)ts[i].tnpc); } } diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c index 9dac1573b39..7d572de7590 100644 --- a/sys/arch/sparc64/sparc64/machdep.c +++ b/sys/arch/sparc64/sparc64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.38 2002/03/14 01:26:45 millert Exp $ */ +/* $OpenBSD: machdep.c,v 1.39 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */ /*- @@ -1097,7 +1097,7 @@ stackdump() printf("Call traceback:\n"); while (fp && ((u_long)fp >> PGSHIFT) == ((u_long)sfp >> PGSHIFT)) { if( ((long)fp) & 1 ) { - fp64 = (struct frame64*)(((char*)fp)+BIAS); + fp64 = (struct frame64*)(((char *)fp)+BIAS); /* 64-bit frame */ printf("%llx(%llx, %llx, %llx, %llx, %llx, %llx, %llx) fp = %llx\n", (unsigned long long)fp64->fr_pc, @@ -1709,9 +1709,9 @@ static int sparc_bus_subregion(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_size_t, bus_space_handle_t *); static paddr_t sparc_bus_mmap(bus_space_tag_t, bus_addr_t, off_t, int, int); -static void *sparc_mainbus_intr_establish __P((bus_space_tag_t, int, int, +static void *sparc_mainbus_intr_establish(bus_space_tag_t, int, int, int, int (*)(void *), - void *)); + void *); static void sparc_bus_barrier(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_size_t, int); static int sparc_bus_alloc(bus_space_tag_t, bus_addr_t, bus_addr_t, diff --git a/sys/arch/sparc64/sparc64/openfirm.c b/sys/arch/sparc64/sparc64/openfirm.c index 1880ed64dd8..fd42ac2baa7 100644 --- a/sys/arch/sparc64/sparc64/openfirm.c +++ b/sys/arch/sparc64/sparc64/openfirm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: openfirm.c,v 1.6 2002/03/14 01:26:45 millert Exp $ */ +/* $OpenBSD: openfirm.c,v 1.7 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: openfirm.c,v 1.13 2001/06/21 00:08:02 eeh Exp $ */ /* @@ -353,7 +353,7 @@ OF_call_method(method, ihandle, nargs, nreturns, va_alist) args.method = ADR2CELL(method); args.ihandle = HDL2CELL(ihandle); va_start(ap, nreturns); - for (ip = (long*)(args.args_n_results + (n = nargs)); --n >= 0;) + for (ip = (long *)(args.args_n_results + (n = nargs)); --n >= 0;) *--ip = va_arg(ap, unsigned long); if (openfirmware(&args) == -1) { va_end(ap); @@ -363,7 +363,7 @@ OF_call_method(method, ihandle, nargs, nreturns, va_alist) va_end(ap); return args.args_n_results[nargs]; } - for (ip = (long*)(args.args_n_results + nargs + (n = args.nreturns)); --n > 0;) + for (ip = (long *)(args.args_n_results + nargs + (n = args.nreturns)); --n > 0;) *va_arg(ap, unsigned long *) = *--ip; va_end(ap); return 0; @@ -399,7 +399,7 @@ OF_call_method_1(method, ihandle, nargs, va_alist) args.method = ADR2CELL(method); args.ihandle = HDL2CELL(ihandle); va_start(ap, nargs); - for (ip = (long*)(args.args_n_results + (n = nargs)); --n >= 0;) + for (ip = (long *)(args.args_n_results + (n = nargs)); --n >= 0;) *--ip = va_arg(ap, unsigned long); va_end(ap); if (openfirmware(&args) == -1) { @@ -457,7 +457,7 @@ OF_close(handle) int OF_test(service) - char* service; + char *service; { struct { cell_t name; @@ -479,7 +479,7 @@ OF_test(service) int OF_test_method(service, method) int service; - char* method; + char *method; { struct { cell_t name; @@ -699,8 +699,8 @@ void args.nreturns = 1; args.newfunc = ADR2CELL(newfunc); if (openfirmware(&args) == -1) - return (void*)(long)-1; - return (void*)(long)args.oldfunc; + return (void *)(long)-1; + return (void *)(long)args.oldfunc; } void diff --git a/sys/arch/sparc64/sparc64/pmap.c b/sys/arch/sparc64/sparc64/pmap.c index 9a52101867d..f39bcfdaa27 100644 --- a/sys/arch/sparc64/sparc64/pmap.c +++ b/sys/arch/sparc64/sparc64/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.11 2002/03/14 01:26:45 millert Exp $ */ +/* $OpenBSD: pmap.c,v 1.12 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: pmap.c,v 1.107 2001/08/31 16:47:41 eeh Exp $ */ #undef NO_VCACHE /* Don't forget the locked TLB in dostart */ #define HWREF @@ -880,7 +880,7 @@ remap_data: */ sz = OF_getproplen(vmemh, "translations"); valloc(prom_map, struct prom_map, sz); - if (OF_getprop(vmemh, "translations", (void*)prom_map, sz) <= 0) { + if (OF_getprop(vmemh, "translations", (void *)prom_map, sz) <= 0) { prom_printf("no translations installed?"); OF_exit(); } @@ -960,7 +960,7 @@ remap_data: /* * Re-fetch translations -- they've certainly changed. */ - if (OF_getprop(vmemh, "translations", (void*)prom_map, sz) <= + if (OF_getprop(vmemh, "translations", (void *)prom_map, sz) <= 0) { prom_printf("no translations installed?"); OF_exit(); @@ -1095,7 +1095,7 @@ remap_data: bzero(tsb, TSBSIZE); BDPRINTF(PDB_BOOT1, ("firstaddr after TSB=%lx\r\n", (u_long)firstaddr)); - BDPRINTF(PDB_BOOT1, ("TSB allocated at %p size %08x\r\n", (void*)tsb, + BDPRINTF(PDB_BOOT1, ("TSB allocated at %p size %08x\r\n", (void *)tsb, (int)TSBSIZE)); first_phys_addr = mem->start; @@ -1668,7 +1668,7 @@ pmap_pinit(pm) pm->pm_segs = (int64_t *)(u_long)pm->pm_physaddr; if (!pm->pm_physaddr) panic("pmap_pinit"); #ifdef NOTDEF_DEBUG - printf("pmap_pinit: segs %p == %p\n", pm->pm_segs, (void*)page->phys_addr); + printf("pmap_pinit: segs %p == %p\n", pm->pm_segs, (void *)page->phys_addr); #endif ctx_alloc(pm); } @@ -3873,7 +3873,7 @@ pmap_testout() /* Allocate a page */ va = (vaddr_t)(vmmap - NBPG); ASSERT(va != NULL); - loc = (int*)va; + loc = (int *)va; pg = vm_page_alloc1(); pa = (paddr_t)VM_PAGE_TO_PHYS(pg); diff --git a/sys/arch/sparc64/stand/ofwboot/Locore.c b/sys/arch/sparc64/stand/ofwboot/Locore.c index 8bb954407a3..ba9d8626e8d 100644 --- a/sys/arch/sparc64/stand/ofwboot/Locore.c +++ b/sys/arch/sparc64/stand/ofwboot/Locore.c @@ -1,4 +1,4 @@ -/* $OpenBSD: Locore.c,v 1.3 2002/03/14 01:26:46 millert Exp $ */ +/* $OpenBSD: Locore.c,v 1.4 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: Locore.c,v 1.1 2000/08/20 14:58:36 mrg Exp $ */ /* @@ -814,15 +814,15 @@ OF_claim(virt, size, align) */ paddr_t paddr; - void* newvirt = NULL; + void * newvirt = NULL; if (virt == NULL) { - if ((virt = (void*)OF_alloc_virt(size, align)) == (void*)-1) { + if ((virt = (void *)OF_alloc_virt(size, align)) == (void *)-1) { printf("OF_alloc_virt(%d,%d) failed w/%x\n", size, align, virt); return (void *)-1; } } else { - if ((newvirt = (void*)OF_claim_virt((vaddr_t)virt, size)) == (void*)-1) { + if ((newvirt = (void *)OF_claim_virt((vaddr_t)virt, size)) == (void *)-1) { printf("OF_claim_virt(%x,%d) failed w/%x\n", virt, size, newvirt); return (void *)-1; } diff --git a/sys/arch/sparc64/stand/ofwboot/alloc.c b/sys/arch/sparc64/stand/ofwboot/alloc.c index 39d5258ada4..7fd70b4e2a0 100644 --- a/sys/arch/sparc64/stand/ofwboot/alloc.c +++ b/sys/arch/sparc64/stand/ofwboot/alloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: alloc.c,v 1.2 2001/08/20 19:55:33 jason Exp $ */ +/* $OpenBSD: alloc.c,v 1.3 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: alloc.c,v 1.1 2000/08/20 14:58:37 mrg Exp $ */ /* @@ -178,7 +178,7 @@ free(ptr, size) void *ptr; unsigned size; /* only for consistenct check */ { - register struct ml *a = (struct ml *)((char*)ptr - OVERHEAD); + register struct ml *a = (struct ml *)((char *)ptr - OVERHEAD); #ifdef ALLOC_TRACE printf("free(%lx, %u) (origsize %u)\n", (u_long)ptr, size, a->size); diff --git a/sys/arch/sparc64/stand/ofwboot/boot.c b/sys/arch/sparc64/stand/ofwboot/boot.c index 58ea26c65da..f5d983f41bb 100644 --- a/sys/arch/sparc64/stand/ofwboot/boot.c +++ b/sys/arch/sparc64/stand/ofwboot/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.5 2002/03/14 01:26:46 millert Exp $ */ +/* $OpenBSD: boot.c,v 1.6 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: boot.c,v 1.3 2001/05/31 08:55:19 mrg Exp $ */ /* * Copyright (c) 1997, 1999 Eduardo E. Horvath. All rights reserved. @@ -166,7 +166,7 @@ chain(pentry, args, ssym, esym) int l, machine_tag; long newargs[3]; - entry = (void*)(long)pentry; + entry = (void *)(long)pentry; freeall(); /* @@ -442,7 +442,7 @@ elf32_exec(fd, elf, entryp, ssymp, esymp) if (phdr.p_filesz < phdr.p_memsz) { printf("+%lu@0x%lx", phdr.p_memsz - phdr.p_filesz, (u_long)(phdr.p_vaddr + phdr.p_filesz)); - bzero((void*)phdr.p_vaddr + phdr.p_filesz, + bzero((void *)phdr.p_vaddr + phdr.p_filesz, phdr.p_memsz - phdr.p_filesz); } first = 0; diff --git a/sys/arch/sparc64/stand/ofwboot/elfXX_exec.c b/sys/arch/sparc64/stand/ofwboot/elfXX_exec.c index 252b48e1cec..d8ceeb14e1f 100644 --- a/sys/arch/sparc64/stand/ofwboot/elfXX_exec.c +++ b/sys/arch/sparc64/stand/ofwboot/elfXX_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: elfXX_exec.c,v 1.3 2001/09/20 23:26:02 jason Exp $ */ +/* $OpenBSD: elfXX_exec.c,v 1.4 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: elfXX_exec.c,v 1.2 2001/08/15 20:08:15 eeh Exp $ */ /* @@ -49,7 +49,7 @@ #define MEG (1024*1024) #if 0 -int CAT3(elf,ELFSIZE,_exec) __P((int, CAT3(Elf,ELFSIZE,_Ehdr) *, u_int64_t *, void **, void **)); +int CAT3(elf,ELFSIZE,_exec)(int, CAT3(Elf,ELFSIZE,_Ehdr) *, u_int64_t *, void **, void **); #endif #if defined(ELFSIZE) && (ELFSIZE == 32) #define ELF_ALIGN(x) (((x)+3)&(~3)) @@ -123,7 +123,7 @@ CAT3(elf, ELFSIZE, _exec)(fd, elf, entryp, ssymp, esymp) if (phdr.p_filesz < phdr.p_memsz) { printf("+%lu@0x%lx", (u_long)phdr.p_memsz - phdr.p_filesz, (u_long)(phdr.p_vaddr + phdr.p_filesz)); - bzero((void*)(long)phdr.p_vaddr + phdr.p_filesz, + bzero((void *)(long)phdr.p_vaddr + phdr.p_filesz, (size_t)phdr.p_memsz - phdr.p_filesz); } first = 0; diff --git a/sys/arch/sparc64/stand/ofwboot/openfirm.h b/sys/arch/sparc64/stand/ofwboot/openfirm.h index 5bdb18b3980..47e41197470 100644 --- a/sys/arch/sparc64/stand/ofwboot/openfirm.h +++ b/sys/arch/sparc64/stand/ofwboot/openfirm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: openfirm.h,v 1.3 2002/03/14 01:26:46 millert Exp $ */ +/* $OpenBSD: openfirm.h,v 1.4 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: openfirm.h,v 1.1 2000/08/20 14:58:42 mrg Exp $ */ /* @@ -55,5 +55,5 @@ int OF_seek(u_int handle, u_int64_t pos); void *OF_claim(void *virt, u_int size, u_int align); void OF_release(void *virt, u_int size); int OF_milliseconds(void); -void OF_chain __P((void *addr, u_int size, void (*entry)(), void *parm, u_int parmlen)); +void OF_chain(void *addr, u_int size, void (*entry)(), void *parm, u_int parmlen); diff --git a/sys/arch/sparc64/stand/ofwboot/srt0.s b/sys/arch/sparc64/stand/ofwboot/srt0.s index 72e28ed3c5d..8ffa5aa900b 100644 --- a/sys/arch/sparc64/stand/ofwboot/srt0.s +++ b/sys/arch/sparc64/stand/ofwboot/srt0.s @@ -1,4 +1,4 @@ -/* $OpenBSD: srt0.s,v 1.2 2001/08/20 19:55:33 jason Exp $ */ +/* $OpenBSD: srt0.s,v 1.3 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: srt0.s,v 1.1 2000/08/20 14:58:42 mrg Exp $ */ /* @@ -118,7 +118,7 @@ _start: nop /* - * void syncicache(void* start, int size) + * void syncicache(void *start, int size) * * I$ flush. Really simple. Just flush over the whole range. */ |