diff options
Diffstat (limited to 'sys')
397 files changed, 1414 insertions, 1460 deletions
diff --git a/sys/adosfs/advfsops.c b/sys/adosfs/advfsops.c index 3793672b307..1442490c5d8 100644 --- a/sys/adosfs/advfsops.c +++ b/sys/adosfs/advfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: advfsops.c,v 1.22 2002/03/14 01:26:25 millert Exp $ */ +/* $OpenBSD: advfsops.c,v 1.23 2002/03/14 03:15:49 millert Exp $ */ /* $NetBSD: advfsops.c,v 1.24 1996/12/22 10:10:12 cgd Exp $ */ /* @@ -56,8 +56,7 @@ int adosfs_mount(struct mount *, const char *, void *, struct nameidata *, int adosfs_start(struct mount *, int, struct proc *); int adosfs_unmount(struct mount *, int, struct proc *); int adosfs_root(struct mount *, struct vnode **); -int adosfs_quotactl(struct mount *, int, uid_t, caddr_t, - struct proc *); +int adosfs_quotactl(struct mount *, int, uid_t, caddr_t, struct proc *); int adosfs_statfs(struct mount *, struct statfs *, struct proc *); int adosfs_sync(struct mount *, int, struct ucred *, struct proc *); int adosfs_vget(struct mount *, ino_t, struct vnode **); diff --git a/sys/altq/altq_blue.c b/sys/altq/altq_blue.c index ef490d1b314..263ba50b0af 100644 --- a/sys/altq/altq_blue.c +++ b/sys/altq/altq_blue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: altq_blue.c,v 1.3 2002/03/14 01:26:26 millert Exp $ */ +/* $OpenBSD: altq_blue.c,v 1.4 2002/03/14 03:15:50 millert Exp $ */ /* $KAME: altq_blue.c,v 1.7 2000/12/14 08:12:45 thorpej Exp $ */ /* @@ -100,7 +100,7 @@ static blue_queue_t *blue_list = NULL; /* internal function prototypes */ static int blue_enqueue(struct ifaltq *, struct mbuf *, - struct altq_pktattr *); + struct altq_pktattr *); static struct mbuf *blue_dequeue(struct ifaltq *, int); static int drop_early(blue_t *); static int mark_ecn(struct mbuf *, struct altq_pktattr *, int); diff --git a/sys/altq/altq_blue.h b/sys/altq/altq_blue.h index 134fe07c916..c816aa659cb 100644 --- a/sys/altq/altq_blue.h +++ b/sys/altq/altq_blue.h @@ -1,4 +1,4 @@ -/* $OpenBSD: altq_blue.h,v 1.2 2002/03/14 01:26:26 millert Exp $ */ +/* $OpenBSD: altq_blue.h,v 1.3 2002/03/14 03:15:50 millert Exp $ */ /* $KAME: altq_blue.h,v 1.5 2000/12/14 08:12:45 thorpej Exp $ */ /* @@ -111,7 +111,7 @@ typedef struct blue_queue { extern int blue_init(blue_t *, int, int, int, int); extern int blue_addq(blue_t *, class_queue_t *, struct mbuf *, - struct altq_pktattr *); + struct altq_pktattr *); extern struct mbuf *blue_getq(blue_t *, class_queue_t *); #endif /* _KERNEL */ diff --git a/sys/altq/altq_cbq.c b/sys/altq/altq_cbq.c index a3a07578521..3dd5717740f 100644 --- a/sys/altq/altq_cbq.c +++ b/sys/altq/altq_cbq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: altq_cbq.c,v 1.3 2002/03/14 01:26:26 millert Exp $ */ +/* $OpenBSD: altq_cbq.c,v 1.4 2002/03/14 03:15:50 millert Exp $ */ /* $KAME: altq_cbq.c,v 1.9 2000/12/14 08:12:45 thorpej Exp $ */ /* @@ -63,7 +63,7 @@ static int cbq_add_class(struct cbq_add_class *); static int cbq_delete_class(struct cbq_delete_class *); static int cbq_modify_class(struct cbq_modify_class *); static int cbq_class_create(cbq_state_t *, struct cbq_add_class *, - struct rm_class *, struct rm_class *); + struct rm_class *, struct rm_class *); static int cbq_class_destroy(cbq_state_t *, struct rm_class *); static struct rm_class *clh_to_clp(cbq_state_t *, u_long); static int cbq_add_filter(struct cbq_add_filter *); @@ -76,7 +76,7 @@ static int cbq_set_enable(struct cbq_interface *, int); static int cbq_ifattach(struct cbq_interface *); static int cbq_ifdetach(struct cbq_interface *); static int cbq_enqueue(struct ifaltq *, struct mbuf *, - struct altq_pktattr *); + struct altq_pktattr *); static struct mbuf *cbq_dequeue(struct ifaltq *, int); static void cbqrestart(struct ifaltq *); static void get_class_stats(class_stats_t *, struct rm_class *); diff --git a/sys/altq/altq_cdnr.c b/sys/altq/altq_cdnr.c index 3b96ded5fd3..bc6d2ac776a 100644 --- a/sys/altq/altq_cdnr.c +++ b/sys/altq/altq_cdnr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: altq_cdnr.c,v 1.3 2002/03/14 01:26:26 millert Exp $ */ +/* $OpenBSD: altq_cdnr.c,v 1.4 2002/03/14 03:15:50 millert Exp $ */ /* $KAME: altq_cdnr.c,v 1.8 2000/12/14 08:12:45 thorpej Exp $ */ /* @@ -68,8 +68,8 @@ static int altq_cdnr_input(struct mbuf *, int); static struct top_cdnr *tcb_lookup(char *ifname); static struct cdnr_block *cdnr_handle2cb(u_long); static u_long cdnr_cb2handle(struct cdnr_block *); -static void *cdnr_cballoc __P((struct top_cdnr *, int, - struct tc_action *(*)(struct cdnr_block *, struct cdnr_pktinfo *))); +static void *cdnr_cballoc(struct top_cdnr *, int, + struct tc_action *(*)(struct cdnr_block *, struct cdnr_pktinfo *)); static void cdnr_cbdestroy(void *); static int tca_verify_action(struct tc_action *); static void tca_import_action(struct tc_action *, struct tc_action *); diff --git a/sys/altq/altq_fifoq.c b/sys/altq/altq_fifoq.c index 4649dcd3659..3177e9f62aa 100644 --- a/sys/altq/altq_fifoq.c +++ b/sys/altq/altq_fifoq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: altq_fifoq.c,v 1.3 2002/03/14 01:26:26 millert Exp $ */ +/* $OpenBSD: altq_fifoq.c,v 1.4 2002/03/14 03:15:50 millert Exp $ */ /* $KAME: altq_fifoq.c,v 1.7 2000/12/14 08:12:45 thorpej Exp $ */ /* @@ -59,7 +59,7 @@ static fifoq_state_t *fifoq_list = NULL; /* internal function prototypes */ static int fifoq_enqueue(struct ifaltq *, struct mbuf *, - struct altq_pktattr *); + struct altq_pktattr *); static struct mbuf *fifoq_dequeue(struct ifaltq *, int); static int fifoq_detach(fifoq_state_t *); static int fifoq_request(struct ifaltq *, int, void *); diff --git a/sys/altq/altq_rmclass.h b/sys/altq/altq_rmclass.h index 077e1279c55..91cf4b29ef9 100644 --- a/sys/altq/altq_rmclass.h +++ b/sys/altq/altq_rmclass.h @@ -1,4 +1,4 @@ -/* $OpenBSD: altq_rmclass.h,v 1.3 2002/03/14 01:26:26 millert Exp $ */ +/* $OpenBSD: altq_rmclass.h,v 1.4 2002/03/14 03:15:50 millert Exp $ */ /* $KAME: altq_rmclass.h,v 1.6 2000/12/09 09:22:44 kjc Exp $ */ /* @@ -240,17 +240,17 @@ struct rm_ifdat { #define is_a_parent_class(cl) ((cl)->children_ != NULL) -extern rm_class_t *rmc_newclass __P((int, struct rm_ifdat *, u_int, +extern rm_class_t *rmc_newclass(int, struct rm_ifdat *, u_int, void (*)(struct rm_class *, struct rm_class *), int, struct rm_class *, struct rm_class *, - u_int, int, u_int, int, int)); + u_int, int, u_int, int, int); extern void rmc_delete_class(struct rm_ifdat *, struct rm_class *); extern int rmc_modclass(struct rm_class *, u_int, int, u_int, int, u_int, int); -extern void rmc_init __P((struct ifaltq *, struct rm_ifdat *, u_int, +extern void rmc_init(struct ifaltq *, struct rm_ifdat *, u_int, void (*)(struct ifaltq *), - int, int, u_int, int, u_int, int)); + int, int, u_int, int, u_int, int); extern int rmc_queue_packet(struct rm_class *, mbuf_t *); extern mbuf_t *rmc_dequeue_next(struct rm_ifdat *, int); extern void rmc_update_class_util(struct rm_ifdat *); diff --git a/sys/altq/if_altq.h b/sys/altq/if_altq.h index bf1cbf369cf..365149e7887 100644 --- a/sys/altq/if_altq.h +++ b/sys/altq/if_altq.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_altq.h,v 1.3 2002/03/14 01:26:26 millert Exp $ */ +/* $OpenBSD: if_altq.h,v 1.4 2002/03/14 03:15:50 millert Exp $ */ /* $KAME: if_altq.h,v 1.6 2001/01/29 19:59:09 itojun Exp $ */ /* @@ -148,13 +148,13 @@ struct tb_regulator { #define ALTQ_IS_EMPTY(ifq) ((ifq)->ifq_len == 0) #define TBR_IS_ENABLED(ifq) ((ifq)->altq_tbr != NULL) -extern int altq_attach __P((struct ifaltq *, int, void *, +extern int altq_attach(struct ifaltq *, int, void *, int (*)(struct ifaltq *, struct mbuf *, struct altq_pktattr *), struct mbuf *(*)(struct ifaltq *, int), int (*)(struct ifaltq *, int, void *), void *, - void *(*)(void *, struct mbuf *, int))); + void *(*)(void *, struct mbuf *, int)); extern int altq_detach(struct ifaltq *); extern int altq_enable(struct ifaltq *); extern int altq_disable(struct ifaltq *); diff --git a/sys/arch/alpha/alpha/disksubr.c b/sys/arch/alpha/alpha/disksubr.c index ff4d99210e3..5b88097faaa 100644 --- a/sys/arch/alpha/alpha/disksubr.c +++ b/sys/arch/alpha/alpha/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.34 2002/03/14 01:26:26 millert Exp $ */ +/* $OpenBSD: disksubr.c,v 1.35 2002/03/14 03:15:50 millert Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -68,16 +68,16 @@ #if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL) void swapdisklabel(struct disklabel *d); -char *readbsdlabel __P((struct buf *, void (*)(struct buf *), int, int, - int, int, struct disklabel *, int)); +char *readbsdlabel(struct buf *, void (*)(struct buf *), int, int, + int, int, struct disklabel *, int); #endif #if defined(DISKLABEL_I386) || defined(DISKLABEL_ALL) -char *readdoslabel __P((struct buf *, void (*)(struct buf *), - struct disklabel *, struct cpu_disklabel *, int *, int *, int)); +char *readdoslabel(struct buf *, void (*)(struct buf *), + struct disklabel *, struct cpu_disklabel *, int *, int *, int); #endif #if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL) -char *readamigalabel __P((struct buf *, void (*)(struct buf *), - struct disklabel *, struct cpu_disklabel *, int)); +char *readamigalabel(struct buf *, void (*)(struct buf *), + struct disklabel *, struct cpu_disklabel *, int); #endif static enum disklabel_tag probe_order[] = { LABELPROBES, -1 }; diff --git a/sys/arch/alpha/eisa/eisa_machdep.h b/sys/arch/alpha/eisa/eisa_machdep.h index 52ac240c6c5..96b8165a4a1 100644 --- a/sys/arch/alpha/eisa/eisa_machdep.h +++ b/sys/arch/alpha/eisa/eisa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: eisa_machdep.h,v 1.4 2002/03/14 01:26:26 millert Exp $ */ +/* $OpenBSD: eisa_machdep.h,v 1.5 2002/03/14 03:15:50 millert Exp $ */ /* $NetBSD: eisa_machdep.h,v 1.1 1996/04/12 05:39:51 cgd Exp $ */ /* @@ -43,8 +43,8 @@ struct alpha_eisa_chipset { int (*ec_intr_map)(void *, u_int, eisa_intr_handle_t *); const char *(*ec_intr_string)(void *, eisa_intr_handle_t); - void *(*ec_intr_establish) __P((void *, eisa_intr_handle_t, - int, int, int (*)(void *), void *, char *)); + void *(*ec_intr_establish)(void *, eisa_intr_handle_t, + int, int, int (*)(void *), void *, char *); void (*ec_intr_disestablish)(void *, void *); }; diff --git a/sys/arch/alpha/include/intr.h b/sys/arch/alpha/include/intr.h index 2bc797a9b03..f030a102889 100644 --- a/sys/arch/alpha/include/intr.h +++ b/sys/arch/alpha/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.13 2002/03/14 01:26:27 millert Exp $ */ +/* $OpenBSD: intr.h,v 1.14 2002/03/14 03:15:50 millert Exp $ */ /* $NetBSD: intr.h,v 1.26 2000/06/03 20:47:41 thorpej Exp $ */ /*- @@ -207,7 +207,7 @@ struct alpha_soft_intr { unsigned long softintr_ipl; }; -void *softintr_establish __P((int, void (*)(void *), void *)); +void *softintr_establish(int, void (*)(void *), void *); void softintr_disestablish(void *); void softintr_init(void); void softintr_dispatch(void); @@ -229,8 +229,8 @@ extern struct alpha_soft_intrhand *softclock_intrhand; struct alpha_shared_intr *alpha_shared_intr_alloc(unsigned int); int alpha_shared_intr_dispatch(struct alpha_shared_intr *, unsigned int); -void *alpha_shared_intr_establish __P((struct alpha_shared_intr *, - unsigned int, int, int, int (*)(void *), void *, const char *)); +void *alpha_shared_intr_establish(struct alpha_shared_intr *, + unsigned int, int, int, int (*)(void *), void *, const char *); void alpha_shared_intr_disestablish(struct alpha_shared_intr *, void *, const char *); int alpha_shared_intr_get_sharetype(struct alpha_shared_intr *, diff --git a/sys/arch/alpha/isa/isa_machdep.h b/sys/arch/alpha/isa/isa_machdep.h index a2921e45875..55181455db8 100644 --- a/sys/arch/alpha/isa/isa_machdep.h +++ b/sys/arch/alpha/isa/isa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.h,v 1.11 2002/03/14 01:26:27 millert Exp $ */ +/* $OpenBSD: isa_machdep.h,v 1.12 2002/03/14 03:15:50 millert Exp $ */ /* $NetBSD: isa_machdep.h,v 1.3 1996/11/19 04:53:07 cgd Exp $ */ /* @@ -38,8 +38,8 @@ struct alpha_isa_chipset { void (*ic_attach_hook)(struct device *, struct device *, struct isabus_attach_args *); - void *(*ic_intr_establish) __P((void *, int, int, int, - int (*)(void *), void *, char *)); + void *(*ic_intr_establish)(void *, int, int, int, + int (*)(void *), void *, char *); void (*ic_intr_disestablish)(void *, void *); int (*ic_intr_alloc)(isa_chipset_tag_t *, int, int, int *); }; diff --git a/sys/arch/alpha/pci/pci_2100_a50.c b/sys/arch/alpha/pci/pci_2100_a50.c index 0da6944a7b1..7183e73e66f 100644 --- a/sys/arch/alpha/pci/pci_2100_a50.c +++ b/sys/arch/alpha/pci/pci_2100_a50.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_2100_a50.c,v 1.18 2002/03/14 01:26:27 millert Exp $ */ +/* $OpenBSD: pci_2100_a50.c,v 1.19 2002/03/14 03:15:50 millert Exp $ */ /* $NetBSD: pci_2100_a50.c,v 1.12 1996/11/13 21:13:29 cgd Exp $ */ /* @@ -56,8 +56,8 @@ int dec_2100_a50_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *); const char *dec_2100_a50_intr_string(void *, pci_intr_handle_t); int dec_2100_a50_intr_line(void *, pci_intr_handle_t); -void *dec_2100_a50_intr_establish __P((void *, pci_intr_handle_t, - int, int (*func)(void *), void *, char *)); +void *dec_2100_a50_intr_establish(void *, pci_intr_handle_t, + int, int (*func)(void *), void *, char *); void dec_2100_a50_intr_disestablish(void *, void *); #define APECS_SIO_DEVICE 7 /* XXX */ diff --git a/sys/arch/alpha/pci/pci_550.c b/sys/arch/alpha/pci/pci_550.c index c237901f380..2065d7aacdc 100644 --- a/sys/arch/alpha/pci/pci_550.c +++ b/sys/arch/alpha/pci/pci_550.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_550.c,v 1.8 2002/03/14 01:26:27 millert Exp $ */ +/* $OpenBSD: pci_550.c,v 1.9 2002/03/14 03:15:50 millert Exp $ */ /* $NetBSD: pci_550.c,v 1.18 2000/06/29 08:58:48 mrg Exp $ */ /*- @@ -99,12 +99,12 @@ int dec_550_intr_map(void *, pcitag_t, int, int, const char *dec_550_intr_string(void *, pci_intr_handle_t); int dec_550_intr_line(void *, pci_intr_handle_t); const struct evcnt *dec_550_intr_evcnt(void *, pci_intr_handle_t); -void *dec_550_intr_establish __P((void *, pci_intr_handle_t, - int, int (*func)(void *), void *, char *)); +void *dec_550_intr_establish(void *, pci_intr_handle_t, + int, int (*func)(void *), void *, char *); void dec_550_intr_disestablish(void *, void *); -void *dec_550_pciide_compat_intr_establish __P((void *, struct device *, - struct pci_attach_args *, int, int (*)(void *), void *)); +void *dec_550_pciide_compat_intr_establish(void *, struct device *, + struct pci_attach_args *, int, int (*)(void *), void *); void dec_550_pciide_compat_intr_disestablish(void *, void *); #define DEC_550_PCI_IRQ_BEGIN 8 diff --git a/sys/arch/alpha/pci/pci_6600.c b/sys/arch/alpha/pci/pci_6600.c index 1fe9051da1f..bebcd2eb766 100644 --- a/sys/arch/alpha/pci/pci_6600.c +++ b/sys/arch/alpha/pci/pci_6600.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_6600.c,v 1.8 2002/03/14 01:26:27 millert Exp $ */ +/* $OpenBSD: pci_6600.c,v 1.9 2002/03/14 03:15:50 millert Exp $ */ /* $NetBSD: pci_6600.c,v 1.5 2000/06/06 00:50:15 thorpej Exp $ */ /*- @@ -77,14 +77,14 @@ static char *irqtype = "6600 irq"; static struct tsp_config *sioprimary; void dec_6600_intr_disestablish(void *, void *); -void *dec_6600_intr_establish __P(( - void *, pci_intr_handle_t, int, int (*func)(void *), void *, char *)); +void *dec_6600_intr_establish(void *, pci_intr_handle_t, int, + int (*func)(void *), void *, char *); const char *dec_6600_intr_string(void *, pci_intr_handle_t); int dec_6600_intr_line(void *, pci_intr_handle_t); const struct evcnt *dec_6600_intr_evcnt(void *, pci_intr_handle_t); int dec_6600_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *); -void *dec_6600_pciide_compat_intr_establish __P((void *, struct device *, - struct pci_attach_args *, int, int (*)(void *), void *)); +void *dec_6600_pciide_compat_intr_establish(void *, struct device *, + struct pci_attach_args *, int, int (*)(void *), void *); void dec_6600_pciide_compat_intr_disestablish(void *, void *); struct alpha_shared_intr *dec_6600_pci_intr; diff --git a/sys/arch/alpha/pci/pci_axppci_33.c b/sys/arch/alpha/pci/pci_axppci_33.c index a9886b4e497..dd129f525f1 100644 --- a/sys/arch/alpha/pci/pci_axppci_33.c +++ b/sys/arch/alpha/pci/pci_axppci_33.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_axppci_33.c,v 1.16 2002/03/14 01:26:27 millert Exp $ */ +/* $OpenBSD: pci_axppci_33.c,v 1.17 2002/03/14 03:15:50 millert Exp $ */ /* $NetBSD: pci_axppci_33.c,v 1.10 1996/11/13 21:13:29 cgd Exp $ */ /* @@ -56,8 +56,8 @@ int dec_axppci_33_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *); const char *dec_axppci_33_intr_string(void *, pci_intr_handle_t); int dec_axppci_33_intr_line(void *, pci_intr_handle_t); -void *dec_axppci_33_intr_establish __P((void *, pci_intr_handle_t, - int, int (*func)(void *), void *, char *)); +void *dec_axppci_33_intr_establish(void *, pci_intr_handle_t, + int, int (*func)(void *), void *, char *); void dec_axppci_33_intr_disestablish(void *, void *); #define LCA_SIO_DEVICE 7 /* XXX */ diff --git a/sys/arch/alpha/pci/pci_eb164.c b/sys/arch/alpha/pci/pci_eb164.c index 6b49fb3de66..a26f1bd4e4c 100644 --- a/sys/arch/alpha/pci/pci_eb164.c +++ b/sys/arch/alpha/pci/pci_eb164.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_eb164.c,v 1.13 2002/03/14 01:26:27 millert Exp $ */ +/* $OpenBSD: pci_eb164.c,v 1.14 2002/03/14 03:15:50 millert Exp $ */ /* $NetBSD: pci_eb164.c,v 1.27 2000/06/06 00:50:15 thorpej Exp $ */ /*- @@ -99,12 +99,12 @@ int dec_eb164_intr_map(void *, pcitag_t, int, int, const char *dec_eb164_intr_string(void *, pci_intr_handle_t); int dec_eb164_intr_line(void *, pci_intr_handle_t); const struct evcnt *dec_eb164_intr_evcnt(void *, pci_intr_handle_t); -void *dec_eb164_intr_establish __P((void *, pci_intr_handle_t, - int, int (*func)(void *), void *, char *)); +void *dec_eb164_intr_establish(void *, pci_intr_handle_t, + int, int (*func)(void *), void *, char *); void dec_eb164_intr_disestablish(void *, void *); -void *dec_eb164_pciide_compat_intr_establish __P((void *, struct device *, - struct pci_attach_args *, int, int (*)(void *), void *)); +void *dec_eb164_pciide_compat_intr_establish(void *, struct device *, + struct pci_attach_args *, int, int (*)(void *), void *); void dec_eb164_pciide_compat_intr_disestablish(void *, void *); #define EB164_SIO_IRQ 4 diff --git a/sys/arch/alpha/pci/pci_eb64plus.c b/sys/arch/alpha/pci/pci_eb64plus.c index fef0dcc99b8..f342016fba1 100644 --- a/sys/arch/alpha/pci/pci_eb64plus.c +++ b/sys/arch/alpha/pci/pci_eb64plus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_eb64plus.c,v 1.2 2002/03/14 01:26:27 millert Exp $ */ +/* $OpenBSD: pci_eb64plus.c,v 1.3 2002/03/14 03:15:50 millert Exp $ */ /* $NetBSD: pci_eb64plus.c,v 1.10 2001/07/27 00:25:20 thorpej Exp $ */ /*- @@ -95,8 +95,8 @@ int dec_eb64plus_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *); const char *dec_eb64plus_intr_string(void *, pci_intr_handle_t); const struct evcnt *dec_eb64plus_intr_evcnt(void *, pci_intr_handle_t); -void *dec_eb64plus_intr_establish __P((void *, pci_intr_handle_t, - int, int (*func)(void *), void *, char *)); +void *dec_eb64plus_intr_establish(void *, pci_intr_handle_t, + int, int (*func)(void *), void *, char *); void dec_eb64plus_intr_disestablish(void *, void *); #define EB64PLUS_MAX_IRQ 32 diff --git a/sys/arch/alpha/pci/pci_kn20aa.c b/sys/arch/alpha/pci/pci_kn20aa.c index de876552622..51617e4c8db 100644 --- a/sys/arch/alpha/pci/pci_kn20aa.c +++ b/sys/arch/alpha/pci/pci_kn20aa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_kn20aa.c,v 1.17 2002/03/14 01:26:27 millert Exp $ */ +/* $OpenBSD: pci_kn20aa.c,v 1.18 2002/03/14 03:15:50 millert Exp $ */ /* $NetBSD: pci_kn20aa.c,v 1.21 1996/11/17 02:05:27 cgd Exp $ */ /* @@ -62,8 +62,8 @@ int dec_kn20aa_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *); const char *dec_kn20aa_intr_string(void *, pci_intr_handle_t); int dec_kn20aa_intr_line(void *, pci_intr_handle_t); -void *dec_kn20aa_intr_establish __P((void *, pci_intr_handle_t, - int, int (*func)(void *), void *, char *)); +void *dec_kn20aa_intr_establish(void *, pci_intr_handle_t, + int, int (*func)(void *), void *, char *); void dec_kn20aa_intr_disestablish(void *, void *); #define KN20AA_PCEB_IRQ 31 diff --git a/sys/arch/alpha/pci/pci_machdep.h b/sys/arch/alpha/pci/pci_machdep.h index e2ac0b6ed45..807dc3829cf 100644 --- a/sys/arch/alpha/pci/pci_machdep.h +++ b/sys/arch/alpha/pci/pci_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.h,v 1.18 2002/03/14 01:26:27 millert Exp $ */ +/* $OpenBSD: pci_machdep.h,v 1.19 2002/03/14 03:15:50 millert Exp $ */ /* $NetBSD: pci_machdep.h,v 1.6 1996/11/19 04:49:21 cgd Exp $ */ /* @@ -64,14 +64,14 @@ struct alpha_pci_chipset { pci_intr_handle_t *); const char *(*pc_intr_string)(void *, pci_intr_handle_t); int (*pc_intr_line)(void *, pci_intr_handle_t); - void *(*pc_intr_establish) __P((void *, pci_intr_handle_t, - int, int (*)(void *), void *, char *)); + void *(*pc_intr_establish)(void *, pci_intr_handle_t, + int, int (*)(void *), void *, char *); void (*pc_intr_disestablish)(void *, void *); /* alpha-specific */ - void *(*pc_pciide_compat_intr_establish) __P((void *, + void *(*pc_pciide_compat_intr_establish)(void *, struct device *, struct pci_attach_args *, int, - int (*)(void *), void *)); + int (*)(void *), void *); void (*pc_pciide_compat_intr_disestablish)(void *, void *); char *pc_name; /* PCI chipset name */ diff --git a/sys/arch/alpha/pci/siovar.h b/sys/arch/alpha/pci/siovar.h index 4cd708d8111..e8798963ec3 100644 --- a/sys/arch/alpha/pci/siovar.h +++ b/sys/arch/alpha/pci/siovar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: siovar.h,v 1.10 2002/03/14 01:26:27 millert Exp $ */ +/* $OpenBSD: siovar.h,v 1.11 2002/03/14 03:15:50 millert Exp $ */ /* $NetBSD: siovar.h,v 1.5 1996/10/23 04:12:34 cgd Exp $ */ /* @@ -33,8 +33,8 @@ void sio_iointr(void *framep, unsigned long vec); const char *sio_intr_string(void *, int); int sio_intr_line(void *, int); -void *sio_intr_establish __P((void *, int, int, int, int (*)(void *), - void *, char *)); +void *sio_intr_establish(void *, int, int, int, int (*)(void *), + void *, char *); void sio_intr_disestablish(void *, void *); #ifdef EVCNT_COUNTERS diff --git a/sys/arch/alpha/stand/netboot/dev_net.c b/sys/arch/alpha/stand/netboot/dev_net.c index b3c533766d9..eee6ab71730 100644 --- a/sys/arch/alpha/stand/netboot/dev_net.c +++ b/sys/arch/alpha/stand/netboot/dev_net.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dev_net.c,v 1.2 1997/05/05 06:02:00 millert Exp $ */ +/* $OpenBSD: dev_net.c,v 1.3 2002/03/14 03:15:51 millert Exp $ */ /* $NetBSD: dev_net.c,v 1.4 1997/04/06 08:41:24 cgd Exp $ */ /* @@ -107,7 +107,7 @@ net_open(struct open_file *f, ...) int error = 0; va_start(ap, f); - devname = va_arg(ap, char*); + devname = va_arg(ap, char *); va_end(ap); #ifdef NETIF_DEBUG diff --git a/sys/arch/alpha/tc/cfb.c b/sys/arch/alpha/tc/cfb.c index 54e90367a86..a6b01de3e4b 100644 --- a/sys/arch/alpha/tc/cfb.c +++ b/sys/arch/alpha/tc/cfb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cfb.c,v 1.13 2002/03/14 01:26:28 millert Exp $ */ +/* $OpenBSD: cfb.c,v 1.14 2002/03/14 03:15:51 millert Exp $ */ /* $NetBSD: cfb.c,v 1.7 1996/12/05 01:39:39 cgd Exp $ */ /* @@ -103,10 +103,10 @@ paddr_t cfbmmap(void *, off_t, int); int cfbintr(void *); static int cfb_alloc_screen(void *, const struct wsscreen_descr *, - void **, int *, int *, long *); + void **, int *, int *, long *); static void cfb_free_screen(void *, void *); -static int cfb_show_screen __P((void *, void *, int, - void (*) (void *, int, int), void *)); +static int cfb_show_screen(void *, void *, int, + void (*) (void *, int, int), void *); struct wsdisplay_accessops cfb_accessops = { cfbioctl, diff --git a/sys/arch/alpha/tc/sfb.c b/sys/arch/alpha/tc/sfb.c index e4498562ff2..5cd3fbc0021 100644 --- a/sys/arch/alpha/tc/sfb.c +++ b/sys/arch/alpha/tc/sfb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sfb.c,v 1.13 2002/03/14 01:26:28 millert Exp $ */ +/* $OpenBSD: sfb.c,v 1.14 2002/03/14 03:15:51 millert Exp $ */ /* $NetBSD: sfb.c,v 1.7 1996/12/05 01:39:44 cgd Exp $ */ /* @@ -101,10 +101,10 @@ int sfbioctl(void *, u_long, caddr_t, int, struct proc *); paddr_t sfbmmap(void *, off_t, int); static int sfb_alloc_screen(void *, const struct wsscreen_descr *, - void **, int *, int *, long *); + void **, int *, int *, long *); static void sfb_free_screen(void *, void *); -static int sfb_show_screen __P((void *, void *, int, - void (*) (void *, int, int), void *)); +static int sfb_show_screen(void *, void *, int, + void (*) (void *, int, int), void *); #if 0 void sfb_blank(struct sfb_devconfig *); diff --git a/sys/arch/alpha/tc/tc_3000_300.c b/sys/arch/alpha/tc/tc_3000_300.c index abf79b63b3f..81341c2842c 100644 --- a/sys/arch/alpha/tc/tc_3000_300.c +++ b/sys/arch/alpha/tc/tc_3000_300.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tc_3000_300.c,v 1.7 2002/03/14 01:26:28 millert Exp $ */ +/* $OpenBSD: tc_3000_300.c,v 1.8 2002/03/14 03:15:51 millert Exp $ */ /* $NetBSD: tc_3000_300.c,v 1.12 1996/10/13 03:00:37 christos Exp $ */ /* @@ -44,8 +44,8 @@ #include <alpha/tc/ioasicreg.h> void tc_3000_300_intr_setup(void); -void tc_3000_300_intr_establish __P((struct device *, void *, - tc_intrlevel_t, int (*)(void *), void *)); +void tc_3000_300_intr_establish(struct device *, void *, + tc_intrlevel_t, int (*)(void *), void *); void tc_3000_300_intr_disestablish(struct device *, void *); void tc_3000_300_iointr(void *, unsigned long); diff --git a/sys/arch/alpha/tc/tc_3000_500.c b/sys/arch/alpha/tc/tc_3000_500.c index 7e1dce6116f..79c987a8b27 100644 --- a/sys/arch/alpha/tc/tc_3000_500.c +++ b/sys/arch/alpha/tc/tc_3000_500.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tc_3000_500.c,v 1.8 2002/03/14 01:26:28 millert Exp $ */ +/* $OpenBSD: tc_3000_500.c,v 1.9 2002/03/14 03:15:51 millert Exp $ */ /* $NetBSD: tc_3000_500.c,v 1.12 1996/11/15 23:59:00 cgd Exp $ */ /* @@ -43,8 +43,8 @@ #include <alpha/tc/tc_3000_500.h> void tc_3000_500_intr_setup(void); -void tc_3000_500_intr_establish __P((struct device *, void *, - tc_intrlevel_t, int (*)(void *), void *)); +void tc_3000_500_intr_establish(struct device *, void *, + tc_intrlevel_t, int (*)(void *), void *); void tc_3000_500_intr_disestablish(struct device *, void *); void tc_3000_500_iointr(void *, unsigned long); diff --git a/sys/arch/alpha/tc/tc_conf.h b/sys/arch/alpha/tc/tc_conf.h index cb5eb0a89dd..a1c30c00cb2 100644 --- a/sys/arch/alpha/tc/tc_conf.h +++ b/sys/arch/alpha/tc/tc_conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tc_conf.h,v 1.5 2002/03/14 01:26:28 millert Exp $ */ +/* $OpenBSD: tc_conf.h,v 1.6 2002/03/14 03:15:51 millert Exp $ */ /* $NetBSD: tc_conf.h,v 1.3 1996/11/15 23:59:01 cgd Exp $ */ /* @@ -36,8 +36,8 @@ extern void tc_3000_500_intr_setup(void); extern void tc_3000_500_iointr(void *, unsigned long); -extern void tc_3000_500_intr_establish __P((struct device *, void *, - tc_intrlevel_t, int (*)(void *), void *)); +extern void tc_3000_500_intr_establish(struct device *, void *, + tc_intrlevel_t, int (*)(void *), void *); extern void tc_3000_500_intr_disestablish(struct device *, void *); extern int tc_3000_500_nslots; @@ -52,8 +52,8 @@ extern struct tc_builtin tc_3000_500_nographics_builtins[]; extern void tc_3000_300_intr_setup(void); extern void tc_3000_300_iointr(void *, unsigned long); -extern void tc_3000_300_intr_establish __P((struct device *, void *, - tc_intrlevel_t, int (*)(void *), void *)); +extern void tc_3000_300_intr_establish(struct device *, void *, + tc_intrlevel_t, int (*)(void *), void *); extern void tc_3000_300_intr_disestablish(struct device *, void *); extern int tc_3000_300_nslots; diff --git a/sys/arch/alpha/tc/tcdsvar.h b/sys/arch/alpha/tc/tcdsvar.h index e22a50099ea..d9de6cf829c 100644 --- a/sys/arch/alpha/tc/tcdsvar.h +++ b/sys/arch/alpha/tc/tcdsvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tcdsvar.h,v 1.6 2002/03/14 01:26:28 millert Exp $ */ +/* $OpenBSD: tcdsvar.h,v 1.7 2002/03/14 03:15:51 millert Exp $ */ /* $NetBSD: tcdsvar.h,v 1.5 1996/11/13 21:13:38 cgd Exp $ */ /* @@ -84,8 +84,8 @@ struct tcdsdev_attach_args { /* * TCDS functions. */ -void tcds_intr_establish __P((struct device *, void *, tc_intrlevel_t, - int (*)(void *), void *)); +void tcds_intr_establish(struct device *, void *, tc_intrlevel_t, + int (*)(void *), void *); void tcds_intr_disestablish(struct device *, void *); void tcds_dma_enable(struct tcds_slotconfig *, int); void tcds_scsi_enable(struct tcds_slotconfig *, int); diff --git a/sys/arch/amiga/amiga/amiga_init.c b/sys/arch/amiga/amiga/amiga_init.c index 8253bb6c75d..0b6ceb42fd6 100644 --- a/sys/arch/amiga/amiga/amiga_init.c +++ b/sys/arch/amiga/amiga/amiga_init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amiga_init.c,v 1.26 2002/03/14 01:26:28 millert Exp $ */ +/* $OpenBSD: amiga_init.c,v 1.27 2002/03/14 03:15:51 millert Exp $ */ /* $NetBSD: amiga_init.c,v 1.56 1997/06/10 18:22:24 veego Exp $ */ /* @@ -1046,7 +1046,7 @@ static void kernel_image_magic_copy(dest) u_char *dest; { - *((int*)dest) = ncfdev; + *((int *)dest) = ncfdev; dest += 4; bcopy(cfdev, dest, ncfdev * sizeof(struct cfdev) + memlist->m_nseg * sizeof(struct boot_memseg) + 4); diff --git a/sys/arch/amiga/amiga/disksubr.c b/sys/arch/amiga/amiga/disksubr.c index 218a7a8fbf9..61b4f64f1a9 100644 --- a/sys/arch/amiga/amiga/disksubr.c +++ b/sys/arch/amiga/amiga/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.21 2002/03/14 01:26:28 millert Exp $ */ +/* $OpenBSD: disksubr.c,v 1.22 2002/03/14 03:15:51 millert Exp $ */ /* $NetBSD: disksubr.c,v 1.27 1996/10/13 03:06:34 christos Exp $ */ /* @@ -71,8 +71,8 @@ struct rdbmap { u_long rdbchksum(void *); struct adostype getadostype(u_long); -struct rdbmap *getrdbmap __P((dev_t, void (*)(struct buf *), - struct disklabel *, struct cpu_disklabel *)); +struct rdbmap *getrdbmap(dev_t, void (*)(struct buf *), + struct disklabel *, struct cpu_disklabel *); /* XXX unknown function but needed for /sys/scsi to link */ void diff --git a/sys/arch/amiga/dev/aucc.c b/sys/arch/amiga/dev/aucc.c index 73655844593..bfa3ced0112 100644 --- a/sys/arch/amiga/dev/aucc.c +++ b/sys/arch/amiga/dev/aucc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aucc.c,v 1.7 2002/03/14 01:26:28 millert Exp $ */ +/* $OpenBSD: aucc.c,v 1.8 2002/03/14 03:15:51 millert Exp $ */ /* $NetBSD: aucc.c,v 1.22 1998/01/12 10:39:10 thorpej Exp $ */ /* @@ -165,10 +165,8 @@ int aucc_set_out_sr(void *, u_long); int aucc_query_encoding(void *, struct audio_encoding *); int aucc_round_blocksize(void *, int); int aucc_commit_settings(void *); -int aucc_start_output __P((void *, void *, int, void (*)(void *), - void *)); -int aucc_start_input __P((void *, void *, int, void (*)(void *), - void *)); +int aucc_start_output(void *, void *, int, void (*)(void *), void *); +int aucc_start_input(void *, void *, int, void (*)(void *), void *); int aucc_halt_output(void *); int aucc_halt_input(void *); int aucc_getdev(void *, struct audio_device *); diff --git a/sys/arch/amiga/dev/idesc.c b/sys/arch/amiga/dev/idesc.c index 648acdddbf6..4a329b2b90c 100644 --- a/sys/arch/amiga/dev/idesc.c +++ b/sys/arch/amiga/dev/idesc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: idesc.c,v 1.11 2002/03/14 01:26:29 millert Exp $ */ +/* $OpenBSD: idesc.c,v 1.12 2002/03/14 03:15:51 millert Exp $ */ /* $NetBSD: idesc.c,v 1.29 1996/12/23 09:10:12 veego Exp $ */ /* @@ -904,7 +904,7 @@ ideicmd(dev, target, cbuf, clen, buf, len) return (0); case MODE_SENSE: - mdsnbuf = (void*) buf; + mdsnbuf = (void *) buf; bzero(buf, *((u_char *)cbuf + 4)); switch (*((u_char *)cbuf + 2) & 0x3f) { case 4: diff --git a/sys/arch/amiga/dev/sbic.c b/sys/arch/amiga/dev/sbic.c index 29391173c2e..982099b8c57 100644 --- a/sys/arch/amiga/dev/sbic.c +++ b/sys/arch/amiga/dev/sbic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbic.c,v 1.16 2002/03/14 01:26:29 millert Exp $ */ +/* $OpenBSD: sbic.c,v 1.17 2002/03/14 03:15:51 millert Exp $ */ /* $NetBSD: sbic.c,v 1.28 1996/10/13 03:07:29 christos Exp $ */ /* @@ -291,7 +291,7 @@ void sbic_load_ptrs(dev, regs, target, lun) int target, lun; { int s, count; - char* vaddr, * paddr; + char *vaddr, *paddr; struct sbic_acb *acb; SBIC_TRACE(dev); @@ -322,7 +322,7 @@ void sbic_load_ptrs(dev, regs, target, lun) count = acb->sc_kv.dc_count; for(count = (NBPG - ((int)vaddr & PGOFSET)); count < acb->sc_kv.dc_count - && (char*)kvtop(vaddr + count + 4) == paddr + count + 4; + && (char *)kvtop(vaddr + count + 4) == paddr + count + 4; count += NBPG); /* If it's all contiguous... */ if(count > acb->sc_kv.dc_count ) { diff --git a/sys/arch/amiga/dev/sbicreg.h b/sys/arch/amiga/dev/sbicreg.h index a7b08a4dfcb..7fe4c66e855 100644 --- a/sys/arch/amiga/dev/sbicreg.h +++ b/sys/arch/amiga/dev/sbicreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sbicreg.h,v 1.3 1997/01/16 09:25:17 niklas Exp $ */ +/* $OpenBSD: sbicreg.h,v 1.4 2002/03/14 03:15:51 millert Exp $ */ /* $NetBSD: sbicreg.h,v 1.2 1994/10/26 02:04:40 cgd Exp $ */ /* @@ -404,7 +404,7 @@ typedef volatile sbic_padded_ind_regmap_t *sbic_regmap_p; #define SBIC_LOAD_COMMAND(regs,cmd,cmdsize) do { \ int n=(cmdsize)-1; \ - char *ptr = (char*)(cmd); \ + char *ptr = (char *)(cmd); \ sbic_write_reg(regs,SBIC_cdb1,*ptr++); \ while (n-- > 0) (regs)->sbic_value = *ptr++; \ } while (0) diff --git a/sys/arch/amiga/dev/sbicvar.h b/sys/arch/amiga/dev/sbicvar.h index a08864c0740..07910fd1036 100644 --- a/sys/arch/amiga/dev/sbicvar.h +++ b/sys/arch/amiga/dev/sbicvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sbicvar.h,v 1.5 2002/03/14 01:26:29 millert Exp $ */ +/* $OpenBSD: sbicvar.h,v 1.6 2002/03/14 03:15:51 millert Exp $ */ /* $NetBSD: sbicvar.h,v 1.11 1996/04/21 21:12:23 veego Exp $ */ /* @@ -96,7 +96,7 @@ struct sbic_tinfo { int touts; /* #timeouts */ int perrs; /* #parity errors */ int senses; /* #request sense commands sent */ - u_char* bounce; /* Bounce buffer for this device */ + u_char *bounce; /* Bounce buffer for this device */ ushort lubusy; /* What local units/subr. are busy? */ u_char flags; u_char period; /* Period suggestion */ diff --git a/sys/arch/amiga/include/mtpr.h b/sys/arch/amiga/include/mtpr.h index b09eaec9f7c..983b7e55763 100644 --- a/sys/arch/amiga/include/mtpr.h +++ b/sys/arch/amiga/include/mtpr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mtpr.h,v 1.5 2002/03/14 01:26:29 millert Exp $ */ +/* $OpenBSD: mtpr.h,v 1.6 2002/03/14 03:15:52 millert Exp $ */ /* $NetBSD: mtpr.h,v 1.10 1996/05/09 20:31:53 is Exp $ */ /* @@ -82,7 +82,7 @@ extern unsigned char ssir; #define setsoftcback() (ssir |= SIR_CBACK, setsoftint()) void softintr_schedule(void *); -void *softintr_establish __P((int, void (*)(void *), void *)); +void *softintr_establish(int, void (*)(void *), void *); #endif /* _KERNEL */ diff --git a/sys/arch/amiga/isa/cross.c b/sys/arch/amiga/isa/cross.c index b17fcde3d37..6e1bb20bac4 100644 --- a/sys/arch/amiga/isa/cross.c +++ b/sys/arch/amiga/isa/cross.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cross.c,v 1.21 2002/03/14 01:26:29 millert Exp $ */ +/* $OpenBSD: cross.c,v 1.22 2002/03/14 03:15:52 millert Exp $ */ /* * Copyright (c) 1994, 1996 Niklas Hallqvist, Carsten Hammer @@ -108,8 +108,8 @@ int crossintr(void *); void cross_attach_hook(struct device *, struct device *, struct isabus_attach_args *); -void *cross_intr_establish __P((void *, int, int, int, int (*)(void *), - void *, char *)); +void *cross_intr_establish(void *, int, int, int, int (*)(void *), + void *, char *); void cross_intr_disestablish(void *, void *); int cross_intr_check(void *, int, int); diff --git a/sys/arch/amiga/isa/ggbus.c b/sys/arch/amiga/isa/ggbus.c index c30dd46d0f2..356b148314b 100644 --- a/sys/arch/amiga/isa/ggbus.c +++ b/sys/arch/amiga/isa/ggbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ggbus.c,v 1.15 2002/03/14 01:26:29 millert Exp $ */ +/* $OpenBSD: ggbus.c,v 1.16 2002/03/14 03:15:52 millert Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Niklas Hallqvist @@ -70,8 +70,8 @@ int ggbusintr(void *); void ggbus_attach_hook(struct device *, struct device *, struct isabus_attach_args *); -void *ggbus_intr_establish __P((void *, int, int, int, int (*)(void *), - void *, char *)); +void *ggbus_intr_establish(void *, int, int, int, int (*)(void *), + void *, char *); void ggbus_intr_disestablish(void *, void *); int ggbus_intr_check(void *, int, int); diff --git a/sys/arch/amiga/isa/isa_machdep.h b/sys/arch/amiga/isa/isa_machdep.h index 6749560e84f..3b28d6a705d 100644 --- a/sys/arch/amiga/isa/isa_machdep.h +++ b/sys/arch/amiga/isa/isa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.h,v 1.5 2002/03/14 01:26:29 millert Exp $ */ +/* $OpenBSD: isa_machdep.h,v 1.6 2002/03/14 03:15:52 millert Exp $ */ /* * Copyright (c) 1995, 1996 Niklas Hallqvist @@ -44,8 +44,8 @@ struct amiga_isa_chipset { void (*ic_attach_hook)(struct device *, struct device *, struct isabus_attach_args *); - void *(*ic_intr_establish) __P((void *, int, int, int, - int (*)(void *), void *, char *)); + void *(*ic_intr_establish)(void *, int, int, int, + int (*)(void *), void *, char *); void (*ic_intr_disestablish)(void *, void *); int (*ic_intr_check)(void *, int, int); }; diff --git a/sys/arch/amiga/stand/boot/main.c b/sys/arch/amiga/stand/boot/main.c index bfaf4d86d9a..68d1a55bd4e 100644 --- a/sys/arch/amiga/stand/boot/main.c +++ b/sys/arch/amiga/stand/boot/main.c @@ -1,5 +1,5 @@ /* - * $OpenBSD: main.c,v 1.5 2002/03/14 01:26:29 millert Exp $ + * $OpenBSD: main.c,v 1.6 2002/03/14 03:15:52 millert Exp $ * $NetBSD: main.c,v 1.1.1.1 1996/11/29 23:36:29 is Exp $ * * @@ -382,7 +382,7 @@ pain() printf("+%lu]", (unsigned long)stringsz); if (read(io, (char *)nkcd, stringsz) != stringsz) goto err; - nkcd = (int*)((char *)nkcd + ((stringsz + 3) & ~3)); + nkcd = (int *)((char *)nkcd + ((stringsz + 3) & ~3)); esym = (char *)(textsz + eh->a_data + eh->a_bss + eh->a_syms + 4 + ((stringsz + 3) & ~3)); } diff --git a/sys/arch/amiga/stand/loadbsd/loadbsd.c b/sys/arch/amiga/stand/loadbsd/loadbsd.c index c6725aa7849..fb95e097f95 100644 --- a/sys/arch/amiga/stand/loadbsd/loadbsd.c +++ b/sys/arch/amiga/stand/loadbsd/loadbsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: loadbsd.c,v 1.15 2002/03/14 01:26:30 millert Exp $ */ +/* $OpenBSD: loadbsd.c,v 1.16 2002/03/14 03:15:52 millert Exp $ */ /* $NetBSD: loadbsd.c,v 1.22 1996/10/13 13:39:52 is Exp $ */ /* @@ -66,13 +66,6 @@ #define __LDPGSZ 8192 #if !defined(__NetBSD__) && !defined(__OpenBSD__) -#ifndef __P -#ifdef __STDC__ -#define __P(x) x -#else -#define __P(x) -#endif -#endif void err(int, const char *, ...); void errx(int, const char *, ...); void warn(const char *, ...); @@ -387,7 +380,7 @@ main(argc, argv) read(fd, (char *)nkcd, e.a_syms); nkcd = (int *)((char *)nkcd + e.a_syms); read(fd, (char *)nkcd, stringsz); - nkcd = (int*)((char *)nkcd + ((stringsz + 3) & ~3)); + nkcd = (int *)((char *)nkcd + ((stringsz + 3) & ~3)); esym = (char *)(textsz + e.a_data + e.a_bss + e.a_syms + 4 + ((stringsz + 3) & ~3)); } diff --git a/sys/arch/hp300/dev/diovar.h b/sys/arch/hp300/dev/diovar.h index b211dc371a3..61c1f156170 100644 --- a/sys/arch/hp300/dev/diovar.h +++ b/sys/arch/hp300/dev/diovar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: diovar.h,v 1.4 2002/03/14 01:26:30 millert Exp $ */ +/* $OpenBSD: diovar.h,v 1.5 2002/03/14 03:15:52 millert Exp $ */ /* $NetBSD: diovar.h,v 1.3 1997/05/05 21:01:33 thorpej Exp $ */ /*- @@ -77,6 +77,6 @@ struct dio_devdesc { #ifdef _KERNEL void *dio_scodetopa(int); -void *dio_intr_establish __P((int (*)(void *), void *, int, int)); +void *dio_intr_establish(int (*)(void *), void *, int, int); void dio_intr_disestablish(void *); #endif /* _KERNEL */ diff --git a/sys/arch/hp300/dev/frodovar.h b/sys/arch/hp300/dev/frodovar.h index 6958d75eef9..1377ac8d10c 100644 --- a/sys/arch/hp300/dev/frodovar.h +++ b/sys/arch/hp300/dev/frodovar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: frodovar.h,v 1.2 2002/03/14 01:26:30 millert Exp $ */ +/* $OpenBSD: frodovar.h,v 1.3 2002/03/14 03:15:52 millert Exp $ */ /* $NetBSD: frodovar.h,v 1.1 1997/05/12 08:03:50 thorpej Exp $ */ /* @@ -44,6 +44,6 @@ struct frodo_attach_args { #define frodocf_offset cf_loc[0] #define FRODO_UNKNOWN_OFFSET -1 -void frodo_intr_establish __P((struct device *, int (*func)(void *), - void *, int, int)); +void frodo_intr_establish(struct device *, int (*func)(void *), + void *, int, int); void frodo_intr_disestablish(struct device *, int); diff --git a/sys/arch/hp300/dev/grfvar.h b/sys/arch/hp300/dev/grfvar.h index 1c6a8ea3f3b..59ebc83f359 100644 --- a/sys/arch/hp300/dev/grfvar.h +++ b/sys/arch/hp300/dev/grfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: grfvar.h,v 1.7 2002/03/14 01:26:30 millert Exp $ */ +/* $OpenBSD: grfvar.h,v 1.8 2002/03/14 03:15:52 millert Exp $ */ /* $NetBSD: grfvar.h,v 1.10 1997/03/31 07:34:19 scottr Exp $ */ /* @@ -151,7 +151,7 @@ int grflckunmmap(dev_t, caddr_t); /* grf_subr.c prototypes */ struct itesw; -void grfdev_attach __P((struct grfdev_softc *, +void grfdev_attach(struct grfdev_softc *, int (*init)(struct grf_data *, int, caddr_t), - caddr_t, struct grfsw *, struct itesw *itesw)); + caddr_t, struct grfsw *, struct itesw *itesw); #endif /* _KERNEL */ diff --git a/sys/arch/hp300/hp300/db_memrw.c b/sys/arch/hp300/hp300/db_memrw.c index 67d075c5379..4a75e4f737e 100644 --- a/sys/arch/hp300/hp300/db_memrw.c +++ b/sys/arch/hp300/hp300/db_memrw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_memrw.c,v 1.8 2002/03/14 01:26:30 millert Exp $ */ +/* $OpenBSD: db_memrw.c,v 1.9 2002/03/14 03:15:52 millert Exp $ */ /* $NetBSD: db_memrw.c,v 1.5 1997/06/10 18:48:47 veego Exp $ */ /*- @@ -81,15 +81,15 @@ db_read_bytes(addr, size, data) size_t size; char *data; { - char *src = (char*)addr; + char *src = (char *)addr; if (size == 4) { - *((int*)data) = *((int*)src); + *((int *)data) = *((int *)src); return; } if (size == 2) { - *((short*)data) = *((short*)src); + *((short *)data) = *((short *)src); return; } @@ -209,12 +209,12 @@ db_write_bytes(addr, size, data) } if (size == 4) { - *((int*)dst) = *((int*)data); + *((int *)dst) = *((int *)data); return; } if (size == 2) { - *((short*)dst) = *((short*)data); + *((short *)dst) = *((short *)data); return; } diff --git a/sys/arch/hp300/include/autoconf.h b/sys/arch/hp300/include/autoconf.h index b21ee54e212..4b1d224559f 100644 --- a/sys/arch/hp300/include/autoconf.h +++ b/sys/arch/hp300/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.7 2002/03/14 01:26:31 millert Exp $ */ +/* $OpenBSD: autoconf.h,v 1.8 2002/03/14 03:15:52 millert Exp $ */ /* $NetBSD: autoconf.h,v 1.4 1997/04/01 03:03:56 scottr Exp $ */ /*- @@ -45,7 +45,7 @@ extern int convasize; /* size of mapping at conaddr */ extern int conforced; /* console has been forced */ void hp300_cninit(void); -void console_scan __P((int (*)(int, caddr_t, void *), void *)); +void console_scan(int (*)(int, caddr_t, void *), void *); caddr_t iomap(caddr_t, int); void iounmap(caddr_t, int); #endif /* _KERNEL */ diff --git a/sys/arch/hp300/include/intr.h b/sys/arch/hp300/include/intr.h index 2ede3c194a8..9465fbacf27 100644 --- a/sys/arch/hp300/include/intr.h +++ b/sys/arch/hp300/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.7 2002/03/14 01:26:31 millert Exp $ */ +/* $OpenBSD: intr.h,v 1.8 2002/03/14 03:15:52 millert Exp $ */ /* $NetBSD: intr.h,v 1.2 1997/07/24 05:43:08 scottr Exp $ */ /*- @@ -178,7 +178,7 @@ int spl0(void); /* intr.c */ void intr_init(void); -void *intr_establish __P((int (*)(void *), void *, int, int)); +void *intr_establish(int (*)(void *), void *, int, int); void intr_disestablish(void *); void intr_dispatch(int); void intr_printlevels(void); diff --git a/sys/arch/hppa/dev/pdc.c b/sys/arch/hppa/dev/pdc.c index 1c10c234214..8c53679f72c 100644 --- a/sys/arch/hppa/dev/pdc.c +++ b/sys/arch/hppa/dev/pdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pdc.c,v 1.23 2002/03/14 01:26:31 millert Exp $ */ +/* $OpenBSD: pdc.c,v 1.24 2002/03/14 03:15:53 millert Exp $ */ /* * Copyright (c) 1998-2002 Michael Shalayeff @@ -59,7 +59,7 @@ pz_device_t *pz_kbd, *pz_cons; hppa_hpa_t conaddr; int conunit; -int pdcmatch(struct device *, void *, void*); +int pdcmatch(struct device *, void *, void *); void pdcattach(struct device *, struct device *, void *); struct cfattach pdc_ca = { diff --git a/sys/arch/hppa/eisa/eisa_machdep.h b/sys/arch/hppa/eisa/eisa_machdep.h index 69c8883675e..732812c416b 100644 --- a/sys/arch/hppa/eisa/eisa_machdep.h +++ b/sys/arch/hppa/eisa/eisa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: eisa_machdep.h,v 1.3 2002/03/14 01:26:31 millert Exp $ */ +/* $OpenBSD: eisa_machdep.h,v 1.4 2002/03/14 03:15:53 millert Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -40,11 +40,11 @@ struct hppa_eisa_chipset { void *ec_v; void (*ec_attach_hook)(struct device *, struct device *, - struct eisabus_attach_args *); + struct eisabus_attach_args *); int (*ec_intr_map)(void *, u_int, int *); const char *(*ec_intr_string)(void *, int); - void *(*ec_intr_establish) __P((void *, int, int, int, - int (*)(void *), void *, char *)); + void *(*ec_intr_establish)(void *, int, int, int, + int (*)(void *), void *, char *); void (*ec_intr_disestablish)(void *, void *); }; diff --git a/sys/arch/hppa/gsc/gscbusvar.h b/sys/arch/hppa/gsc/gscbusvar.h index 1435f820729..b6721abe5b4 100644 --- a/sys/arch/hppa/gsc/gscbusvar.h +++ b/sys/arch/hppa/gsc/gscbusvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: gscbusvar.h,v 1.6 2002/03/14 01:26:31 millert Exp $ */ +/* $OpenBSD: gscbusvar.h,v 1.7 2002/03/14 03:15:53 millert Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -74,9 +74,9 @@ struct gsc_softc { u_int32_t sc_intrmask; }; -void *gsc_intr_establish __P((struct gsc_softc *sc, int pri, int irq, - int (*handler)(void *v), void *arg, - struct device *name)); +void *gsc_intr_establish(struct gsc_softc *sc, int pri, int irq, + int (*handler)(void *v), void *arg, + struct device *name); void gsc_intr_disestablish(struct gsc_softc *sc, void *v); int gsc_intr(void *); diff --git a/sys/arch/hppa/hppa/db_interface.c b/sys/arch/hppa/hppa/db_interface.c index 66e6a8b5072..0f8438c3d65 100644 --- a/sys/arch/hppa/hppa/db_interface.c +++ b/sys/arch/hppa/hppa/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.17 2002/03/14 01:26:31 millert Exp $ */ +/* $OpenBSD: db_interface.c,v 1.18 2002/03/14 03:15:53 millert Exp $ */ /* * Copyright (c) 1999-2000 Michael Shalayeff @@ -142,7 +142,7 @@ db_read_bytes(addr, size, data) size_t size; char *data; { - register char *src = (char*)addr; + register char *src = (char *)addr; while (size--) *data++ = *src++; diff --git a/sys/arch/hppa/hppa/disksubr.c b/sys/arch/hppa/hppa/disksubr.c index adaefeb50d3..6d4845d0a44 100644 --- a/sys/arch/hppa/hppa/disksubr.c +++ b/sys/arch/hppa/hppa/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.8 2002/03/14 01:26:31 millert Exp $ */ +/* $OpenBSD: disksubr.c,v 1.9 2002/03/14 03:15:53 millert Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -74,20 +74,20 @@ #if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL) void swapdisklabel(struct disklabel *d); -char *readbsdlabel __P((struct buf *, void (*)(struct buf *), int, int, - int, int, struct disklabel *, int)); +char *readbsdlabel(struct buf *, void (*)(struct buf *), int, int, + int, int, struct disklabel *, int); #endif #if defined(DISKLABEL_I386) || defined(DISKLABEL_ALL) -char *readdoslabel __P((struct buf *, void (*)(struct buf *), - struct disklabel *, struct cpu_disklabel *, int *, int *, int)); +char *readdoslabel(struct buf *, void (*)(struct buf *), + struct disklabel *, struct cpu_disklabel *, int *, int *, int); #endif #if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL) -char *readamigalabel __P((struct buf *, void (*)(struct buf *), - struct disklabel *, struct cpu_disklabel *, int)); +char *readamigalabel(struct buf *, void (*)(struct buf *), + struct disklabel *, struct cpu_disklabel *, int); #endif #if defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL) -char *readliflabel __P((struct buf *, void (*)(struct buf *), - struct disklabel *, struct cpu_disklabel *, int *, int *, int)); +char *readliflabel(struct buf *, void (*)(struct buf *), + struct disklabel *, struct cpu_disklabel *, int *, int *, int); #endif static enum disklabel_tag probe_order[] = { LABELPROBES, -1 }; diff --git a/sys/arch/hppa/include/autoconf.h b/sys/arch/hppa/include/autoconf.h index f926ce872ba..17d4c304f02 100644 --- a/sys/arch/hppa/include/autoconf.h +++ b/sys/arch/hppa/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.13 2002/03/14 01:26:32 millert Exp $ */ +/* $OpenBSD: autoconf.h,v 1.14 2002/03/14 03:15:53 millert Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -69,8 +69,8 @@ const char *hppa_mod_info(int, int); void pdc_scanbus(struct device *, struct confargs *, int bus, int); int mbprint(void *, const char *); int mbsubmatch(struct device *, void *, void *); -void *cpu_intr_establish __P((int pri, int, int (*handler)(void *), - void *arg, struct device *name)); +void *cpu_intr_establish(int pri, int, int (*handler)(void *), + void *arg, struct device *name); int clock_intr(void *); void dumpconf(void); diff --git a/sys/arch/hppa/isa/isa_machdep.h b/sys/arch/hppa/isa/isa_machdep.h index e87d4d776de..5be71734498 100644 --- a/sys/arch/hppa/isa/isa_machdep.h +++ b/sys/arch/hppa/isa/isa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.h,v 1.3 2002/03/14 01:26:32 millert Exp $ */ +/* $OpenBSD: isa_machdep.h,v 1.4 2002/03/14 03:15:53 millert Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -42,8 +42,8 @@ struct hppa_isa_chipset { void (*ic_attach_hook)(struct device *, struct device *, struct isabus_attach_args *); - void *(*ic_intr_establish) __P((void *, int, int, int, - int (*)(void *), void *, char *)); + void *(*ic_intr_establish)(void *, int, int, int, + int (*)(void *), void *, char *); void (*ic_intr_disestablish)(void *, void *); int (*ic_intr_check)(void *, int, int); }; diff --git a/sys/arch/hppa/spmath/dbl_float.h b/sys/arch/hppa/spmath/dbl_float.h index ee30283eb53..293071d08fb 100644 --- a/sys/arch/hppa/spmath/dbl_float.h +++ b/sys/arch/hppa/spmath/dbl_float.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dbl_float.h,v 1.6 2002/03/14 01:26:32 millert Exp $ */ +/* $OpenBSD: dbl_float.h,v 1.7 2002/03/14 03:15:53 millert Exp $ */ /* * Copyright 1996 1995 by Open Software Foundation, Inc. @@ -552,13 +552,13 @@ } -int dbl_fadd(dbl_floating_point *, dbl_floating_point*, dbl_floating_point*, unsigned int *); -int dbl_fcmp(dbl_floating_point *, dbl_floating_point*, unsigned int, unsigned int *); +int dbl_fadd(dbl_floating_point *, dbl_floating_point *, dbl_floating_point *, unsigned int *); +int dbl_fcmp(dbl_floating_point *, dbl_floating_point *, unsigned int, unsigned int *); int dbl_fdiv(dbl_floating_point *, dbl_floating_point *, dbl_floating_point *, unsigned int *); -int dbl_fmpy(dbl_floating_point *, dbl_floating_point *, dbl_floating_point*, unsigned int *); -int dbl_frem(dbl_floating_point *, dbl_floating_point *, dbl_floating_point*, unsigned int *); +int dbl_fmpy(dbl_floating_point *, dbl_floating_point *, dbl_floating_point *, unsigned int *); +int dbl_frem(dbl_floating_point *, dbl_floating_point *, dbl_floating_point *, unsigned int *); int dbl_fsqrt(dbl_floating_point *, dbl_floating_point *, unsigned int *); -int dbl_fsub(dbl_floating_point *, dbl_floating_point *, dbl_floating_point*, unsigned int *); +int dbl_fsub(dbl_floating_point *, dbl_floating_point *, dbl_floating_point *, unsigned int *); dbl_floating_point dbl_setoverflow(unsigned int); diff --git a/sys/arch/hppa/stand/libsa/cmd_hppa.c b/sys/arch/hppa/stand/libsa/cmd_hppa.c index 6ddee6e3f1f..24ad3783dcb 100644 --- a/sys/arch/hppa/stand/libsa/cmd_hppa.c +++ b/sys/arch/hppa/stand/libsa/cmd_hppa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd_hppa.c,v 1.3 2002/03/14 01:26:32 millert Exp $ */ +/* $OpenBSD: cmd_hppa.c,v 1.4 2002/03/14 03:15:53 millert Exp $ */ /* * Copyright (c) 2002 Miodrag Vallat @@ -130,7 +130,7 @@ int i_speeds[] = { 230400, }; -char* c_speeds[] = { +char *c_speeds[] = { "50", "75", "110", diff --git a/sys/arch/hppa/stand/libsa/pdc.c b/sys/arch/hppa/stand/libsa/pdc.c index 20119f8b580..f00a1e91f3b 100644 --- a/sys/arch/hppa/stand/libsa/pdc.c +++ b/sys/arch/hppa/stand/libsa/pdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pdc.c,v 1.10 1999/05/06 02:27:44 mickey Exp $ */ +/* $OpenBSD: pdc.c,v 1.11 2002/03/14 03:15:53 millert Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -444,10 +444,10 @@ fcacheall() if (debug) printf("pdc_cache:\nic={%u,%x,%x,%u,%u,%u}\n" "dc={%u,%x,%x,%u,%u,%u}\n", - pdc_cacheinfo.ic_size, *(u_int*)&pdc_cacheinfo.ic_conf, + pdc_cacheinfo.ic_size, *(u_int *)&pdc_cacheinfo.ic_conf, pdc_cacheinfo.ic_base, pdc_cacheinfo.ic_stride, pdc_cacheinfo.ic_count, pdc_cacheinfo.ic_loop, - pdc_cacheinfo.dc_size, *(u_int*)&pdc_cacheinfo.ic_conf, + pdc_cacheinfo.dc_size, *(u_int *)&pdc_cacheinfo.ic_conf, pdc_cacheinfo.dc_base, pdc_cacheinfo.dc_stride, pdc_cacheinfo.dc_count, pdc_cacheinfo.dc_loop); #endif diff --git a/sys/arch/i386/eisa/eisa_machdep.h b/sys/arch/i386/eisa/eisa_machdep.h index b1746e33ed8..a313d805fae 100644 --- a/sys/arch/i386/eisa/eisa_machdep.h +++ b/sys/arch/i386/eisa/eisa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: eisa_machdep.h,v 1.4 2002/03/14 01:26:32 millert Exp $ */ +/* $OpenBSD: eisa_machdep.h,v 1.5 2002/03/14 03:15:53 millert Exp $ */ /* $NetBSD: eisa_machdep.h,v 1.4 1997/06/06 23:12:52 thorpej Exp $ */ /* @@ -60,7 +60,6 @@ int eisa_maxslots(eisa_chipset_tag_t); int eisa_intr_map(eisa_chipset_tag_t, u_int, eisa_intr_handle_t *); const char *eisa_intr_string(eisa_chipset_tag_t, eisa_intr_handle_t); -void *eisa_intr_establish __P((eisa_chipset_tag_t, - eisa_intr_handle_t, int, int, int (*)(void *), void *, - char *)); +void *eisa_intr_establish(eisa_chipset_tag_t, eisa_intr_handle_t, + int, int, int (*)(void *), void *, char *); void eisa_intr_disestablish(eisa_chipset_tag_t, void *); diff --git a/sys/arch/i386/i386/apm.c b/sys/arch/i386/i386/apm.c index 236b226745e..b83b1a52369 100644 --- a/sys/arch/i386/i386/apm.c +++ b/sys/arch/i386/i386/apm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apm.c,v 1.52 2002/03/14 01:26:32 millert Exp $ */ +/* $OpenBSD: apm.c,v 1.53 2002/03/14 03:15:53 millert Exp $ */ /*- * Copyright (c) 1998-2001 Michael Shalayeff. All rights reserved. @@ -1022,7 +1022,7 @@ apmioctl(dev, cmd, data, flag, p) if ((flag & FWRITE) == 0) error = EBADF; else { - int flag = *(int*)data; + int flag = *(int *)data; DPRINTF(( "APM_IOC_PRN_CTL: %d\n", flag )); switch (flag) { case APM_PRINT_ON: /* enable printing */ diff --git a/sys/arch/i386/i386/math_emulate.c b/sys/arch/i386/i386/math_emulate.c index b8df8fef771..d51efca8c81 100644 --- a/sys/arch/i386/i386/math_emulate.c +++ b/sys/arch/i386/i386/math_emulate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: math_emulate.c,v 1.4 1996/05/07 07:21:48 deraadt Exp $ */ +/* $OpenBSD: math_emulate.c,v 1.5 2002/03/14 03:15:53 millert Exp $ */ /* $NetBSD: math_emulate.c,v 1.17 1996/05/03 19:42:17 christos Exp $ */ /* @@ -580,7 +580,7 @@ char * ea(struct trapframe * info, u_short code) I387.fos = 0x17; return (char *) offset; } - tmp = (long*)®(rm); + tmp = (long *)®(rm); switch (mod) { case 0: offset = 0; break; case 1: diff --git a/sys/arch/i386/isa/isa_machdep.h b/sys/arch/i386/isa/isa_machdep.h index 4886c9e21fb..b83df1b7976 100644 --- a/sys/arch/i386/isa/isa_machdep.h +++ b/sys/arch/i386/isa/isa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.h,v 1.16 2002/03/14 01:26:33 millert Exp $ */ +/* $OpenBSD: isa_machdep.h,v 1.17 2002/03/14 03:15:54 millert Exp $ */ /* $NetBSD: isa_machdep.h,v 1.7 1997/06/06 23:28:42 thorpej Exp $ */ /*- @@ -109,8 +109,8 @@ void isa_attach_hook(struct device *, struct device *, struct isabus_attach_args *); int isa_intr_alloc(isa_chipset_tag_t, int, int, int *); int isa_intr_check(isa_chipset_tag_t, int, int); -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_establish(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(isa_chipset_tag_t ic, void *handler); /* diff --git a/sys/arch/i386/isa/pccons.c b/sys/arch/i386/isa/pccons.c index 6f3e017d978..873dec344eb 100644 --- a/sys/arch/i386/isa/pccons.c +++ b/sys/arch/i386/isa/pccons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccons.c,v 1.49 2002/03/14 01:26:33 millert Exp $ */ +/* $OpenBSD: pccons.c,v 1.50 2002/03/14 03:15:54 millert Exp $ */ /* $NetBSD: pccons.c,v 1.99.4.1 1996/06/04 20:03:53 cgd Exp $ */ /*- @@ -691,8 +691,8 @@ pcioctl(dev, cmd, data, flag, p) * is the duration in msec. */ if (data) - sysbeep(((int*)data)[0], - (((int*)data)[1] * hz) / 1000); + sysbeep(((int *)data)[0], + (((int *)data)[1] * hz) / 1000); else sysbeep(BEEP_FREQ, BEEP_TIME); return 0; diff --git a/sys/arch/i386/pci/pci_machdep.h b/sys/arch/i386/pci/pci_machdep.h index 553136a4529..ffdd5d9d864 100644 --- a/sys/arch/i386/pci/pci_machdep.h +++ b/sys/arch/i386/pci/pci_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.h,v 1.10 2002/03/14 01:26:33 millert Exp $ */ +/* $OpenBSD: pci_machdep.h,v 1.11 2002/03/14 03:15:54 millert Exp $ */ /* $NetBSD: pci_machdep.h,v 1.7 1997/06/06 23:29:18 thorpej Exp $ */ /* @@ -92,8 +92,8 @@ int pci_intr_map(struct pci_attach_args *, pci_intr_handle_t *); #define pci_intr_line(ih) ((ih).line) const char *pci_intr_string(pci_chipset_tag_t, pci_intr_handle_t); -void *pci_intr_establish __P((pci_chipset_tag_t, pci_intr_handle_t, - int, int (*)(void *), void *, char *)); +void *pci_intr_establish(pci_chipset_tag_t, pci_intr_handle_t, + int, int (*)(void *), void *, char *); void pci_intr_disestablish(pci_chipset_tag_t, void *); void pci_decompose_tag(pci_chipset_tag_t, pcitag_t, int *, int *, int *); diff --git a/sys/arch/i386/pci/pcibiosvar.h b/sys/arch/i386/pci/pcibiosvar.h index 86d377f13c1..7934f4a761e 100644 --- a/sys/arch/i386/pci/pcibiosvar.h +++ b/sys/arch/i386/pci/pcibiosvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcibiosvar.h,v 1.9 2002/03/14 01:26:33 millert Exp $ */ +/* $OpenBSD: pcibiosvar.h,v 1.10 2002/03/14 03:15:54 millert Exp $ */ /* $NetBSD: pcibios.h,v 1.2 2000/04/28 17:15:16 uch Exp $ */ /* @@ -148,8 +148,8 @@ struct extent *pciaddr_search(int, bus_addr_t *, bus_size_t); int pci_intr_fixup(struct pcibios_softc *, pci_chipset_tag_t, bus_space_tag_t); int pci_bus_fixup(pci_chipset_tag_t, int); void pci_addr_fixup(struct pcibios_softc *, pci_chipset_tag_t, int); -void pci_device_foreach __P((struct pcibios_softc *, pci_chipset_tag_t, int, - void (*)(struct pcibios_softc *, pci_chipset_tag_t, pcitag_t))); +void pci_device_foreach(struct pcibios_softc *, pci_chipset_tag_t, int, + void (*)(struct pcibios_softc *, pci_chipset_tag_t, pcitag_t)); int pci_intr_header_fixup(pci_chipset_tag_t, pcitag_t, pci_intr_handle_t *); int pci_intr_route_link(pci_chipset_tag_t, pci_intr_handle_t *); int pci_intr_post_fixup(void); diff --git a/sys/arch/i386/stand/libsa/biosdev.c b/sys/arch/i386/stand/libsa/biosdev.c index db3090fb752..46f7faa2ccb 100644 --- a/sys/arch/i386/stand/libsa/biosdev.c +++ b/sys/arch/i386/stand/libsa/biosdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: biosdev.c,v 1.53 2002/03/14 01:26:34 millert Exp $ */ +/* $OpenBSD: biosdev.c,v 1.54 2002/03/14 03:15:54 millert Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -178,7 +178,7 @@ static __inline int biosd_rw(rw, dev, cyl, head, sect, nsect, buf) int rw, dev, cyl, head; int sect, nsect; - void* buf; + void * buf; { int rv; BIOS_regs.biosr_es = (u_int32_t)buf >> 4; @@ -229,7 +229,7 @@ int biosd_io(rw, dev, cyl, head, sect, nsect, buf) int rw, dev, cyl, head; int sect, nsect; - void* buf; + void * buf; { int j, error; void *bb; @@ -454,7 +454,7 @@ biosopen(struct open_file *f, ...) /* Try for disklabel again (might be removable media) */ if(dip->bios_info.flags & BDI_BADLABEL){ - const char *st = bios_getdisklabel((void*)biosdev, &dip->disklabel); + const char *st = bios_getdisklabel((void *)biosdev, &dip->disklabel); if (debug && st) printf("%s\n", st); diff --git a/sys/arch/i386/stand/libsa/biosdev.h b/sys/arch/i386/stand/libsa/biosdev.h index 675d17c11cc..156519f2bb7 100644 --- a/sys/arch/i386/stand/libsa/biosdev.h +++ b/sys/arch/i386/stand/libsa/biosdev.h @@ -1,4 +1,4 @@ -/* $OpenBSD: biosdev.h,v 1.26 2002/03/14 01:26:34 millert Exp $ */ +/* $OpenBSD: biosdev.h,v 1.27 2002/03/14 03:15:54 millert Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -42,7 +42,7 @@ int biosopen(struct open_file *, ...); int biosclose(struct open_file *); int biosioctl(struct open_file *, u_long, void *); int bios_getdiskinfo(int, bios_diskinfo_t *); -int biosd_io(int, int, int, int, int, int, void*); +int biosd_io(int, int, int, int, int, int, void *); const char * bios_getdisklabel(bios_diskinfo_t *, struct disklabel *); /* diskprobe.c */ diff --git a/sys/arch/i386/stand/libsa/cmd_i386.c b/sys/arch/i386/stand/libsa/cmd_i386.c index 70c7bb1774e..f0de0e8c9ce 100644 --- a/sys/arch/i386/stand/libsa/cmd_i386.c +++ b/sys/arch/i386/stand/libsa/cmd_i386.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd_i386.c,v 1.23 2002/03/14 01:26:34 millert Exp $ */ +/* $OpenBSD: cmd_i386.c,v 1.24 2002/03/14 03:15:54 millert Exp $ */ /* * Copyright (c) 1997-1999 Michael Shalayeff @@ -52,7 +52,7 @@ int Xmemory(void); int Xregs(void); /* From gidt.S */ -int bootbuf(void*, int); +int bootbuf(void *, int); const struct cmd_table cmd_machine[] = { { "boot", CMDT_CMD, Xboot }, @@ -87,7 +87,7 @@ Xboot() { #ifndef _TEST int dev, part, st; - char buf[DEV_BSIZE], *dest = (void*)BOOTBIOS_ADDR; + char buf[DEV_BSIZE], *dest = (void *)BOOTBIOS_ADDR; if(cmd.argc != 2) { printf("machine boot {fd,hd}<0123>[abcd]\n"); diff --git a/sys/arch/i386/stand/libsa/debug.c b/sys/arch/i386/stand/libsa/debug.c index d2374fea76a..5e06dd86bfb 100644 --- a/sys/arch/i386/stand/libsa/debug.c +++ b/sys/arch/i386/stand/libsa/debug.c @@ -1,4 +1,4 @@ -/* $OpenBSD: debug.c,v 1.8 2002/03/14 01:26:34 millert Exp $ */ +/* $OpenBSD: debug.c,v 1.9 2002/03/14 03:15:54 millert Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -83,7 +83,7 @@ dump_regs(trapno, arg) ((i%4)? ' ': '\n')); dump_mem("Code dump", (void *)*reg_values[8], 8); - /* %ebx (void*)((*reg_values[3] + 15) & ~0x0F) */ + /* %ebx (void *)((*reg_values[3] + 15) & ~0x0F) */ dump_mem("Memory dump", (void *)0x1a000, 48); dump_mem("Stack trace", (void *)(*reg_values[4]), 48); diff --git a/sys/arch/m68k/fpe/fpu_calcea.c b/sys/arch/m68k/fpe/fpu_calcea.c index 25338b03856..c3b2044e779 100644 --- a/sys/arch/m68k/fpe/fpu_calcea.c +++ b/sys/arch/m68k/fpe/fpu_calcea.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu_calcea.c,v 1.7 2002/03/14 01:26:34 millert Exp $ */ +/* $OpenBSD: fpu_calcea.c,v 1.8 2002/03/14 03:15:54 millert Exp $ */ /* $NetBSD: fpu_calcea.c,v 1.7 1996/10/16 06:27:05 scottr Exp $ */ /* @@ -478,7 +478,7 @@ fpu_store_ea(frame, insn, ea, src) #endif return SIGILL; } - dst = (char*)&frame->f_regs[ea->ea_regnum]; + dst = (char *)&frame->f_regs[ea->ea_regnum]; /* The destination is an int. */ if (len < 4) { dst += (4 - len); diff --git a/sys/arch/m68k/fpe/fpu_emulate.c b/sys/arch/m68k/fpe/fpu_emulate.c index 6f3502575fb..d17adad52d9 100644 --- a/sys/arch/m68k/fpe/fpu_emulate.c +++ b/sys/arch/m68k/fpe/fpu_emulate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu_emulate.c,v 1.9 2002/03/14 01:26:34 millert Exp $ */ +/* $OpenBSD: fpu_emulate.c,v 1.10 2002/03/14 03:15:54 millert Exp $ */ /* $NetBSD: fpu_emulate.c,v 1.14 1996/12/18 05:44:31 scottr Exp $ */ /* @@ -512,14 +512,14 @@ fpu_emul_fmovm(fe, insn) if (regmask & reglist) { if (fpu_to_mem) { sig = fpu_store_ea(frame, insn, &insn->is_ea0, - (char*)&fpregs[regnum * 3]); + (char *)&fpregs[regnum * 3]); if (fpu_debug_level & DL_RESULT) printf(" fpu_emul_fmovm: FP%d (%08x,%08x,%08x) saved\n", regnum, fpregs[regnum * 3], fpregs[regnum * 3 + 1], fpregs[regnum * 3 + 2]); } else { /* mem to fpu */ sig = fpu_load_ea(frame, insn, &insn->is_ea0, - (char*)&fpregs[regnum * 3]); + (char *)&fpregs[regnum * 3]); if (fpu_debug_level & DL_RESULT) printf(" fpu_emul_fmovm: FP%d (%08x,%08x,%08x) loaded\n", regnum, fpregs[regnum * 3], fpregs[regnum * 3 + 1], @@ -696,7 +696,7 @@ fpu_emul_arith(fe, insn) } } /* if (fpu_debug_level & DL_ARITH) */ - fpu_load_ea(frame, insn, &insn->is_ea0, (char*)buf); + fpu_load_ea(frame, insn, &insn->is_ea0, (char *)buf); if (format == FTYPE_WRD) { /* sign-extend */ buf[0] &= 0xffff; diff --git a/sys/arch/m68k/fpe/fpu_fscale.c b/sys/arch/m68k/fpe/fpu_fscale.c index 8a87f181061..0e936ade6b8 100644 --- a/sys/arch/m68k/fpe/fpu_fscale.c +++ b/sys/arch/m68k/fpe/fpu_fscale.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu_fscale.c,v 1.4 1997/01/13 11:51:05 niklas Exp $ */ +/* $OpenBSD: fpu_fscale.c,v 1.5 2002/03/14 03:15:54 millert Exp $ */ /* $NetBSD: fpu_fscale.c,v 1.6 1996/10/13 03:19:14 christos Exp $ */ /* @@ -145,7 +145,7 @@ fpu_emul_fscale(fe, insn) printf("%c%d@\n", regname, insn->is_ea0.ea_regnum & 7); } } - fpu_load_ea(frame, insn, &insn->is_ea0, (char*)buf); + fpu_load_ea(frame, insn, &insn->is_ea0, (char *)buf); if (fpu_debug_level & DL_FSCALE) { printf(" fpu_emul_fscale: src = %08x%08x%08x, siz = %d\n", diff --git a/sys/arch/m68k/m68k/db_memrw.c b/sys/arch/m68k/m68k/db_memrw.c index 2acefaf108d..95077c35f1b 100644 --- a/sys/arch/m68k/m68k/db_memrw.c +++ b/sys/arch/m68k/m68k/db_memrw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_memrw.c,v 1.3 2001/11/06 19:53:14 miod Exp $ */ +/* $OpenBSD: db_memrw.c,v 1.4 2002/03/14 03:15:54 millert Exp $ */ /* $NetBSD: db_memrw.c,v 1.1 1996/02/22 23:23:35 gwr Exp $ */ /* @@ -56,15 +56,15 @@ db_read_bytes(addr, size, data) register size_t size; register char *data; { - register char *src = (char*)addr; + register char *src = (char *)addr; if (size == 4) { - *((int*)data) = *((int*)src); + *((int *)data) = *((int *)src); return; } if (size == 2) { - *((short*)data) = *((short*)src); + *((short *)data) = *((short *)src); return; } @@ -86,12 +86,12 @@ db_write_bytes(addr, size, data) register char *dst = (char *)addr; if (size == 4) { - *((int*)dst) = *((int*)data); + *((int *)dst) = *((int *)data); return; } if (size == 2) { - *((short*)dst) = *((short*)data); + *((short *)dst) = *((short *)data); return; } diff --git a/sys/arch/m68k/m68k/db_trace.c b/sys/arch/m68k/m68k/db_trace.c index 288130d56d9..ef32a9471b3 100644 --- a/sys/arch/m68k/m68k/db_trace.c +++ b/sys/arch/m68k/m68k/db_trace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_trace.c,v 1.15 2002/03/14 01:26:35 millert Exp $ */ +/* $OpenBSD: db_trace.c,v 1.16 2002/03/14 03:15:54 millert Exp $ */ /* $NetBSD: db_trace.c,v 1.20 1997/02/05 05:10:25 scottr Exp $ */ /* @@ -78,9 +78,9 @@ db_var_short(varp, valp, op) int op; { if (op == DB_VAR_GET) - *valp = (db_expr_t) *((short*)varp->valuep); + *valp = (db_expr_t) *((short *)varp->valuep); else - *((short*)varp->valuep) = (short) *valp; + *((short *)varp->valuep) = (short) *valp; return(0); } diff --git a/sys/arch/mac68k/dev/grfvar.h b/sys/arch/mac68k/dev/grfvar.h index 19d3396ae49..f959b5698e7 100644 --- a/sys/arch/mac68k/dev/grfvar.h +++ b/sys/arch/mac68k/dev/grfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: grfvar.h,v 1.10 2002/03/14 01:26:35 millert Exp $ */ +/* $OpenBSD: grfvar.h,v 1.11 2002/03/14 03:15:55 millert Exp $ */ /* $NetBSD: grfvar.h,v 1.11 1996/08/04 06:03:58 scottr Exp $ */ /* @@ -151,7 +151,7 @@ int grfaddr(struct grf_softc *gp, register int off); int grfmap(dev_t dev, caddr_t *addrp, struct proc *p); int grfunmap(dev_t dev, caddr_t addr, struct proc *p); -void grf_establish __P((struct grfbus_softc *, nubus_slot *, +void grf_establish(struct grfbus_softc *, nubus_slot *, int (*)(struct grf_softc *, int, void *), - caddr_t (*)(struct grf_softc *, vm_offset_t))); + caddr_t (*)(struct grf_softc *, vm_offset_t)); int grfbusprint(void *, const char *); diff --git a/sys/arch/mac68k/dev/ncr5380.c b/sys/arch/mac68k/dev/ncr5380.c index a9ed67308eb..9a82fd74ca2 100644 --- a/sys/arch/mac68k/dev/ncr5380.c +++ b/sys/arch/mac68k/dev/ncr5380.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr5380.c,v 1.17 2002/03/14 01:26:35 millert Exp $ */ +/* $OpenBSD: ncr5380.c,v 1.18 2002/03/14 03:15:55 millert Exp $ */ /* $NetBSD: ncr5380.c,v 1.38 1996/12/19 21:48:18 scottr Exp $ */ /* @@ -325,7 +325,7 @@ ncr5380_scsi_cmd(struct scsi_xfer *xs) reqp->xs = xs; reqp->targ_id = xs->sc_link->target; reqp->targ_lun = xs->sc_link->lun; - reqp->xdata_ptr = (u_char*)xs->data; + reqp->xdata_ptr = (u_char *)xs->data; reqp->xdata_len = xs->datalen; memcpy(&reqp->xcmd, xs->cmd, sizeof(struct scsi_generic)); reqp->xcmd.bytes[0] |= reqp->targ_lun << 5; @@ -1768,7 +1768,7 @@ SC_REQ *reqp; * Initialize locals and requests' DMA-chain. */ req_len = reqp->xdata_len; - req_addr = (void*)reqp->xdata_ptr; + req_addr = (void *)reqp->xdata_ptr; dm = reqp->dm_cur = reqp->dm_last = reqp->dm_chain; dm->dm_count = dm->dm_addr = 0; reqp->dr_flag &= ~DRIVER_BOUNCING; diff --git a/sys/arch/mac68k/dev/nubus.c b/sys/arch/mac68k/dev/nubus.c index 631d6db420f..0b05e64abfa 100644 --- a/sys/arch/mac68k/dev/nubus.c +++ b/sys/arch/mac68k/dev/nubus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nubus.c,v 1.25 2002/03/14 01:26:35 millert Exp $ */ +/* $OpenBSD: nubus.c,v 1.26 2002/03/14 03:15:55 millert Exp $ */ /* $NetBSD: nubus.c,v 1.35 1997/04/22 20:20:32 scottr Exp $ */ /* @@ -833,5 +833,5 @@ nubus_mapin(paddr, sz) #endif pmap_update(pmap_kernel()); - return ((char*)retval); + return ((char *)retval); } diff --git a/sys/arch/mac68k/include/cpu.h b/sys/arch/mac68k/include/cpu.h index bee0b440bf6..9d72d9062a9 100644 --- a/sys/arch/mac68k/include/cpu.h +++ b/sys/arch/mac68k/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.23 2002/03/14 01:26:35 millert Exp $ */ +/* $OpenBSD: cpu.h,v 1.24 2002/03/14 03:15:55 millert Exp $ */ /* $NetBSD: cpu.h,v 1.45 1997/02/10 22:13:40 scottr Exp $ */ /* @@ -297,7 +297,7 @@ struct fpframe; struct pcb; /* machdep.c */ -void mac68k_set_bell_callback __P((int (*)(void *, int, int, int), void *)); +void mac68k_set_bell_callback(int (*)(void *, int, int, int), void *); int mac68k_ring_bell(int, int, int); u_int get_mapping(void); diff --git a/sys/arch/mac68k/include/psc.h b/sys/arch/mac68k/include/psc.h index 4e2a4436a49..59f28b5f51b 100644 --- a/sys/arch/mac68k/include/psc.h +++ b/sys/arch/mac68k/include/psc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psc.h,v 1.3 2002/03/14 01:26:35 millert Exp $ */ +/* $OpenBSD: psc.h,v 1.4 2002/03/14 03:15:55 millert Exp $ */ /* $NetBSD: psc.h,v 1.3 1998/04/24 05:27:24 scottr Exp $ */ /*- @@ -39,10 +39,10 @@ extern volatile u_int8_t *PSCBase; void psc_init(void); -int add_psc_lev3_intr __P((void (*)(void *), void *)); -int add_psc_lev4_intr __P((int, int (*)(void *), void *)); -int add_psc_lev5_intr __P((int, void (*)(void *), void *)); -int add_psc_lev6_intr __P((int, void (*)(void *), void *)); +int add_psc_lev3_intr(void (*)(void *), void *); +int add_psc_lev4_intr(int, int (*)(void *), void *); +int add_psc_lev5_intr(int, void (*)(void *), void *); +int add_psc_lev6_intr(int, void (*)(void *), void *); int remove_psc_lev3_intr(void); int remove_psc_lev4_intr(int); diff --git a/sys/arch/mac68k/include/viareg.h b/sys/arch/mac68k/include/viareg.h index c864493457a..4dfd890c8d4 100644 --- a/sys/arch/mac68k/include/viareg.h +++ b/sys/arch/mac68k/include/viareg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: viareg.h,v 1.9 2002/03/14 01:26:35 millert Exp $ */ +/* $OpenBSD: viareg.h,v 1.10 2002/03/14 03:15:55 millert Exp $ */ /* $NetBSD: viareg.h,v 1.6 1997/02/28 07:41:41 scottr Exp $ */ /*- @@ -194,10 +194,10 @@ void via_init(void); int rbv_vidstatus(void); void via_shutdown(void); void via_set_modem(int); -int add_nubus_intr __P((int, void (*)(void *, int), void *)); +int add_nubus_intr(int, void (*)(void *, int), void *); void enable_nubus_intr(void); -void via1_register_irq __P((int, void (*)(void *), void *)); -void via2_register_irq __P((int, void (*)(void *), void *)); +void via1_register_irq(int, void (*)(void *), void *); +void via2_register_irq(int, void (*)(void *), void *); extern void (*via1itab[7])(void *); extern void (*via2itab[7])(void *); diff --git a/sys/arch/mac68k/mac68k/disksubr.c b/sys/arch/mac68k/mac68k/disksubr.c index 11265408e29..e6c08d951f6 100644 --- a/sys/arch/mac68k/mac68k/disksubr.c +++ b/sys/arch/mac68k/mac68k/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.16 2002/03/14 01:26:35 millert Exp $ */ +/* $OpenBSD: disksubr.c,v 1.17 2002/03/14 03:15:55 millert Exp $ */ /* $NetBSD: disksubr.c,v 1.22 1997/11/26 04:18:20 briggs Exp $ */ /* @@ -107,8 +107,8 @@ static void setUfs(struct partmapentry *, struct disklabel *, int); static void setHfs(struct partmapentry *, struct disklabel *, int); static void setScratch(struct partmapentry *, struct disklabel *, int); static int getNamedType(struct partmapentry *, int, struct disklabel *, int, int, int *); -static char *read_mac_label __P((dev_t, void (*)(struct buf *), - register struct disklabel *, struct cpu_disklabel *)); +static char *read_mac_label(dev_t, void (*)(struct buf *), + register struct disklabel *, struct cpu_disklabel *); /* * Find an entry in the disk label that is unused and return it diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c index ceb1ca25508..846d76a09f7 100644 --- a/sys/arch/mac68k/mac68k/machdep.c +++ b/sys/arch/mac68k/mac68k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.95 2002/03/14 01:26:36 millert Exp $ */ +/* $OpenBSD: machdep.c,v 1.96 2002/03/14 03:15:55 millert Exp $ */ /* $NetBSD: machdep.c,v 1.207 1998/07/08 04:39:34 thorpej Exp $ */ /* @@ -239,7 +239,7 @@ static u_long get_physical(u_int, u_long *); void initcpu(void); int cpu_dumpsize(void); -int cpu_dump __P((int (*)(dev_t, daddr_t, caddr_t, size_t), daddr_t *)); +int cpu_dump(int (*)(dev_t, daddr_t, caddr_t, size_t), daddr_t *); void cpu_init_kcore_hdr(void); /* functions called from locore.s */ diff --git a/sys/arch/mac68k/mac68k/pmap_bootstrap.c b/sys/arch/mac68k/mac68k/pmap_bootstrap.c index 6503f559a87..4cc8c4231d5 100644 --- a/sys/arch/mac68k/mac68k/pmap_bootstrap.c +++ b/sys/arch/mac68k/mac68k/pmap_bootstrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_bootstrap.c,v 1.20 2002/03/14 01:26:36 millert Exp $ */ +/* $OpenBSD: pmap_bootstrap.c,v 1.21 2002/03/14 03:15:55 millert Exp $ */ /* $NetBSD: pmap_bootstrap.c,v 1.50 1999/04/07 06:14:33 scottr Exp $ */ /* @@ -252,14 +252,14 @@ pmap_bootstrap(nextpa, firstpa) * Initialize the final level 1 descriptor to map the last * block of level 2 descriptors. */ - ste = &(PA2VA(kstpa, u_int*))[SG4_LEV1SIZE-1]; - pte = &(PA2VA(kstpa, u_int*))[kstsize*NPTEPG - SG4_LEV2SIZE]; + ste = &(PA2VA(kstpa, u_int *))[SG4_LEV1SIZE-1]; + pte = &(PA2VA(kstpa, u_int *))[kstsize*NPTEPG - SG4_LEV2SIZE]; *ste = (u_int)pte | SG_U | SG_RW | SG_V; /* * Now initialize the final portion of that block of * descriptors to map the "last PT page". */ - pte = &(PA2VA(kstpa, u_int*)) + pte = &(PA2VA(kstpa, u_int *)) [kstsize*NPTEPG - NPTEPG/SG4_LEV3SIZE]; epte = &pte[NPTEPG/SG4_LEV3SIZE]; protoste = lkptpa | SG_U | SG_RW | SG_V; @@ -295,8 +295,8 @@ pmap_bootstrap(nextpa, firstpa) * and the software Sysptmap. Note that Sysptmap is also * considered a PT page hence the +1. */ - ste = PA2VA(kstpa, u_int*); - pte = PA2VA(kptmpa, u_int*); + ste = PA2VA(kstpa, u_int *); + pte = PA2VA(kptmpa, u_int *); epte = &pte[nptpages+1]; protoste = kptpa | SG_RW | SG_V; protopte = kptpa | PG_RW | PG_CI | PG_V; diff --git a/sys/arch/macppc/dev/adb_direct.c b/sys/arch/macppc/dev/adb_direct.c index eb25d2c239a..e045523b73a 100644 --- a/sys/arch/macppc/dev/adb_direct.c +++ b/sys/arch/macppc/dev/adb_direct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adb_direct.c,v 1.3 2002/03/14 01:26:36 millert Exp $ */ +/* $OpenBSD: adb_direct.c,v 1.4 2002/03/14 03:15:55 millert Exp $ */ /* $NetBSD: adb_direct.c,v 1.14 2000/06/08 22:10:45 tsubai Exp $ */ /* From: adb_direct.c 2.02 4/18/97 jpw */ @@ -1007,7 +1007,7 @@ adb_soft_intr(void) /* call default completion routine if it's valid */ if (comprout) { - ((int (*)(u_char *, u_char*, int)) comprout) + ((int (*)(u_char *, u_char *, int)) comprout) (buffer, compdata, cmd); #if 0 #ifdef __NetBSD__ diff --git a/sys/arch/macppc/dev/apm.c b/sys/arch/macppc/dev/apm.c index 49952497b99..c88d0a518f7 100644 --- a/sys/arch/macppc/dev/apm.c +++ b/sys/arch/macppc/dev/apm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apm.c,v 1.3 2002/03/14 01:26:36 millert Exp $ */ +/* $OpenBSD: apm.c,v 1.4 2002/03/14 03:15:55 millert Exp $ */ /*- * Copyright (c) 2001 Alexander Guy. All rights reserved. @@ -245,7 +245,7 @@ apmioctl(dev, cmd, data, flag, p) if ((flag & FWRITE) == 0) error = EBADF; else { - int flag = *(int*)data; + int flag = *(int *)data; DPRINTF(( "APM_IOC_PRN_CTL: %d\n", flag )); switch (flag) { case APM_PRINT_ON: /* enable printing */ diff --git a/sys/arch/macppc/dev/openpic.c b/sys/arch/macppc/dev/openpic.c index fff9bda75c1..7acbf97a4a6 100644 --- a/sys/arch/macppc/dev/openpic.c +++ b/sys/arch/macppc/dev/openpic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: openpic.c,v 1.15 2002/03/14 01:26:36 millert Exp $ */ +/* $OpenBSD: openpic.c,v 1.16 2002/03/14 03:15:55 millert Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -169,7 +169,7 @@ openpic_attach(parent, self, aux) #if 1 mac_intr_establish(parent, 0x37, IST_LEVEL, - IPL_HIGH, openpic_prog_button, (void*)0x37, "prog button"); + IPL_HIGH, openpic_prog_button, (void *)0x37, "prog button"); #endif ppc_intr_enable(1); diff --git a/sys/arch/macppc/dev/uni_n.c b/sys/arch/macppc/dev/uni_n.c index 8c8d8fd6022..759bf2fe3f1 100644 --- a/sys/arch/macppc/dev/uni_n.c +++ b/sys/arch/macppc/dev/uni_n.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uni_n.c,v 1.3 2002/03/14 01:26:36 millert Exp $ */ +/* $OpenBSD: uni_n.c,v 1.4 2002/03/14 03:15:55 millert Exp $ */ /* * Copyright (c) 1998-2001 Dale Rahn. All rights reserved. @@ -108,7 +108,7 @@ uni_n_config(int handle) if (OF_getprop(handle, "reg", &address, sizeof address) > 0) { baseaddr = mapiodev(address, NBPG); - ctladdr = (void*)(baseaddr + 0x20); + ctladdr = (void *)(baseaddr + 0x20); *ctladdr |= 0x02; return baseaddr; } diff --git a/sys/arch/macppc/dev/viareg.h b/sys/arch/macppc/dev/viareg.h index 43bd20ccbac..7d22035bf07 100644 --- a/sys/arch/macppc/dev/viareg.h +++ b/sys/arch/macppc/dev/viareg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: viareg.h,v 1.2 2002/03/14 01:26:36 millert Exp $ */ +/* $OpenBSD: viareg.h,v 1.3 2002/03/14 03:15:55 millert Exp $ */ /* $NetBSD: viareg.h,v 1.2 1998/10/20 14:56:30 tsubai Exp $ */ /*- @@ -235,10 +235,10 @@ void via_init(void); int rbv_vidstatus(void); void via_shutdown(void); void via_set_modem(int); -int add_nubus_intr __P((int, void (*)(void *, int), void *)); +int add_nubus_intr(int, void (*)(void *, int), void *); void enable_nubus_intr(void); -void via1_register_irq __P((int, void (*)(void *), void *)); -void via2_register_irq __P((int, void (*)(void *), void *)); +void via1_register_irq(int, void (*)(void *), void *); +void via2_register_irq(int, void (*)(void *), void *); extern void (*via1itab[7])(void *); extern void (*via2itab[7])(void *); diff --git a/sys/arch/macppc/include/autoconf.h b/sys/arch/macppc/include/autoconf.h index 137191816bb..643537699f9 100644 --- a/sys/arch/macppc/include/autoconf.h +++ b/sys/arch/macppc/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.3 2002/03/14 01:26:36 millert Exp $ */ +/* $OpenBSD: autoconf.h,v 1.4 2002/03/14 03:15:55 millert Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -93,15 +93,15 @@ struct confargs { }; -void set_clockintr __P((void (*)(struct clockframe *))); -void set_iointr __P((void (*)(void *, int))); +void set_clockintr(void (*)(struct clockframe *)); +void set_iointr(void (*)(void *, int)); int badaddr(void *, u_int32_t); void calc_delayconst(void); void ofrootfound(void); 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_establish_t)(void *, mac_intr_handle_t, + int, int, int (*func)(void *), void *, char *); typedef void (intr_disestablish_t)(void *, void *); intr_establish_t mac_intr_establish; diff --git a/sys/arch/macppc/include/powerpc.h b/sys/arch/macppc/include/powerpc.h index e5cb3674d17..12deaff95c6 100644 --- a/sys/arch/macppc/include/powerpc.h +++ b/sys/arch/macppc/include/powerpc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: powerpc.h,v 1.2 2002/03/14 01:26:36 millert Exp $ */ +/* $OpenBSD: powerpc.h,v 1.3 2002/03/14 03:15:55 millert Exp $ */ /* $NetBSD: powerpc.h,v 1.1 1996/09/30 16:34:30 ws Exp $ */ /* @@ -79,7 +79,7 @@ extern struct firmware *fw; void ofwconprobe(void); int ppc_open_pci_bridge(void); void ppc_close_pci_bridge(int); -void install_extint __P((void (*handler) (void))); +void install_extint(void (*handler) (void)); void ppc_intr_enable(int enable); int ppc_intr_disable(void); diff --git a/sys/arch/macppc/macppc/db_memrw.c b/sys/arch/macppc/macppc/db_memrw.c index d8dc2405755..df6a8507e48 100644 --- a/sys/arch/macppc/macppc/db_memrw.c +++ b/sys/arch/macppc/macppc/db_memrw.c @@ -1,5 +1,5 @@ /* $NetBSD: db_memrw.c,v 1.4 2001/05/18 20:38:27 matt Exp $ */ -/* $OpenBSD: db_memrw.c,v 1.3 2001/11/06 19:53:15 miod Exp $ */ +/* $OpenBSD: db_memrw.c,v 1.4 2002/03/14 03:15:56 millert Exp $ */ /* * Mach Operating System @@ -58,7 +58,7 @@ db_read_bytes(addr, size, data) register size_t size; register char *data; { - register char *src = (char*)addr; + register char *src = (char *)addr; faultbuf env; faultbuf *old_onfault = curpcb->pcb_onfault; if (setfault(env)) { @@ -67,9 +67,9 @@ db_read_bytes(addr, size, data) } if (size == 4) { - *((int*)data) = *((int*)src); + *((int *)data) = *((int *)src); } else if (size == 2) { - *((short*)data) = *((short*)src); + *((short *)data) = *((short *)src); } else { while (size > 0) { --size; @@ -98,9 +98,9 @@ db_write_bytes(addr, size, data) } if (size == 4) { - *((int*)dst) = *((int*)data); + *((int *)dst) = *((int *)data); } else if (size == 2) { - *((short*)dst) = *((short*)data); + *((short *)dst) = *((short *)data); } else { while (size > 0) { --size; diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c index 5ed759c7b5c..7900f832b39 100644 --- a/sys/arch/macppc/macppc/machdep.c +++ b/sys/arch/macppc/macppc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.29 2002/03/14 01:26:36 millert Exp $ */ +/* $OpenBSD: machdep.c,v 1.30 2002/03/14 03:15:56 millert Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -168,8 +168,8 @@ int power4e_get_eth_addr(void); void nameinterrupt(int replace, char *newstr); void ppc_intr_setup(intr_establish_t *establish, intr_disestablish_t *disestablish); -void *ppc_intr_establish __P((void *lcv, pci_intr_handle_t ih, int type, - int level, int (*func)(void *), void *arg, char *name)); +void *ppc_intr_establish(void *lcv, pci_intr_handle_t ih, int type, + int level, int (*func)(void *), void *arg, char *name); int bus_mem_add_mapping(bus_addr_t bpa, bus_size_t size, int cacheable, bus_space_handle_t *bshp); @@ -690,7 +690,7 @@ setregs(p, pack, stack, retval) pargs = -roundup(-stack + 8, 16); newstack = (u_int32_t)(pargs - 32); - copyin ((void*)(VM_MAX_ADDRESS-0x10), &args, 0x10); + copyin ((void *)(VM_MAX_ADDRESS-0x10), &args, 0x10); bzero(tf, sizeof *tf); tf->fixreg[1] = newstack; @@ -1287,7 +1287,7 @@ mapiodev(pa, len) spa += PAGE_SIZE; vaddr += PAGE_SIZE; } - return (void*) (va+off); + return (void *) (va+off); } void unmapiodev(kva, p_size) diff --git a/sys/arch/macppc/macppc/mainbus.c b/sys/arch/macppc/macppc/mainbus.c index b70fe629442..c8333b619a5 100644 --- a/sys/arch/macppc/macppc/mainbus.c +++ b/sys/arch/macppc/macppc/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.3 2002/03/14 01:26:36 millert Exp $ */ +/* $OpenBSD: mainbus.c,v 1.4 2002/03/14 03:15:56 millert Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -52,7 +52,7 @@ struct cfdriver mainbus_cd = { NULL, "mainbus", DV_DULL, NULL, 0 }; -void mb_intr_establish __P((struct confargs *, int (*)(void *), void *)); +void mb_intr_establish(struct confargs *, int (*)(void *), void *); void mb_intr_disestablish(struct confargs *); caddr_t mb_cvtaddr(struct confargs *); int mb_matchname(struct confargs *, char *); diff --git a/sys/arch/macppc/pci/macobio.c b/sys/arch/macppc/pci/macobio.c index 47ff27afab2..32411cc17f3 100644 --- a/sys/arch/macppc/pci/macobio.c +++ b/sys/arch/macppc/pci/macobio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macobio.c,v 1.3 2002/03/14 01:26:37 millert Exp $ */ +/* $OpenBSD: macobio.c,v 1.4 2002/03/14 03:15:56 millert Exp $ */ /* $NetBSD: obio.c,v 1.6 1999/05/01 10:36:08 tsubai Exp $ */ /*- @@ -49,8 +49,8 @@ void macobio_attach(struct device *, struct device *, void *); int macobio_match(struct device *, void *, void *); int macobio_print(void *, const char *); -void *undef_mac_establish __P((void * lcv, int irq, int type, int level, - int (*ih_fun)(void *), void *ih_arg, char *name)); +void *undef_mac_establish(void * lcv, int irq, int type, int level, + int (*ih_fun)(void *), void *ih_arg, char *name); void mac_intr_disestab(void *lcp, void *arg); struct macobio_softc { diff --git a/sys/arch/macppc/pci/mpcpcibus.c b/sys/arch/macppc/pci/mpcpcibus.c index 4899cf4ba72..29fe192b517 100644 --- a/sys/arch/macppc/pci/mpcpcibus.c +++ b/sys/arch/macppc/pci/mpcpcibus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpcpcibus.c,v 1.8 2002/03/14 01:26:37 millert Exp $ */ +/* $OpenBSD: mpcpcibus.c,v 1.9 2002/03/14 03:15:56 millert Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -78,8 +78,8 @@ void mpc_conf_write(void *, pcitag_t, int, pcireg_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_establish(void *, pci_intr_handle_t, + int, int (*func)(void *), void *, char *); void mpc_intr_disestablish(void *, void *); int mpc_ether_hw_addr(struct ppc_pci_chipset *, u_int8_t *); u_int32_t mpc_gen_config_reg(void *cpv, pcitag_t tag, int offset); diff --git a/sys/arch/macppc/pci/vgafbvar.h b/sys/arch/macppc/pci/vgafbvar.h index cfb9cd1c7aa..79e5042655f 100644 --- a/sys/arch/macppc/pci/vgafbvar.h +++ b/sys/arch/macppc/pci/vgafbvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vgafbvar.h,v 1.3 2002/03/14 01:26:37 millert Exp $ */ +/* $OpenBSD: vgafbvar.h,v 1.4 2002/03/14 03:15:56 millert Exp $ */ /* $NetBSD: vgavar.h,v 1.2 1996/11/23 06:06:43 cgd Exp $ */ /* @@ -81,5 +81,5 @@ paddr_t vgafb_mmap(void *, off_t, int); int vgafb_alloc_screen(void *v, const struct wsscreen_descr *type, void **cookiep, int *curxp, int *curyp, long *attrp); void vgafb_free_screen(void *v, void *cookie); -int vgafb_show_screen __P((void *v, void *cookie, int waitok, - void (*cb)(void *, int, int), void *cbarg)); +int vgafb_show_screen(void *v, void *cookie, int waitok, + void (*cb)(void *, int, int), void *cbarg); diff --git a/sys/arch/macppc/stand/alloc.c b/sys/arch/macppc/stand/alloc.c index f6b6f65cc16..2c49b93adb6 100644 --- a/sys/arch/macppc/stand/alloc.c +++ b/sys/arch/macppc/stand/alloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: alloc.c,v 1.1 2001/09/01 15:39:02 drahn Exp $ */ +/* $OpenBSD: alloc.c,v 1.2 2002/03/14 03:15:56 millert Exp $ */ /* $NetBSD: alloc.c,v 1.1 1997/04/16 20:29:16 thorpej Exp $ */ /* @@ -181,7 +181,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/macppc/stand/boot.c b/sys/arch/macppc/stand/boot.c index 906e5f3222b..43b296e19df 100644 --- a/sys/arch/macppc/stand/boot.c +++ b/sys/arch/macppc/stand/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.4 2002/03/14 01:26:37 millert Exp $ */ +/* $OpenBSD: boot.c,v 1.5 2002/03/14 03:15:56 millert Exp $ */ /* $NetBSD: boot.c,v 1.1 1997/04/16 20:29:17 thorpej Exp $ */ /* @@ -245,7 +245,7 @@ main() ssym = (void *)marks[MARK_SYM]; esym = (void *)marks[MARK_END]; - chain ((void*)entry, bootline, ssym, esym); + chain ((void *)entry, bootline, ssym, esym); _rtt(); return 0; diff --git a/sys/arch/macppc/stand/openfirm.h b/sys/arch/macppc/stand/openfirm.h index b1cd3fefad3..b374e8df782 100644 --- a/sys/arch/macppc/stand/openfirm.h +++ b/sys/arch/macppc/stand/openfirm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: openfirm.h,v 1.2 2002/03/14 01:26:37 millert Exp $ */ +/* $OpenBSD: openfirm.h,v 1.3 2002/03/14 03:15:56 millert Exp $ */ /* $NetBSD: openfirm.h,v 1.1 1997/04/16 20:29:23 thorpej Exp $ */ /* @@ -52,5 +52,5 @@ int OF_seek(int handle, u_quad_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/mvme68k/dev/cl.c b/sys/arch/mvme68k/dev/cl.c index 66deacb69a6..9bf8c735b4f 100644 --- a/sys/arch/mvme68k/dev/cl.c +++ b/sys/arch/mvme68k/dev/cl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cl.c,v 1.24 2002/03/14 01:26:37 millert Exp $ */ +/* $OpenBSD: cl.c,v 1.25 2002/03/14 03:15:56 millert Exp $ */ /* * Copyright (c) 1995 Dale Rahn. All rights reserved. @@ -193,7 +193,7 @@ int clstop(struct tty *tp, int flag); static void cl_initchannel(struct clsoftc *sc, int channel); static void clputc(struct clsoftc *sc, int unit, u_char c); static u_char clgetc(struct clsoftc *sc, int *channel); -static void cloutput __P( (struct tty *tp)); +static void cloutput(struct tty *tp); void cl_softint(struct clsoftc *sc); void cl_appendbufn(struct clsoftc *sc, u_char channel, u_char *buf, u_short cnt); diff --git a/sys/arch/mvme68k/dev/sbic.c b/sys/arch/mvme68k/dev/sbic.c index f396e4bc08b..4845d9173b2 100644 --- a/sys/arch/mvme68k/dev/sbic.c +++ b/sys/arch/mvme68k/dev/sbic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbic.c,v 1.9 2002/03/14 01:26:37 millert Exp $ */ +/* $OpenBSD: sbic.c,v 1.10 2002/03/14 03:15:56 millert Exp $ */ /* $NetBSD: sbic.c,v 1.2 1996/04/23 16:32:54 chuck Exp $ */ /* @@ -317,7 +317,7 @@ sbic_load_ptrs(dev) for (count = (NBPG - ((int)vaddr & PGOFSET)); count < acb->sc_kv.dc_count && - (char*)kvtop(vaddr + count + 4) == paddr + count + 4; + (char *)kvtop(vaddr + count + 4) == paddr + count + 4; count += NBPG) ; /* Do nothing */ diff --git a/sys/arch/mvme68k/dev/wl.c b/sys/arch/mvme68k/dev/wl.c index 8a5638cea2d..15b9c02f714 100644 --- a/sys/arch/mvme68k/dev/wl.c +++ b/sys/arch/mvme68k/dev/wl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wl.c,v 1.7 2002/03/14 01:26:37 millert Exp $ */ +/* $OpenBSD: wl.c,v 1.8 2002/03/14 03:15:56 millert Exp $ */ /* * Copyright (c) 1995 Dale Rahn. All rights reserved. @@ -197,7 +197,7 @@ int wlstop(struct tty *tp, int flag); static void cl_initchannel(struct wlsoftc *sc, int channel); static void clputc(struct wlsoftc *sc, int unit, u_char c); static u_char clgetc(struct wlsoftc *sc, int *channel); -static void cloutput __P( (struct tty *tp)); +static void cloutput(struct tty *tp); struct cfattach wl_ca = { sizeof(struct wlsoftc), wlprobe, wlattach diff --git a/sys/arch/mvme68k/include/intr.h b/sys/arch/mvme68k/include/intr.h index cd0c173bb3d..f13dd140750 100644 --- a/sys/arch/mvme68k/include/intr.h +++ b/sys/arch/mvme68k/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.5 2002/03/14 01:26:37 millert Exp $ */ +/* $OpenBSD: intr.h,v 1.6 2002/03/14 03:15:56 millert Exp $ */ /* * Copyright (C) 2000 Steve Murphree, Jr. * All rights reserved. @@ -42,7 +42,7 @@ extern unsigned char ssir; #define setsoftint(x) ssir |= (x) #define setsoftnet() ssir |= SIR_NET #define setsoftclock() ssir |= SIR_CLOCK -u_long allocate_sir __P((void (*proc)(), void *arg)); +u_long allocate_sir(void (*proc)(), void *arg); #define _spl(s) \ ({ \ diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c index f1204e95efa..d6c7ee3c020 100644 --- a/sys/arch/mvme68k/mvme68k/machdep.c +++ b/sys/arch/mvme68k/mvme68k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.65 2002/03/14 01:26:38 millert Exp $ */ +/* $OpenBSD: machdep.c,v 1.66 2002/03/14 03:15:56 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -1215,9 +1215,9 @@ memsize(void) /* * count it up. */ - max = (void*)MAXPHYSMEM; - for (look = (void*)Roundup(end, STRIDE); look < max; - look = (int*)((unsigned)look + STRIDE)) { + max = (void *)MAXPHYSMEM; + for (look = (void *)Roundup(end, STRIDE); look < max; + look = (int *)((unsigned)look + STRIDE)) { unsigned save; if (badvaddr((caddr_t)look, 2)) { diff --git a/sys/arch/mvme68k/stand/bootst/dev_tape.c b/sys/arch/mvme68k/stand/bootst/dev_tape.c index bab26011d4d..b2edf7b5747 100644 --- a/sys/arch/mvme68k/stand/bootst/dev_tape.c +++ b/sys/arch/mvme68k/stand/bootst/dev_tape.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dev_tape.c,v 1.2 2001/07/04 08:06:54 niklas Exp $ */ +/* $OpenBSD: dev_tape.c,v 1.3 2002/03/14 03:15:56 millert Exp $ */ /* $NetBSD: dev_tape.c,v 1.2 1995/10/17 22:58:20 gwr Exp $ */ /* @@ -63,7 +63,7 @@ devopen(f, fname, file) struct devsw *dp; int error; - *file = (char*)fname; + *file = (char *)fname; dp = &devsw[0]; f->f_dev = dp; diff --git a/sys/arch/mvme68k/stand/bootxx/bootxx.c b/sys/arch/mvme68k/stand/bootxx/bootxx.c index 8e4c83b4af5..27bfa242dc4 100644 --- a/sys/arch/mvme68k/stand/bootxx/bootxx.c +++ b/sys/arch/mvme68k/stand/bootxx/bootxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bootxx.c,v 1.4 2001/07/04 08:06:55 niklas Exp $ */ +/* $OpenBSD: bootxx.c,v 1.5 2002/03/14 03:15:56 millert Exp $ */ /* $NetBSD: bootxx.c,v 1.5 1995/10/13 21:44:57 gwr Exp $ */ /* @@ -87,7 +87,7 @@ main() _rtt(); } - addr = (char*)LOADADDR; + addr = (char *)LOADADDR; error = copyboot(&f, addr); f.f_dev->dv_close(&f); if (!error) { diff --git a/sys/arch/mvme68k/stand/installboot/installboot.c b/sys/arch/mvme68k/stand/installboot/installboot.c index c6850974557..9d75b14e384 100644 --- a/sys/arch/mvme68k/stand/installboot/installboot.c +++ b/sys/arch/mvme68k/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.6 2002/03/14 01:26:38 millert Exp $ */ +/* $OpenBSD: installboot.c,v 1.7 2002/03/14 03:15:56 millert Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -74,7 +74,7 @@ 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 vid_to_disklabel(char *, char *); static void diff --git a/sys/arch/mvme68k/stand/libbug/libbug.h b/sys/arch/mvme68k/stand/libbug/libbug.h index f0a65a6a1ec..59ee95528c3 100644 --- a/sys/arch/mvme68k/stand/libbug/libbug.h +++ b/sys/arch/mvme68k/stand/libbug/libbug.h @@ -1,4 +1,4 @@ -/* $OpenBSD: libbug.h,v 1.2 2002/03/14 01:26:38 millert Exp $ */ +/* $OpenBSD: libbug.h,v 1.3 2002/03/14 03:15:56 millert Exp $ */ /* * prototypes and such. note that get/put char are in stand.h @@ -20,4 +20,4 @@ void mvmeprom_rtc_rd(struct mvmeprom_time *); extern struct mvmeprom_args bugargs; -void bugexec __P((void (*)())); +void bugexec(void (*)()); diff --git a/sys/arch/mvme68k/stand/libsa/exec_mvme.c b/sys/arch/mvme68k/stand/libsa/exec_mvme.c index 6cfb867abc8..e8ea192ccbb 100644 --- a/sys/arch/mvme68k/stand/libsa/exec_mvme.c +++ b/sys/arch/mvme68k/stand/libsa/exec_mvme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_mvme.c,v 1.3 2001/07/04 08:06:56 niklas Exp $ */ +/* $OpenBSD: exec_mvme.c,v 1.4 2002/03/14 03:15:56 millert Exp $ */ /* $NetBSD: exec_sun.c,v 1.5 1996/01/29 23:41:06 gwr Exp $ */ /*- @@ -140,9 +140,9 @@ exec_mvme(file, flag) *cp++ = 0; --cc; } - ip = (int*)cp; + ip = (int *)cp; cp += cc; - while ((char*)ip < cp) + while ((char *)ip < cp) *ip++ = 0; /* @@ -150,7 +150,7 @@ exec_mvme(file, flag) * (Always set the symtab size word.) */ *ip++ = x.a_syms; - cp = (char*) ip; + cp = (char *) ip; if (x.a_syms > 0 && (flag & RB_NOSYM) == 0) { @@ -161,7 +161,7 @@ exec_mvme(file, flag) if (read(io, cp, cc) != cc) goto shread; cp += x.a_syms; - ip = (int*)cp; /* points to strtab length */ + ip = (int *)cp; /* points to strtab length */ cp += sizeof(int); /* String table. Length word includes itself. */ diff --git a/sys/arch/mvme68k/stand/netboot/devopen.c b/sys/arch/mvme68k/stand/netboot/devopen.c index 407341c612e..ebc264f105f 100644 --- a/sys/arch/mvme68k/stand/netboot/devopen.c +++ b/sys/arch/mvme68k/stand/netboot/devopen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: devopen.c,v 1.1 1996/05/16 02:52:05 chuck Exp $ */ +/* $OpenBSD: devopen.c,v 1.2 2002/03/14 03:15:56 millert Exp $ */ #include <sys/param.h> #include <stand.h> @@ -23,7 +23,7 @@ devopen(f, fname, file) char *cp, *path, *devname; int error; - *file = (char*)fname; + *file = (char *)fname; dp = &devsw[0]; f->f_dev = dp; error = (*dp->dv_open)(f, NULL); diff --git a/sys/arch/mvme68k/stand/sboot/sboot.h b/sys/arch/mvme68k/stand/sboot/sboot.h index aed437d3897..31b40d75d8a 100644 --- a/sys/arch/mvme68k/stand/sboot/sboot.h +++ b/sys/arch/mvme68k/stand/sboot/sboot.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sboot.h,v 1.7 2002/03/14 01:26:38 millert Exp $ */ +/* $OpenBSD: sboot.h,v 1.8 2002/03/14 03:15:56 millert Exp $ */ /* * Copyright (c) 1995 Charles D. Cranor and Seth Widoff @@ -43,7 +43,7 @@ char *ngets(char *, int); /* sboot */ void callrom(void); -void do_cmd(char *, char*); +void do_cmd(char *, char *); /* le */ #define LANCE_ADDR 0xfffe0778 diff --git a/sys/arch/mvme88k/ddb/db_interface.c b/sys/arch/mvme88k/ddb/db_interface.c index ff7fd802a1b..e2480be5cf8 100644 --- a/sys/arch/mvme88k/ddb/db_interface.c +++ b/sys/arch/mvme88k/ddb/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.25 2002/03/14 01:26:38 millert Exp $ */ +/* $OpenBSD: db_interface.c,v 1.26 2002/03/14 03:15:56 millert Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -918,6 +918,6 @@ db_task_name() buffer[i] = 0; /* just in case it's not read */ db_trace_get_val((vm_offset_t)ptr, &buffer[i]); } - return (char*)buffer; + return (char *)buffer; } diff --git a/sys/arch/mvme88k/ddb/db_trace.c b/sys/arch/mvme88k/ddb/db_trace.c index 4cb68afddcf..0a9d0ea83ad 100644 --- a/sys/arch/mvme88k/ddb/db_trace.c +++ b/sys/arch/mvme88k/ddb/db_trace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_trace.c,v 1.13 2002/03/14 01:26:38 millert Exp $ */ +/* $OpenBSD: db_trace.c,v 1.14 2002/03/14 03:15:57 millert Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -381,7 +381,7 @@ db_trace_get_val(vm_offset_t addr, unsigned *ptr) quiet_db_read_bytes = old_quiet_db_read_bytes; return 0; } else { - db_read_bytes(addr, 4, (char*)ptr); + db_read_bytes(addr, 4, (char *)ptr); db_recover = prev; quiet_db_read_bytes = old_quiet_db_read_bytes; return 1; @@ -934,7 +934,7 @@ db_stack_trace_cmd2(db_regs_t *regs) badwordaddr((vm_offset_t)(stack+4))) break; - db_read_bytes((vm_offset_t)stack, 2*sizeof(int), (char*)pair); + db_read_bytes((vm_offset_t)stack, 2*sizeof(int), (char *)pair); /* the pairs should match and equal stack+8 */ if (pair[0] == pair[1]) { @@ -984,7 +984,7 @@ db_stack_trace_cmd2(db_regs_t *regs) badwordaddr((vm_offset_t)stack)) return; - db_read_bytes((vm_offset_t)stack, 2*sizeof(int), (char*)pair); + db_read_bytes((vm_offset_t)stack, 2*sizeof(int), (char *)pair); if (pair[0] != pair[1]) return; @@ -1079,7 +1079,7 @@ db_stack_trace_cmd(db_regs_t *addr, { unsigned val1, val2, sxip; unsigned ptr; - bzero((void*)&frame, sizeof(frame)); + bzero((void *)&frame, sizeof(frame)); #define REASONABLE_FRAME_DISTANCE 2048 /* diff --git a/sys/arch/mvme88k/dev/cl.c b/sys/arch/mvme88k/dev/cl.c index 9ff1f201562..8be0dcb096f 100644 --- a/sys/arch/mvme88k/dev/cl.c +++ b/sys/arch/mvme88k/dev/cl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cl.c,v 1.22 2002/03/14 01:26:39 millert Exp $ */ +/* $OpenBSD: cl.c,v 1.23 2002/03/14 03:15:57 millert Exp $ */ /* * Copyright (c) 1995 Dale Rahn. All rights reserved. @@ -195,7 +195,7 @@ void cl_initchannel(struct clsoftc *sc, int channel); void clputc(struct clsoftc *sc, int unit, u_char c); u_char clgetc(struct clsoftc *sc, int *channel); #if 0 -void cloutput __P( (struct tty *tp)); +void cloutput(struct tty *tp); #endif #ifdef CLCD_DO_POLLED_INPUT void cl_chkinput(void); @@ -1663,7 +1663,7 @@ cl_rxintr(arg) } else /* We don't need no sinkin special characters */ if (risrl & 0x08) { - cl_overflow (sc, channel, (long*)&sc->sc_fotime, "fifo"); + cl_overflow (sc, channel, (long *)&sc->sc_fotime, "fifo"); reoir = 0x08; } else if (risrl & 0x04) { diff --git a/sys/arch/mvme88k/dev/vmel.c b/sys/arch/mvme88k/dev/vmel.c index d6b0354e693..7881d1e1295 100644 --- a/sys/arch/mvme88k/dev/vmel.c +++ b/sys/arch/mvme88k/dev/vmel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmel.c,v 1.8 2002/03/14 01:26:39 millert Exp $ */ +/* $OpenBSD: vmel.c,v 1.9 2002/03/14 03:15:57 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -59,7 +59,7 @@ struct cfdriver vmel_cd = { NULL, "vmel", DV_DULL, 0 }; -int vmelscan(struct device *, void *, void*); +int vmelscan(struct device *, void *, void *); int vmelopen(dev_t, int, int); int vmelclose(dev_t, int, int); int vmelioctl(dev_t, int, caddr_t, int, struct proc *); diff --git a/sys/arch/mvme88k/dev/vmes.c b/sys/arch/mvme88k/dev/vmes.c index 0a4b0f87d79..94d8db82de4 100644 --- a/sys/arch/mvme88k/dev/vmes.c +++ b/sys/arch/mvme88k/dev/vmes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmes.c,v 1.8 2002/03/14 01:26:39 millert Exp $ */ +/* $OpenBSD: vmes.c,v 1.9 2002/03/14 03:15:57 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -59,7 +59,7 @@ struct cfdriver vmes_cd = { NULL, "vmes", DV_DULL, 0 }; -int vmesscan(struct device *, void *, void*); +int vmesscan(struct device *, void *, void *); int vmesopen(dev_t, int, int); int vmesclose(dev_t, int, int); int vmesioctl(dev_t, int, caddr_t, int, struct proc *); diff --git a/sys/arch/mvme88k/dev/vx.c b/sys/arch/mvme88k/dev/vx.c index 4b3ace157c8..a14c22f3c47 100644 --- a/sys/arch/mvme88k/dev/vx.c +++ b/sys/arch/mvme88k/dev/vx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vx.c,v 1.18 2002/03/14 01:26:39 millert Exp $ */ +/* $OpenBSD: vx.c,v 1.19 2002/03/14 03:15:57 millert Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * All rights reserved. @@ -1312,8 +1312,8 @@ memcpy2(void *dest, const void *src, size_t size) { int i; short *d, *s; - d = (short*) dest; - s = (short*) src; + d = (short *) dest; + s = (short *) src; for (i=0; i<(size/2); i++) { *d = *s; d++; @@ -1326,7 +1326,7 @@ wzero(void *addr, size_t size) { int i; short *d; - d = (short*) addr; + d = (short *) addr; for (i=0; i<(size/2); i++) { *d = 0; d++; @@ -1395,7 +1395,7 @@ put_free_envelope(sc, ep) sc->elist_tail = envp; } -void* +void * get_free_packet(sc) struct vxsoftc *sc; { @@ -1591,7 +1591,7 @@ get_packet(sc, thisenv) * offset to the board address */ baseaddr |= thisenv->packet_ptr; - return ((void*)baseaddr); + return ((void *)baseaddr); } /* diff --git a/sys/arch/mvme88k/include/ansi.h b/sys/arch/mvme88k/include/ansi.h index b613ff06231..f5371e77b29 100644 --- a/sys/arch/mvme88k/include/ansi.h +++ b/sys/arch/mvme88k/include/ansi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ansi.h,v 1.11 2001/08/11 23:51:28 miod Exp $ */ +/* $OpenBSD: ansi.h,v 1.12 2002/03/14 03:15:57 millert Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -55,7 +55,7 @@ #define _BSD_TIMER_T_ int #if 0 -#define _BSD_VA_LIST_ char* /* va_list */ +#define _BSD_VA_LIST_ char * /* va_list */ #endif #include "va-m88k.h" diff --git a/sys/arch/mvme88k/include/db_machdep.h b/sys/arch/mvme88k/include/db_machdep.h index 0cb1ce46d6f..1ae049ebddf 100644 --- a/sys/arch/mvme88k/include/db_machdep.h +++ b/sys/arch/mvme88k/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.20 2002/03/14 01:26:39 millert Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.21 2002/03/14 03:15:57 millert Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -120,9 +120,8 @@ unsigned inst_load(unsigned); unsigned inst_store(unsigned); boolean_t inst_branch(unsigned); db_addr_t next_instr_address(db_addr_t, unsigned); -db_addr_t branch_taken __P((u_int, db_addr_t, - db_expr_t (*)(db_regs_t *, int), - db_regs_t *)); +db_addr_t branch_taken(u_int, db_addr_t, db_expr_t (*)(db_regs_t *, int), + db_regs_t *); int ddb_break_trap(int type, db_regs_t *eframe); int ddb_entry_trap(int level, db_regs_t *eframe); @@ -152,7 +151,7 @@ void db_clear_single_step(register db_regs_t *); #define DB_ACCESS_LEVEL DB_ACCESS_ANY -#define DB_VALID_KERN_ADDR(addr) (!badaddr((void*)(addr), 1)) +#define DB_VALID_KERN_ADDR(addr) (!badaddr((void *)(addr), 1)) #define DB_VALID_ADDRESS(addr,user) \ (user ? db_check_user_addr(addr) : DB_VALID_KERN_ADDR(addr)) diff --git a/sys/arch/mvme88k/include/trap.h b/sys/arch/mvme88k/include/trap.h index 702375ca1ad..b51392cee68 100644 --- a/sys/arch/mvme88k/include/trap.h +++ b/sys/arch/mvme88k/include/trap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.h,v 1.16 2002/03/14 01:26:39 millert Exp $ */ +/* $OpenBSD: trap.h,v 1.17 2002/03/14 03:15:57 millert Exp $ */ /* * Mach Operating System * Copyright (c) 1992 Carnegie Mellon University @@ -79,9 +79,9 @@ void error_fault(struct m88100_saved_state *); void error_reset(struct m88100_saved_state *); unsigned ss_get_value(struct proc *, unsigned, int); int ss_put_value(struct proc *, unsigned, unsigned, int); -unsigned ss_branch_taken __P((unsigned, unsigned, - unsigned (*func)(unsigned int, struct trapframe *), - struct trapframe *)); /* 'opaque' */ +unsigned ss_branch_taken(unsigned, unsigned, + unsigned (*func)(unsigned int, struct trapframe *), + struct trapframe *); /* 'opaque' */ unsigned ss_getreg_val(unsigned, struct trapframe *); int ss_inst_branch(unsigned); int ss_inst_delayed(unsigned); diff --git a/sys/arch/mvme88k/mvme88k/m8820x.c b/sys/arch/mvme88k/mvme88k/m8820x.c index 96f142110dd..736d6d5b042 100644 --- a/sys/arch/mvme88k/mvme88k/m8820x.c +++ b/sys/arch/mvme88k/mvme88k/m8820x.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m8820x.c,v 1.13 2002/03/14 01:26:40 millert Exp $ */ +/* $OpenBSD: m8820x.c,v 1.14 2002/03/14 03:15:57 millert Exp $ */ /* * Copyright (c) 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -664,7 +664,7 @@ m8820x_cmmu_store(mmu, reg, val) int mmu, reg; unsigned val; { - *(unsigned *volatile)(reg + (char*)(m8820x_cmmu[mmu].cmmu_regs)) = val; + *(unsigned *volatile)(reg + (char *)(m8820x_cmmu[mmu].cmmu_regs)) = val; } int @@ -678,7 +678,7 @@ unsigned m8820x_cmmu_get(mmu, reg) int mmu, reg; { - return *(unsigned *volatile)(reg + (char*)(m8820x_cmmu[mmu].cmmu_regs)); + return *(unsigned *volatile)(reg + (char *)(m8820x_cmmu[mmu].cmmu_regs)); } /* @@ -1080,7 +1080,7 @@ m8820x_cmmu_cpu_number() void m8820x_cmmu_remote_set(unsigned cpu, unsigned r, unsigned data, unsigned x) { - *(unsigned *volatile)(r + (char*)®S(cpu,data)) = x; + *(unsigned *volatile)(r + (char *)®S(cpu,data)) = x; } /* @@ -1090,7 +1090,7 @@ m8820x_cmmu_remote_set(unsigned cpu, unsigned r, unsigned data, unsigned x) unsigned m8820x_cmmu_remote_get(unsigned cpu, unsigned r, unsigned data) { - return (*(unsigned *volatile)(r + (char*)®S(cpu,data))); + return (*(unsigned *volatile)(r + (char *)®S(cpu,data))); } #endif diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c index bf3438bc6ad..9f261ce0bd9 100644 --- a/sys/arch/mvme88k/mvme88k/machdep.c +++ b/sys/arch/mvme88k/mvme88k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.91 2002/03/14 01:26:40 millert Exp $ */ +/* $OpenBSD: machdep.c,v 1.92 2002/03/14 03:15:57 millert Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -327,9 +327,9 @@ size_memory() /* * count it up. */ - max = (void*)MAXPHYSMEM; - for (look = (void*)Roundup(end, STRIDE); look < max; - look = (int*)((unsigned)look + STRIDE)) { + max = (void *)MAXPHYSMEM; + for (look = (void *)Roundup(end, STRIDE); look < max; + look = (int *)((unsigned)look + STRIDE)) { unsigned save; /* if can't access, we've reached the end */ diff --git a/sys/arch/mvme88k/mvme88k/pmap.c b/sys/arch/mvme88k/mvme88k/pmap.c index 1a29be34867..df791879176 100644 --- a/sys/arch/mvme88k/mvme88k/pmap.c +++ b/sys/arch/mvme88k/mvme88k/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.64 2002/03/14 01:26:40 millert Exp $ */ +/* $OpenBSD: pmap.c,v 1.65 2002/03/14 03:15:57 millert Exp $ */ /* * Copyright (c) 2001, 2002 Miodrag Vallat * Copyright (c) 1998-2001 Steve Murphree, Jr. @@ -1328,7 +1328,7 @@ pmap_zero_page(phys) CACHE_GLOBAL | PG_V; SPLX(spl); - bzero((void*)srcva, PAGE_SIZE); + bzero((void *)srcva, PAGE_SIZE); /* force the data out */ cmmu_flush_remote_data_cache(cpu, phys, PAGE_SIZE); } /* pmap_zero_page() */ @@ -2882,7 +2882,7 @@ pmap_copy_page(src, dst) *dstpte = template | trunc_page(dst); SPLX(spl); - bcopy((void*)srcva, (void*)dstva, PAGE_SIZE); + bcopy((void *)srcva, (void *)dstva, PAGE_SIZE); /* flush source, dest out of cache? */ cmmu_flush_remote_data_cache(cpu, src, PAGE_SIZE); cmmu_flush_remote_data_cache(cpu, dst, PAGE_SIZE); diff --git a/sys/arch/mvme88k/stand/bootst/dev_tape.c b/sys/arch/mvme88k/stand/bootst/dev_tape.c index 1362a3b1796..a4352b8def7 100644 --- a/sys/arch/mvme88k/stand/bootst/dev_tape.c +++ b/sys/arch/mvme88k/stand/bootst/dev_tape.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dev_tape.c,v 1.1 1998/12/15 06:09:51 smurph Exp $ */ +/* $OpenBSD: dev_tape.c,v 1.2 2002/03/14 03:15:57 millert Exp $ */ /* * Copyright (c) 1993 Paul Kranenburg @@ -61,7 +61,7 @@ devopen(f, fname, file) struct devsw *dp; int errorno; - *file = (char*)fname; + *file = (char *)fname; dp = &devsw[0]; f->f_dev = dp; diff --git a/sys/arch/mvme88k/stand/bootxx/bootxx.c b/sys/arch/mvme88k/stand/bootxx/bootxx.c index f7ac21944cf..c5805457543 100644 --- a/sys/arch/mvme88k/stand/bootxx/bootxx.c +++ b/sys/arch/mvme88k/stand/bootxx/bootxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bootxx.c,v 1.4 2001/01/13 05:19:01 smurph Exp $ */ +/* $OpenBSD: bootxx.c,v 1.5 2002/03/14 03:15:57 millert Exp $ */ /* * Copyright (c) 1994 Paul Kranenburg @@ -84,7 +84,7 @@ main() _rtt(); } - addr = (char*)STAGE2_RELOC; + addr = (char *)STAGE2_RELOC; error = copyboot(&f, addr); f.f_dev->dv_close(&f); if (!error) { diff --git a/sys/arch/mvme88k/stand/installboot/installboot.c b/sys/arch/mvme88k/stand/installboot/installboot.c index 25a199553c9..19fc29f7f66 100644 --- a/sys/arch/mvme88k/stand/installboot/installboot.c +++ b/sys/arch/mvme88k/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.5 2002/03/14 01:26:40 millert Exp $ */ +/* $OpenBSD: installboot.c,v 1.6 2002/03/14 03:15:57 millert Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -74,7 +74,7 @@ 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 vid_to_disklabel(char *, char *); static void diff --git a/sys/arch/mvme88k/stand/libbug/libbug.h b/sys/arch/mvme88k/stand/libbug/libbug.h index 11e000195f1..f5325292ce7 100644 --- a/sys/arch/mvme88k/stand/libbug/libbug.h +++ b/sys/arch/mvme88k/stand/libbug/libbug.h @@ -1,4 +1,4 @@ -/* $OpenBSD: libbug.h,v 1.2 2002/03/14 01:26:40 millert Exp $ */ +/* $OpenBSD: libbug.h,v 1.3 2002/03/14 03:15:57 millert Exp $ */ /* * prototypes and such. note that get/put char are in stand.h @@ -20,4 +20,4 @@ void mvmeprom_rtc_rd(struct mvmeprom_time *); extern struct mvmeprom_args bugargs; -void bugexec __P((void (*)())); +void bugexec(void (*)()); diff --git a/sys/arch/mvme88k/stand/libsa/exec_mvme.c b/sys/arch/mvme88k/stand/libsa/exec_mvme.c index 911be2e269a..97a5e5faac0 100644 --- a/sys/arch/mvme88k/stand/libsa/exec_mvme.c +++ b/sys/arch/mvme88k/stand/libsa/exec_mvme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_mvme.c,v 1.7 2001/07/04 08:09:30 niklas Exp $ */ +/* $OpenBSD: exec_mvme.c,v 1.8 2002/03/14 03:15:58 millert Exp $ */ /*- @@ -154,9 +154,9 @@ exec_mvme(file, flag) *cp++ = 0; --cc; } - ip = (int*)cp; + ip = (int *)cp; cp += cc; - while ((char*)ip < cp) + while ((char *)ip < cp) *ip++ = 0; /* @@ -164,7 +164,7 @@ exec_mvme(file, flag) * (Always set the symtab size word.) */ *ip++ = x.a_syms; - cp = (char*) ip; + cp = (char *) ip; if (x.a_syms > 0 && (flag & RB_NOSYM) == 0) { @@ -175,7 +175,7 @@ exec_mvme(file, flag) if (read(io, cp, cc) != cc) goto shread; cp += x.a_syms; - ip = (int*)cp; /* points to strtab length */ + ip = (int *)cp; /* points to strtab length */ cp += sizeof(int); /* String table. Length word includes itself. */ diff --git a/sys/arch/mvme88k/stand/netboot/devopen.c b/sys/arch/mvme88k/stand/netboot/devopen.c index 7e02e4bb845..e8d4893bf24 100644 --- a/sys/arch/mvme88k/stand/netboot/devopen.c +++ b/sys/arch/mvme88k/stand/netboot/devopen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: devopen.c,v 1.1 1998/08/22 08:37:58 smurph Exp $ */ +/* $OpenBSD: devopen.c,v 1.2 2002/03/14 03:15:58 millert Exp $ */ #include <sys/param.h> #include <stand.h> @@ -23,7 +23,7 @@ devopen(f, fname, file) char *cp, *path, *devname; int error; - *file = (char*)fname; + *file = (char *)fname; dp = &devsw[0]; f->f_dev = dp; error = (*dp->dv_open)(f, NULL); diff --git a/sys/arch/mvmeppc/ddb/db_memrw.c b/sys/arch/mvmeppc/ddb/db_memrw.c index 62f7d37cb10..9909ce2ddff 100644 --- a/sys/arch/mvmeppc/ddb/db_memrw.c +++ b/sys/arch/mvmeppc/ddb/db_memrw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_memrw.c,v 1.2 2001/11/06 19:53:15 miod Exp $ */ +/* $OpenBSD: db_memrw.c,v 1.3 2002/03/14 03:15:58 millert Exp $ */ /* $NetBSD: db_memrw.c,v 1.1 1996/02/22 23:23:35 gwr Exp $ */ /* @@ -56,15 +56,15 @@ db_read_bytes(addr, size, data) register size_t size; register char *data; { - register char *src = (char*)addr; + register char *src = (char *)addr; if (size == 4) { - *((int*)data) = *((int*)src); + *((int *)data) = *((int *)src); return; } if (size == 2) { - *((short*)data) = *((short*)src); + *((short *)data) = *((short *)src); return; } @@ -86,12 +86,12 @@ db_write_bytes(addr, size, data) register char *dst = (char *)addr; if (size == 4) { - *((int*)dst) = *((int*)data); + *((int *)dst) = *((int *)data); return; } if (size == 2) { - *((short*)dst) = *((short*)data); + *((short *)dst) = *((short *)data); return; } diff --git a/sys/arch/mvmeppc/dev/mainbus.c b/sys/arch/mvmeppc/dev/mainbus.c index e05f756d126..5e7d410e97a 100644 --- a/sys/arch/mvmeppc/dev/mainbus.c +++ b/sys/arch/mvmeppc/dev/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.3 2002/03/14 01:26:41 millert Exp $ */ +/* $OpenBSD: mainbus.c,v 1.4 2002/03/14 03:15:58 millert Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -51,7 +51,7 @@ struct cfdriver mainbus_cd = { NULL, "mainbus", DV_DULL, NULL, 0 }; -void mb_intr_establish __P((struct confargs *, int (*)(void *), void *)); +void mb_intr_establish(struct confargs *, int (*)(void *), void *); void mb_intr_disestablish(struct confargs *); caddr_t mb_cvtaddr(struct confargs *); int mb_matchname(struct confargs *, char *); diff --git a/sys/arch/mvmeppc/dev/openpic.c b/sys/arch/mvmeppc/dev/openpic.c index a01dc38ebe7..d987ba026a2 100644 --- a/sys/arch/mvmeppc/dev/openpic.c +++ b/sys/arch/mvmeppc/dev/openpic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: openpic.c,v 1.7 2002/03/14 01:26:41 millert Exp $ */ +/* $OpenBSD: openpic.c,v 1.8 2002/03/14 03:15:58 millert Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -174,8 +174,8 @@ static int i8259_dummy (void *arg); 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_establish_t)(void *, mac_intr_handle_t, + int, int, int (*func)(void *), void *, char *); typedef void (intr_disestablish_t)(void *, void *); static vaddr_t openpic_base; diff --git a/sys/arch/mvmeppc/include/autoconf.h b/sys/arch/mvmeppc/include/autoconf.h index db01a912a72..782fb955262 100644 --- a/sys/arch/mvmeppc/include/autoconf.h +++ b/sys/arch/mvmeppc/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.2 2002/03/14 01:26:41 millert Exp $ */ +/* $OpenBSD: autoconf.h,v 1.3 2002/03/14 03:15:58 millert Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -93,8 +93,8 @@ struct confargs { }; -void set_clockintr __P((void (*)(struct clockframe *))); -void set_iointr __P((void (*)(void *, int))); +void set_clockintr(void (*)(struct clockframe *)); +void set_iointr(void (*)(void *, int)); int badaddr(void *, u_int32_t); #endif /* _MACHINE_AUTOCONF_H_ */ diff --git a/sys/arch/mvmeppc/isa/isa_machdep.h b/sys/arch/mvmeppc/isa/isa_machdep.h index 562a793fa1f..7249d0ec941 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.2 2002/03/14 01:26:41 millert Exp $ */ +/* $OpenBSD: isa_machdep.h,v 1.3 2002/03/14 03:15:58 millert Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -54,8 +54,8 @@ struct isabus_attach_args; /* XXX */ */ 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_establish(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(isa_chipset_tag_t ic, void *handler); #define __NO_ISA_INTR_CHECK diff --git a/sys/arch/mvmeppc/mvmeppc/machdep.c b/sys/arch/mvmeppc/mvmeppc/machdep.c index 8ddb0773321..363e09c8e5e 100644 --- a/sys/arch/mvmeppc/mvmeppc/machdep.c +++ b/sys/arch/mvmeppc/mvmeppc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.22 2002/03/14 01:26:41 millert Exp $ */ +/* $OpenBSD: machdep.c,v 1.23 2002/03/14 03:15:58 millert Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -669,7 +669,7 @@ setregs(p, pack, stack, retval) pargs = -roundup(-stack + 8, 16); newstack = (u_int32_t)(pargs - 32); - copyin ((void*)(VM_MAX_ADDRESS-0x10), &args, 0x10); + copyin ((void *)(VM_MAX_ADDRESS-0x10), &args, 0x10); bzero(tf, sizeof *tf); tf->fixreg[1] = newstack; @@ -984,8 +984,8 @@ 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_establish_t)(void *, pci_intr_handle_t, + int, int, int (*func)(void *), void *, char *); typedef void (intr_disestablish_t)(void *, void *); int ppc_configed_intr_cnt = 0; @@ -1234,7 +1234,7 @@ mapiodev(pa, len) spa += NBPG; vaddr += NBPG; } - return (void*) (va+off); + return (void *) (va+off); } void unmapiodev(kva, p_size) diff --git a/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c b/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c index b0465c7fa98..a07b5e6a744 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.5 2002/03/14 01:26:41 millert Exp $ */ +/* $OpenBSD: ppc1_machdep.c,v 1.6 2002/03/14 03:15:58 millert Exp $ */ /* $NetBSD: ofw_machdep.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */ /* @@ -117,9 +117,9 @@ size_memory(void) /* * count it up. */ - max = (void*)MAXPHYSMEM; - for (look = (void*)Roundup(end, STRIDE); look < max; - look = (int*)((unsigned)look + STRIDE)) { + max = (void *)MAXPHYSMEM; + for (look = (void *)Roundup(end, STRIDE); look < max; + look = (int *)((unsigned)look + STRIDE)) { unsigned save; /* if can't access, we've reached the end */ diff --git a/sys/arch/mvmeppc/pci/mpcpcibr.c b/sys/arch/mvmeppc/pci/mpcpcibr.c index fd3377490b8..3709472ca0f 100644 --- a/sys/arch/mvmeppc/pci/mpcpcibr.c +++ b/sys/arch/mvmeppc/pci/mpcpcibr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpcpcibr.c,v 1.8 2002/03/14 01:26:41 millert Exp $ */ +/* $OpenBSD: mpcpcibr.c,v 1.9 2002/03/14 03:15:58 millert Exp $ */ /* * Copyright (c) 2001 Steve Murphree, Jr. @@ -69,8 +69,8 @@ void mpc_conf_write(void *, pcitag_t, int, pcireg_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_establish(void *, pci_intr_handle_t, + int, int (*func)(void *), void *, char *); void mpc_intr_disestablish(void *, void *); int mpc_ether_hw_addr(struct ppc_pci_chipset *, u_int8_t *); @@ -537,8 +537,8 @@ mpc_intr_line(lcv, ih) return (ih); } -typedef void *(intr_establish_t) __P((void *, pci_intr_handle_t, - int, int, int (*func)(void *), void *, char *)); +typedef void *(intr_establish_t)(void *, pci_intr_handle_t, + int, int, int (*func)(void *), void *, char *); typedef void (intr_disestablish_t)(void *, void *); extern intr_establish_t *intr_establish_func; extern intr_disestablish_t *intr_disestablish_func; diff --git a/sys/arch/mvmeppc/pci/raven.c b/sys/arch/mvmeppc/pci/raven.c index c94ab28c367..adc95808c64 100644 --- a/sys/arch/mvmeppc/pci/raven.c +++ b/sys/arch/mvmeppc/pci/raven.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raven.c,v 1.6 2002/03/14 01:26:41 millert Exp $ */ +/* $OpenBSD: raven.c,v 1.7 2002/03/14 03:15:58 millert Exp $ */ /* * Copyright (c) 2001 Steve Murphree, Jr. @@ -69,8 +69,8 @@ void mpc_conf_write(void *, pcitag_t, int, pcireg_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_establish(void *, pci_intr_handle_t, + int, int (*func)(void *), void *, char *); void mpc_intr_disestablish(void *, void *); int mpc_ether_hw_addr(struct ppc_pci_chipset *, u_int8_t *); @@ -483,8 +483,8 @@ mpc_intr_string(lcv, ih) return (ih); } -typedef void *(intr_establish_t) __P((void *, pci_intr_handle_t, - int, int, int (*func)(void *), void *, char *)); +typedef void *(intr_establish_t)(void *, pci_intr_handle_t, + int, int, int (*func)(void *), void *, char *); typedef void (intr_disestablish_t)(void *, void *); extern intr_establish_t *intr_establish_func; extern intr_disestablish_t *intr_disestablish_func; diff --git a/sys/arch/mvmeppc/stand/bootxx/bootxx.c b/sys/arch/mvmeppc/stand/bootxx/bootxx.c index 451ae40de97..c39339e550d 100644 --- a/sys/arch/mvmeppc/stand/bootxx/bootxx.c +++ b/sys/arch/mvmeppc/stand/bootxx/bootxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bootxx.c,v 1.1 2001/06/26 21:58:01 smurph Exp $ */ +/* $OpenBSD: bootxx.c,v 1.2 2002/03/14 03:15:58 millert Exp $ */ /* * Copyright (c) 1994 Paul Kranenburg @@ -86,7 +86,7 @@ main() _rtt(); } - addr = (char*)STAGE2_RELOC; + addr = (char *)STAGE2_RELOC; error = copyboot(&f, addr); f.f_dev->dv_close(&f); if (!error) { diff --git a/sys/arch/mvmeppc/stand/installboot/installboot.c b/sys/arch/mvmeppc/stand/installboot/installboot.c index f7edc6a8277..813ca3042dc 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.3 2002/03/14 01:26:41 millert Exp $ */ +/* $OpenBSD: installboot.c,v 1.4 2002/03/14 03:15:58 millert Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -74,7 +74,7 @@ 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 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 fb2148fa7a5..0a0aa465b61 100644 --- a/sys/arch/mvmeppc/stand/libbug/libbug.h +++ b/sys/arch/mvmeppc/stand/libbug/libbug.h @@ -1,4 +1,4 @@ -/* $OpenBSD: libbug.h,v 1.2 2002/03/14 01:26:41 millert Exp $ */ +/* $OpenBSD: libbug.h,v 1.3 2002/03/14 03:15:58 millert Exp $ */ /* * prototypes and such. note that get/put char are in stand.h @@ -26,4 +26,4 @@ int mvmeprom_netctrl_reset(u_char, u_char); extern struct mvmeprom_args bugargs; -void bugexec __P((void (*)())); +void bugexec(void (*)()); diff --git a/sys/arch/powerpc/pci/pci_machdep.h b/sys/arch/powerpc/pci/pci_machdep.h index 2b73c1ef8a8..43ac1e753b6 100644 --- a/sys/arch/powerpc/pci/pci_machdep.h +++ b/sys/arch/powerpc/pci/pci_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.h,v 1.10 2002/03/14 01:26:42 millert Exp $ */ +/* $OpenBSD: pci_machdep.h,v 1.11 2002/03/14 03:15:59 millert Exp $ */ /* * Copyright (c) 1996 Carnegie-Mellon University. @@ -58,8 +58,8 @@ struct ppc_pci_chipset { pci_intr_handle_t *); const char *(*pc_intr_string)(void *, pci_intr_handle_t); int (*pc_intr_line)(void *, pci_intr_handle_t); - void *(*pc_intr_establish) __P((void *, pci_intr_handle_t, - int, int (*)(void *), void *, char *)); + void *(*pc_intr_establish)(void *, pci_intr_handle_t, + int, int (*)(void *), void *, char *); void (*pc_intr_disestablish)(void *, void *); int (*pc_ether_hw_addr)(struct ppc_pci_chipset *, u_int8_t *); }; diff --git a/sys/arch/powerpc/powerpc/pmap.c b/sys/arch/powerpc/powerpc/pmap.c index 243f6a85a5e..4d9a32bf2ff 100644 --- a/sys/arch/powerpc/powerpc/pmap.c +++ b/sys/arch/powerpc/powerpc/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.60 2002/03/13 18:27:36 drahn Exp $ */ +/* $OpenBSD: pmap.c,v 1.61 2002/03/14 03:15:59 millert Exp $ */ /* * Copyright (c) 2001, 2002 Dale Rahn. All rights reserved. @@ -1005,7 +1005,7 @@ pmap_copy_page(paddr_t srcpa, paddr_t dstpa) pmap_kenter_pa(copy_src_page, srcpa, VM_PROT_READ); pmap_kenter_pa(copy_dst_page, dstpa, VM_PROT_READ|VM_PROT_WRITE); - bcopy((void*)copy_src_page, (void*)copy_dst_page, PAGE_SIZE); + bcopy((void *)copy_src_page, (void *)copy_dst_page, PAGE_SIZE); pmap_kremove_pg(copy_src_page); pmap_kremove_pg(copy_dst_page); @@ -2248,17 +2248,17 @@ pmap_user_read(int size, vaddr_t va) int err; if (size == 1) { - err = copyin((void*)va, &read1, 1); + err = copyin((void *)va, &read1, 1); if (err == 0) { db_printf("byte read %x\n", read1); } } else if (size == 2) { - err = copyin((void*)va, &read2, 2); + err = copyin((void *)va, &read2, 2); if (err == 0) { db_printf("short read %x\n", read2); } } else if (size == 4) { - err = copyin((void*)va, &read4, 4); + err = copyin((void *)va, &read4, 4); if (err == 0) { db_printf("int read %x\n", read4); } diff --git a/sys/arch/sparc/dev/amd7930.c b/sys/arch/sparc/dev/amd7930.c index 7acd6f32a43..549eabb3669 100644 --- a/sys/arch/sparc/dev/amd7930.c +++ b/sys/arch/sparc/dev/amd7930.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amd7930.c,v 1.19 2002/03/14 01:26:42 millert Exp $ */ +/* $OpenBSD: amd7930.c,v 1.20 2002/03/14 03:15:59 millert Exp $ */ /* $NetBSD: amd7930.c,v 1.37 1998/03/30 14:23:40 pk Exp $ */ /* @@ -77,9 +77,9 @@ struct amd7930_softc { u_char sc_out_port; /* output port */ /* interfacing with the interrupt handlers */ - void (*sc_rintr)(void*); /* input completion intr handler */ + 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_pintr)(void *); /* output completion intr handler */ void *sc_parg; /* arg for sc_pintr() */ /* sc_au is special in that the hardware interrupt handler uses it */ @@ -210,10 +210,8 @@ int amd7930_query_encoding(void *, struct audio_encoding *); int amd7930_set_params(void *, int, int, struct audio_params *, struct audio_params *); int amd7930_round_blocksize(void *, int); int amd7930_commit_settings(void *); -int amd7930_start_output __P((void *, void *, int, void (*)(void *), - void *)); -int amd7930_start_input __P((void *, void *, int, void (*)(void *), - void *)); +int amd7930_start_output(void *, void *, int, void (*)(void *), void *); +int amd7930_start_input(void *, void *, int, void (*)(void *), void *); int amd7930_halt_output(void *); int amd7930_halt_input(void *); int amd7930_getdev(void *, struct audio_device *); diff --git a/sys/arch/sparc/dev/cgtwo.c b/sys/arch/sparc/dev/cgtwo.c index 4653190d18d..4f3b8d44627 100644 --- a/sys/arch/sparc/dev/cgtwo.c +++ b/sys/arch/sparc/dev/cgtwo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgtwo.c,v 1.19 2002/03/14 01:26:42 millert Exp $ */ +/* $OpenBSD: cgtwo.c,v 1.20 2002/03/14 03:15:59 millert Exp $ */ /* $NetBSD: cgtwo.c,v 1.22 1997/05/24 20:16:12 pk Exp $ */ /* @@ -305,7 +305,7 @@ cgtwoioctl(dev, cmd, data, flags, p) break; case FBIOSVIDEO: - sc->sc_reg->video_enab = (*(int*)data) & 1; + sc->sc_reg->video_enab = (*(int *)data) & 1; break; default: diff --git a/sys/arch/sparc/dev/cs4231.c b/sys/arch/sparc/dev/cs4231.c index a632f2af0b3..f3f4d924ada 100644 --- a/sys/arch/sparc/dev/cs4231.c +++ b/sys/arch/sparc/dev/cs4231.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4231.c,v 1.12 2002/03/14 01:26:42 millert Exp $ */ +/* $OpenBSD: cs4231.c,v 1.13 2002/03/14 03:15:59 millert Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -139,10 +139,10 @@ void * cs4231_alloc(void *, int, size_t, int, int); void cs4231_free(void *, void *, int); size_t cs4231_round_buffersize(void *, int, size_t); int cs4231_get_props(void *); -int cs4231_trigger_output __P((void *, void *, void *, int, - void (*intr)(void *), void *arg, struct audio_params *)); -int cs4231_trigger_input __P((void *, void *, void *, int, - void (*intr)(void *), void *arg, struct audio_params *)); +int cs4231_trigger_output(void *, void *, void *, int, + void (*intr)(void *), void *arg, struct audio_params *); +int cs4231_trigger_input(void *, void *, void *, int, + void (*intr)(void *), void *arg, struct audio_params *); struct audio_hw_if cs4231_sa_hw_if = { cs4231_open, diff --git a/sys/arch/sparc/dev/cs4231var.h b/sys/arch/sparc/dev/cs4231var.h index e1b0799d714..b6542ca7fbd 100644 --- a/sys/arch/sparc/dev/cs4231var.h +++ b/sys/arch/sparc/dev/cs4231var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4231var.h,v 1.5 2002/01/11 16:28:43 jason Exp $ */ +/* $OpenBSD: cs4231var.h,v 1.6 2002/03/14 03:15:59 millert Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -61,9 +61,9 @@ struct cs4231_softc { int sc_open; /* already open? */ int sc_locked; /* locked? */ - void (*sc_rintr)(void*); /* input completion intr handler */ + 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_pintr)(void *); /* output completion intr handler */ void * sc_parg; /* arg for sc_pintr() */ char sc_mute[9]; /* which devs are muted */ diff --git a/sys/arch/sparc/dev/fga.c b/sys/arch/sparc/dev/fga.c index b3c61f22a12..687ec284248 100644 --- a/sys/arch/sparc/dev/fga.c +++ b/sys/arch/sparc/dev/fga.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fga.c,v 1.7 2002/03/14 01:26:42 millert Exp $ */ +/* $OpenBSD: fga.c,v 1.8 2002/03/14 03:15:59 millert Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -289,7 +289,7 @@ fga_vmerangemap(sc, vmebase, vmelen, vmecap, sbusslot, sbusoffset, oca) (void *)(sc->sc_range[srange].poffset | sbusoffset); oca->ca_ra.ra_reg[0].rr_iospace = sbusslot; oca->ca_ra.ra_reg[1].rr_iospace = vmecap; - oca->ca_ra.ra_reg[1].rr_paddr = (void*)vmebase; + oca->ca_ra.ra_reg[1].rr_paddr = (void *)vmebase; oca->ca_ra.ra_reg[1].rr_len = vmelen; /* 1. Setup slot select register for this range. */ diff --git a/sys/arch/sparc/dev/kbd.c b/sys/arch/sparc/dev/kbd.c index ed9119878bd..50ac48fd5f2 100644 --- a/sys/arch/sparc/dev/kbd.c +++ b/sys/arch/sparc/dev/kbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kbd.c,v 1.16 2002/03/14 01:26:43 millert Exp $ */ +/* $OpenBSD: kbd.c,v 1.17 2002/03/14 03:15:59 millert Exp $ */ /* $NetBSD: kbd.c,v 1.28 1997/09/13 19:12:18 pk Exp $ */ /* @@ -1066,7 +1066,7 @@ kbdioctl(dev, cmd, data, flag, p) case KIOCSLED: if (k->k_state.kbd_id != KB_SUN4) { /* xxx NYI */ - k->k_state.kbd_leds = *(char*)data; + k->k_state.kbd_leds = *(char *)data; } else { int s; char leds = *(char *)data; diff --git a/sys/arch/sparc/dev/si.c b/sys/arch/sparc/dev/si.c index 3b6a078287a..7826aca1932 100644 --- a/sys/arch/sparc/dev/si.c +++ b/sys/arch/sparc/dev/si.c @@ -1,4 +1,4 @@ -/* $OpenBSD: si.c,v 1.15 2002/03/14 01:26:43 millert Exp $ */ +/* $OpenBSD: si.c,v 1.16 2002/03/14 03:15:59 millert Exp $ */ /* $NetBSD: si.c,v 1.38 1997/08/27 11:24:20 bouyer Exp $ */ /*- @@ -669,7 +669,7 @@ found: dh = &sc->sc_dma[i]; dh->dh_flags = SIDH_BUSY; - dh->dh_addr = (u_char*) addr; + dh->dh_addr = (u_char *) addr; dh->dh_maplen = xlen; dh->dh_dvma = 0; diff --git a/sys/arch/sparc/include/autoconf.h b/sys/arch/sparc/include/autoconf.h index 346059f0ef2..e465c56ae8e 100644 --- a/sys/arch/sparc/include/autoconf.h +++ b/sys/arch/sparc/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.9 2002/03/14 01:26:43 millert Exp $ */ +/* $OpenBSD: autoconf.h,v 1.10 2002/03/14 03:16:00 millert Exp $ */ /* $NetBSD: autoconf.h,v 1.20 1997/05/24 20:03:03 pk Exp $ */ /* @@ -206,8 +206,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(void); int firstchild(int); diff --git a/sys/arch/sparc/include/cpu.h b/sys/arch/sparc/include/cpu.h index c23c0b32ef3..7400cc6e4c0 100644 --- a/sys/arch/sparc/include/cpu.h +++ b/sys/arch/sparc/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.12 2002/03/14 01:26:43 millert Exp $ */ +/* $OpenBSD: cpu.h,v 1.13 2002/03/14 03:16:00 millert Exp $ */ /* $NetBSD: cpu.h,v 1.24 1997/03/15 22:25:15 pk Exp $ */ /* @@ -168,7 +168,7 @@ void vmeintr_establish(int vec, int level, struct intrhand *); * interrupt vectors (vectors that are not shared and are handled in the * trap window). Such functions must be written in assembly. */ -void intr_fasttrap __P((int level, void (*vec)(void))); +void intr_fasttrap(int level, void (*vec)(void)); /* auxreg.c */ void led_blink(void *); @@ -212,7 +212,7 @@ void amd7930_trap(void); /* cons.c */ int cnrom(void); /* zs.c */ -void zsconsole __P((struct tty *, int, int, int (**)(struct tty *, int))); +void zsconsole(struct tty *, int, int, int (**)(struct tty *, int)); #ifdef KGDB void zs_kgdb_init(void); #endif @@ -222,7 +222,7 @@ void fb_unblank(void); void cache_flush(caddr_t, u_int); /* 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/sparc/include/kbd.h b/sys/arch/sparc/include/kbd.h index b42aea16183..08276c2f5d3 100644 --- a/sys/arch/sparc/include/kbd.h +++ b/sys/arch/sparc/include/kbd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kbd.h,v 1.8 2002/03/14 01:26:43 millert Exp $ */ +/* $OpenBSD: kbd.h,v 1.9 2002/03/14 03:16:00 millert Exp $ */ /* $NetBSD: kbd.h,v 1.6 1996/03/31 22:21:35 pk Exp $ */ /* @@ -160,10 +160,8 @@ #define PADENTER 0x711 #ifdef _KERNEL -void kbd_serial __P((struct tty *, - void (*)(struct tty *), void (*)(struct tty *))); -void ms_serial __P((struct tty *, - void (*)(struct tty *), void (*)(struct tty *))); +void kbd_serial(struct tty *, void (*)(struct tty *), void (*)(struct tty *)); +void ms_serial(struct tty *, void (*)(struct tty *), void (*)(struct tty *)); void kbd_rint(int); void ms_rint(int); void kbd_ascii(struct tty *); diff --git a/sys/arch/sparc/include/pmap.h b/sys/arch/sparc/include/pmap.h index abf6e162643..2a03b363b8f 100644 --- a/sys/arch/sparc/include/pmap.h +++ b/sys/arch/sparc/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.31 2002/03/14 01:26:43 millert Exp $ */ +/* $OpenBSD: pmap.h,v 1.32 2002/03/14 03:16:00 millert Exp $ */ /* $NetBSD: pmap.h,v 1.30 1997/08/04 20:00:47 pk Exp $ */ /* @@ -261,8 +261,7 @@ extern struct pmap kernel_pmap_store; #define PMAP_IOENC(io) (CPU_ISSUN4M ? PMAP_IOENC_SRMMU(io) : PMAP_IOENC_4(io)) 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); #define pmap_kernel() (&kernel_pmap_store) #define pmap_resident_count(pmap) pmap_count_ptes(pmap) diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c index 39355f676db..444538e8796 100644 --- a/sys/arch/sparc/sparc/autoconf.c +++ b/sys/arch/sparc/sparc/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.49 2002/03/14 01:26:44 millert Exp $ */ +/* $OpenBSD: autoconf.c,v 1.50 2002/03/14 03:16:00 millert Exp $ */ /* $NetBSD: autoconf.c,v 1.73 1997/07/29 09:41:53 fair Exp $ */ /* @@ -320,8 +320,8 @@ bootstrap() *((u_int *)ICR_ITR) = 0; #ifdef DEBUG -/* printf("SINTR: mask: 0x%x, pend: 0x%x\n", *(int*)ICR_SI_MASK, - *(int*)ICR_SI_PEND); +/* printf("SINTR: mask: 0x%x, pend: 0x%x\n", *(int *)ICR_SI_MASK, + *(int *)ICR_SI_PEND); */ #endif diff --git a/sys/arch/sparc/sparc/clock.c b/sys/arch/sparc/sparc/clock.c index 380e9c6b3ae..258aa30545a 100644 --- a/sys/arch/sparc/sparc/clock.c +++ b/sys/arch/sparc/sparc/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.16 2002/03/14 01:26:44 millert Exp $ */ +/* $OpenBSD: clock.c,v 1.17 2002/03/14 03:16:00 millert Exp $ */ /* $NetBSD: clock.c,v 1.52 1997/05/24 20:16:05 pk Exp $ */ /* @@ -1043,7 +1043,7 @@ oclk_get_dt(dt) dt++; /* end marker */ do { *dst++ = *src++; - } while (dst < (char*)dt); + } while (dst < (char *)dt); i7->clk_cmd_reg = intersil_command(INTERSIL_CMD_RUN, INTERSIL_CMD_IENABLE); diff --git a/sys/arch/sparc/sparc/db_disasm.c b/sys/arch/sparc/sparc/db_disasm.c index 9d293851406..c370aa41a28 100644 --- a/sys/arch/sparc/sparc/db_disasm.c +++ b/sys/arch/sparc/sparc/db_disasm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_disasm.c,v 1.4 1999/07/09 21:30:02 art Exp $ */ +/* $OpenBSD: db_disasm.c,v 1.5 2002/03/14 03:16:00 millert Exp $ */ /* $NetBSD: db_disasm.c,v 1.9 1996/03/31 23:45:07 pk Exp $ */ /* @@ -101,18 +101,18 @@ struct sparc_insn { unsigned long 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", @@ -120,18 +120,18 @@ char* priv_regs[] = { "", "", "", "", "", "", "", "" }; -char* state_regs[] = { +char *state_regs[] = { "y", "", "ccr", "asi", "tick", "pc", "fprs", "asr", "", "", "", "", "", "", "", "", "illegal", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }; -char* ccodes[] = { +char *ccodes[] = { "fcc0", "fcc1", "fcc2", "fcc3", "icc", "", "xcc", "" }; -char* prefetch[] = { +char *prefetch[] = { "n_reads", "one_read", "n_writes", "one_write", "page" }; @@ -803,7 +803,7 @@ db_disasm(loc, altfmt) unsigned long 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/sparc/stand/common/promdev.c b/sys/arch/sparc/stand/common/promdev.c index 58735dedb52..641bfb15d3a 100644 --- a/sys/arch/sparc/stand/common/promdev.c +++ b/sys/arch/sparc/stand/common/promdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: promdev.c,v 1.4 2002/03/14 01:26:44 millert Exp $ */ +/* $OpenBSD: promdev.c,v 1.5 2002/03/14 03:16:00 millert Exp $ */ /* $NetBSD: promdev.c,v 1.16 1995/11/14 15:04:01 pk Exp $ */ /* @@ -510,8 +510,8 @@ prom_getether(fd, ea) int len, x; if (sun4_idprom.id_format == 0) { - dst = (char*)&sun4_idprom; - src = (char*)AC_IDPROM; + dst = (char *)&sun4_idprom; + src = (char *)AC_IDPROM; len = sizeof(struct idprom); do { x = lduba(src++, ASI_CONTROL); @@ -780,7 +780,7 @@ found: pte += 1; length -= NBPG; } while (length > 0); - return ((char*)(prom_devmap | (pa & PGOFSET))); + return ((char *)(prom_devmap | (pa & PGOFSET))); } void 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. */ diff --git a/sys/arch/sun3/dev/cg2.c b/sys/arch/sun3/dev/cg2.c index 17aca349433..5422ac1fe7e 100644 --- a/sys/arch/sun3/dev/cg2.c +++ b/sys/arch/sun3/dev/cg2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cg2.c,v 1.10 2002/03/14 01:26:46 millert Exp $ */ +/* $OpenBSD: cg2.c,v 1.11 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: cg2.c,v 1.7 1996/10/13 03:47:26 christos Exp $ */ /* @@ -118,7 +118,7 @@ static struct fbdriver cg2fbdriver = { cg2getcmap, cg2putcmap }; -static int cg2intr(void*); +static int cg2intr(void *); /* * Match a cg2. @@ -166,7 +166,7 @@ cg2attach(parent, self, args) sc->sc_ctlreg = (struct cg2fb *) bus_mapin(ca->ca_bustype, ca->ca_paddr + CTLREGS_OFF, CTLREGS_SIZE); - isr_add_vectored(cg2intr, (void*)sc, + isr_add_vectored(cg2intr, (void *)sc, ca->ca_intpri, ca->ca_intvec); /* diff --git a/sys/arch/sun3/dev/idprom.c b/sys/arch/sun3/dev/idprom.c index f0939215305..894f76e52f8 100644 --- a/sys/arch/sun3/dev/idprom.c +++ b/sys/arch/sun3/dev/idprom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: idprom.c,v 1.6 1997/01/16 04:03:46 kstailey Exp $ */ +/* $OpenBSD: idprom.c,v 1.7 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: idprom.c,v 1.13 1996/11/20 18:56:50 gwr Exp $ */ /*- @@ -115,8 +115,8 @@ idprom_init() } hid; idp = &identity_prom; - dst = (char*)idp; - src = (char*)IDPROM_BASE; + dst = (char *)idp; + src = (char *)IDPROM_BASE; len = IDPROM_SIZE; xorsum = 0; /* calculated as xor of data */ diff --git a/sys/arch/sun3/dev/kd.c b/sys/arch/sun3/dev/kd.c index d7c19c50d14..48add94c541 100644 --- a/sys/arch/sun3/dev/kd.c +++ b/sys/arch/sun3/dev/kd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kd.c,v 1.10 2001/08/20 19:34:40 miod Exp $ */ +/* $OpenBSD: kd.c,v 1.11 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: kd.c,v 1.21 1996/11/20 18:56:55 gwr Exp $ */ /*- @@ -276,7 +276,7 @@ kdstop(tp, flag) return (0); } -static void kd_later(void*); +static void kd_later(void *); static void kd_putfb(struct tty *); static struct timeout kd_timeout; diff --git a/sys/arch/sun3/dev/si.c b/sys/arch/sun3/dev/si.c index 8e7b3796708..e1a8defb238 100644 --- a/sys/arch/sun3/dev/si.c +++ b/sys/arch/sun3/dev/si.c @@ -1,4 +1,4 @@ -/* $OpenBSD: si.c,v 1.15 2002/03/14 01:26:46 millert Exp $ */ +/* $OpenBSD: si.c,v 1.16 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: si.c,v 1.31 1996/11/20 18:56:59 gwr Exp $ */ /*- @@ -382,7 +382,7 @@ found: dh = &sc->sc_dma[i]; dh->dh_flags = SIDH_BUSY; - dh->dh_addr = (u_char*) addr; + dh->dh_addr = (u_char *) addr; dh->dh_maplen = xlen; dh->dh_dvma = 0; diff --git a/sys/arch/sun3/include/machdep.h b/sys/arch/sun3/include/machdep.h index da3f744ed42..a3f33ee2576 100644 --- a/sys/arch/sun3/include/machdep.h +++ b/sys/arch/sun3/include/machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.h,v 1.17 2002/03/14 01:26:46 millert Exp $ */ +/* $OpenBSD: machdep.h,v 1.18 2002/03/14 03:16:01 millert Exp $ */ /* * Copyright (c) 1994 Gordon W. Ross @@ -96,7 +96,7 @@ int fpu_emulate(struct frame *, struct fpframe *); /* Backward compatibility... */ #define getsr _getsr -void** getvbr(void); +void **getvbr(void); vm_offset_t high_segment_alloc(int npages); diff --git a/sys/arch/sun3/include/mon.h b/sys/arch/sun3/include/mon.h index bb1dcc2f69f..1164cca88cd 100644 --- a/sys/arch/sun3/include/mon.h +++ b/sys/arch/sun3/include/mon.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mon.h,v 1.6 2002/03/14 01:26:46 millert Exp $ */ +/* $OpenBSD: mon.h,v 1.7 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: mon.h,v 1.19 1996/11/20 18:57:12 gwr Exp $ */ /*- @@ -134,7 +134,7 @@ typedef struct { */ int (*getKey)(void); /* Get next key if one exists */ - int (*initGetKey)(void*); /* Initialize get key */ + int (*initGetKey)(void *); /* Initialize get key */ u_int *translation; /* Kbd translation selector (see keyboard.h in sun monitor code) */ @@ -197,8 +197,8 @@ typedef struct { * Non-maskable interrupt (nmi) information */ - int (*nmiAddr)(void*); /* Addr for level 7 vector */ - int (*abortEntry)(void*); /* Entry for keyboard abort */ + int (*nmiAddr)(void *); /* Addr for level 7 vector */ + int (*abortEntry)(void *); /* Entry for keyboard abort */ int *nmiClock; /* Counts up in msec */ /* @@ -221,10 +221,10 @@ typedef struct { long *resetAddr; /* where to jump on a reset */ long *resetMap; /* pgmap entry for resetaddr */ /* Really struct pgmapent * */ - int (*exitToMon)(void); /* Exit from user program */ + int (*exitToMon)(void); /* Exit from user program */ u_char **memorybitmap; /* V1: &{0 or &bits} */ - void (*setcxsegmap)(int,int,int); /* Set seg in any context */ - void (**vector_cmd)(int, char*); /* V2: Handler for 'v' cmd */ + void (*setcxsegmap)(int,int,int); /* Set seg in any context */ + void (**vector_cmd)(int, char *); /* V2: Handler for 'v' cmd */ int dummy1z; int dummy2z; int dummy3z; diff --git a/sys/arch/sun3/stand/bootxx/bootxx.c b/sys/arch/sun3/stand/bootxx/bootxx.c index aaf27d402bb..2b4730d2181 100644 --- a/sys/arch/sun3/stand/bootxx/bootxx.c +++ b/sys/arch/sun3/stand/bootxx/bootxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bootxx.c,v 1.2 2001/07/04 08:33:44 niklas Exp $ */ +/* $OpenBSD: bootxx.c,v 1.3 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: bootxx.c,v 1.5 1995/10/13 21:44:57 gwr Exp $ */ /* @@ -83,7 +83,7 @@ main() exit(); } - addr = (char*)LOADADDR; + addr = (char *)LOADADDR; error = copyboot(&f, addr); f.f_dev->dv_close(&f); if (!error) { diff --git a/sys/arch/sun3/stand/libsa/devopen.c b/sys/arch/sun3/stand/libsa/devopen.c index 8be8dacb97b..902bf855548 100644 --- a/sys/arch/sun3/stand/libsa/devopen.c +++ b/sys/arch/sun3/stand/libsa/devopen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: devopen.c,v 1.3 2001/07/04 08:33:48 niklas Exp $ */ +/* $OpenBSD: devopen.c,v 1.4 2002/03/14 03:16:01 millert Exp $ */ #include <sys/param.h> @@ -25,7 +25,7 @@ devopen(f, fname, file) struct devsw *dp; int error; - *file = (char*)fname; + *file = (char *)fname; dp = &devsw[0]; f->f_dev = dp; error = (*dp->dv_open)(f, prom_bootdev); diff --git a/sys/arch/sun3/stand/libsa/dvma.c b/sys/arch/sun3/stand/libsa/dvma.c index f92b3b17c17..0117a2ecaea 100644 --- a/sys/arch/sun3/stand/libsa/dvma.c +++ b/sys/arch/sun3/stand/libsa/dvma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dvma.c,v 1.5 2002/03/14 01:26:47 millert Exp $ */ +/* $OpenBSD: dvma.c,v 1.6 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: dvma.c,v 1.6 1996/01/31 17:20:39 gwr Exp $ */ /* @@ -111,7 +111,7 @@ dvma_alloc(int len) { len = m68k_round_page(len); dvma_end -= len; - return((char*)dvma_end); + return((char *)dvma_end); } void diff --git a/sys/arch/sun3/stand/libsa/exec_sun.c b/sys/arch/sun3/stand/libsa/exec_sun.c index ca7e72f51b5..bbefb121854 100644 --- a/sys/arch/sun3/stand/libsa/exec_sun.c +++ b/sys/arch/sun3/stand/libsa/exec_sun.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_sun.c,v 1.4 2001/07/04 08:33:49 niklas Exp $ */ +/* $OpenBSD: exec_sun.c,v 1.5 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: exec_sun.c,v 1.6 1996/06/20 03:59:41 gwr Exp $ */ /*- @@ -128,9 +128,9 @@ exec_sun(file, loadaddr) *cp++ = 0; --cc; } - ip = (int*)cp; + ip = (int *)cp; cp += cc; - while ((char*)ip < cp) + while ((char *)ip < cp) *ip++ = 0; /* @@ -138,7 +138,7 @@ exec_sun(file, loadaddr) * (Always set the symtab size word.) */ *ip++ = x.a_syms; - cp = (char*) ip; + cp = (char *) ip; if (x.a_syms > 0) { @@ -149,7 +149,7 @@ exec_sun(file, loadaddr) if (read(io, cp, cc) != cc) goto shread; cp += x.a_syms; - ip = (int*)cp; /* points to strtab length */ + ip = (int *)cp; /* points to strtab length */ cp += sizeof(int); /* String table. Length word includes itself. */ diff --git a/sys/arch/sun3/stand/libsa/netif_sun.c b/sys/arch/sun3/stand/libsa/netif_sun.c index 7b447035acf..27735093c00 100644 --- a/sys/arch/sun3/stand/libsa/netif_sun.c +++ b/sys/arch/sun3/stand/libsa/netif_sun.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netif_sun.c,v 1.6 2002/03/14 01:26:47 millert Exp $ */ +/* $OpenBSD: netif_sun.c,v 1.7 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: netif_sun.c,v 1.4 1996/01/29 23:41:07 gwr Exp $ */ /* @@ -92,8 +92,8 @@ sun3_getether(ea) int len, x; if (sun3_idprom.idp_format == 0) { - dst = (char*)&sun3_idprom; - src = (char*)IDPROM_BASE; + dst = (char *)&sun3_idprom; + src = (char *)IDPROM_BASE; len = IDPROM_SIZE; do { x = get_control_byte(src++); diff --git a/sys/arch/sun3/stand/libsa/promdev.c b/sys/arch/sun3/stand/libsa/promdev.c index e585af44173..934e8546caa 100644 --- a/sys/arch/sun3/stand/libsa/promdev.c +++ b/sys/arch/sun3/stand/libsa/promdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: promdev.c,v 1.7 2002/03/14 01:26:47 millert Exp $ */ +/* $OpenBSD: promdev.c,v 1.8 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: promdev.c,v 1.7 1996/01/29 23:41:10 gwr Exp $ */ /* @@ -107,7 +107,7 @@ prom_iopen(si) size = dip->d_dmabytes + NBPG; addr = (int) dvma_alloc(size); addr = m68k_round_page(addr); - si->si_dmaaddr = (char*) addr; + si->si_dmaaddr = (char *) addr; #ifdef DEBUG_PROM if (debug) printf("prom_iopen: dmaaddr=0x%x\n", si->si_dmaaddr); @@ -222,5 +222,5 @@ found: pte += 1; length -= NBPG; } while (length > 0); - return ((char*)(prom_devmap | (pa & PGOFSET))); + return ((char *)(prom_devmap | (pa & PGOFSET))); } diff --git a/sys/arch/sun3/stand/netboot/dev_net.c b/sys/arch/sun3/stand/netboot/dev_net.c index 9925ba93b2c..5ec01f5d031 100644 --- a/sys/arch/sun3/stand/netboot/dev_net.c +++ b/sys/arch/sun3/stand/netboot/dev_net.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dev_net.c,v 1.4 2001/07/04 08:33:54 niklas Exp $ */ +/* $OpenBSD: dev_net.c,v 1.5 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: dev_net.c,v 1.4 1996/01/29 23:54:15 gwr Exp $ */ /* @@ -105,7 +105,7 @@ net_open(struct open_file *f, ...) int error = 0; va_start(ap, f); - devname = va_arg(ap, char*); + devname = va_arg(ap, char *); va_end(ap); #ifdef NETIF_DEBUG diff --git a/sys/arch/sun3/stand/tapeboot/dev_tape.c b/sys/arch/sun3/stand/tapeboot/dev_tape.c index 54a8f24c428..962ebba7418 100644 --- a/sys/arch/sun3/stand/tapeboot/dev_tape.c +++ b/sys/arch/sun3/stand/tapeboot/dev_tape.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dev_tape.c,v 1.3 2001/07/04 08:33:56 niklas Exp $ */ +/* $OpenBSD: dev_tape.c,v 1.4 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: dev_tape.c,v 1.2 1995/10/17 22:58:20 gwr Exp $ */ /* @@ -70,7 +70,7 @@ devopen(f, fname, file) struct devsw *dp; int error; - *file = (char*)fname; + *file = (char *)fname; dp = &devsw[0]; f->f_dev = dp; diff --git a/sys/arch/sun3/sun3/autoconf.c b/sys/arch/sun3/sun3/autoconf.c index 98316a8e94d..74424336be8 100644 --- a/sys/arch/sun3/sun3/autoconf.c +++ b/sys/arch/sun3/sun3/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.21 2002/03/14 01:26:47 millert Exp $ */ +/* $OpenBSD: autoconf.c,v 1.22 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: autoconf.c,v 1.37 1996/11/20 18:57:22 gwr Exp $ */ /*- @@ -291,7 +291,7 @@ bus_mapin(bustype, paddr, sz) #endif pmap_update(pmap_kernel()); - return ((char*)retval); + return ((char *)retval); } /* from hp300: badaddr() */ diff --git a/sys/arch/sun3/sun3/clock.c b/sys/arch/sun3/sun3/clock.c index 85bf6ff7586..952da438fb8 100644 --- a/sys/arch/sun3/sun3/clock.c +++ b/sys/arch/sun3/sun3/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.10 2002/03/14 01:26:47 millert Exp $ */ +/* $OpenBSD: clock.c,v 1.11 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: clock.c,v 1.31 1996/10/30 00:24:42 gwr Exp $ */ /* @@ -425,7 +425,7 @@ clk_get_dt(dt) dt++; /* end marker */ do { *dst++ = *src++; - } while (dst < (char*)dt); + } while (dst < (char *)dt); intersil_clock->clk_cmd_reg = intersil_command(INTERSIL_CMD_RUN, INTERSIL_CMD_IENABLE); @@ -605,9 +605,9 @@ clkdebug() long gmt; long *lp; - bzero((char*)&dt, sizeof(dt)); + bzero((char *)&dt, sizeof(dt)); clk_get_dt(&dt); - lp = (long*)&dt; + lp = (long *)&dt; printf("clkdebug: dt=[%x,%x]\n", lp[0], lp[1]); dt_to_gmt(&dt, &gmt); diff --git a/sys/arch/sun3/sun3/db_memrw.c b/sys/arch/sun3/sun3/db_memrw.c index 886af8e81f3..9f3006760b2 100644 --- a/sys/arch/sun3/sun3/db_memrw.c +++ b/sys/arch/sun3/sun3/db_memrw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_memrw.c,v 1.10 2002/03/14 01:26:47 millert Exp $ */ +/* $OpenBSD: db_memrw.c,v 1.11 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: db_memrw.c,v 1.13 1996/11/20 18:57:28 gwr Exp $ */ /*- @@ -80,15 +80,15 @@ db_read_bytes(addr, size, data) register size_t size; register char *data; { - register char *src = (char*)addr; + register char *src = (char *)addr; if (size == 4) { - *((int*)data) = *((int*)src); + *((int *)data) = *((int *)src); return; } if (size == 2) { - *((short*)data) = *((short*)src); + *((short *)data) = *((short *)src); return; } @@ -116,7 +116,7 @@ db_write_text(addr, size, data) if (size <= 0) return; - dst = (char*)addr; + dst = (char *)addr; pgva = trunc_page((long)dst); goto firstpage; @@ -188,12 +188,12 @@ db_write_bytes(addr, size, data) } if (size == 4) { - *((int*)dst) = *((int*)data); + *((int *)dst) = *((int *)data); return; } if (size == 2) { - *((short*)dst) = *((short*)data); + *((short *)dst) = *((short *)data); return; } diff --git a/sys/arch/sun3/sun3/isr.c b/sys/arch/sun3/sun3/isr.c index e651d78ae2d..062e6ddc527 100644 --- a/sys/arch/sun3/sun3/isr.c +++ b/sys/arch/sun3/sun3/isr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isr.c,v 1.16 2002/03/14 01:26:47 millert Exp $ */ +/* $OpenBSD: isr.c,v 1.17 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: isr.c,v 1.25 1996/11/20 18:57:32 gwr Exp $ */ /*- @@ -69,7 +69,7 @@ struct isr { int isr_ipl; }; -void set_vector_entry __P((int, void (*handler)(void))); +void set_vector_entry(int, void (*handler)(void)); unsigned int get_vector_entry(int); void isr_autovec(int); diff --git a/sys/arch/sun3/sun3/machdep.c b/sys/arch/sun3/sun3/machdep.c index 0932cdd5cb9..68eef454519 100644 --- a/sys/arch/sun3/sun3/machdep.c +++ b/sys/arch/sun3/sun3/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.52 2002/03/14 01:26:47 millert Exp $ */ +/* $OpenBSD: machdep.c,v 1.53 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: machdep.c,v 1.77 1996/10/13 03:47:51 christos Exp $ */ /* @@ -770,7 +770,7 @@ dumpsys() do { if ((todo & 0xf) == 0) printf("\r%4d", todo); - vaddr = (char*)(paddr + KERNBASE); + vaddr = (char *)(paddr + KERNBASE); error = (*dsw->d_dump)(dumpdev, blkno, vaddr, NBPG); if (error) goto fail; @@ -780,7 +780,7 @@ dumpsys() } while (--chunk > 0); /* Do the second chunk (avail_start <= PA < dumpsize) */ - vaddr = (char*)vmmap; /* Borrow /dev/mem VA */ + vaddr = (char *)vmmap; /* Borrow /dev/mem VA */ do { if ((todo & 0xf) == 0) printf("\r%4d", todo); diff --git a/sys/arch/sun3/sun3/sun3_startup.c b/sys/arch/sun3/sun3/sun3_startup.c index 7975deb4a13..7009a8af0bd 100644 --- a/sys/arch/sun3/sun3/sun3_startup.c +++ b/sys/arch/sun3/sun3/sun3_startup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sun3_startup.c,v 1.21 2002/03/14 01:26:47 millert Exp $ */ +/* $OpenBSD: sun3_startup.c,v 1.22 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: sun3_startup.c,v 1.55 1996/11/20 18:57:38 gwr Exp $ */ /*- @@ -331,7 +331,7 @@ sun3_save_symtab(kehp) /* Check the symtab length word. */ endp = end; - symsz = (int*)endp; + symsz = (int *)endp; if (kehp->a_syms != *symsz) { errdesc = "a_syms"; goto err; @@ -340,7 +340,7 @@ sun3_save_symtab(kehp) endp += *symsz; /* past nlist array */ /* Check the string table length. */ - strsz = (int*)endp; + strsz = (int *)endp; if ((*strsz < 4) || (*strsz > 0x80000)) { errdesc = "strsize"; goto err; diff --git a/sys/arch/sun3/sun3/vector.c b/sys/arch/sun3/sun3/vector.c index d100b60c432..c228451aec5 100644 --- a/sys/arch/sun3/sun3/vector.c +++ b/sys/arch/sun3/sun3/vector.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vector.c,v 1.8 2002/03/14 01:26:47 millert Exp $ */ +/* $OpenBSD: vector.c,v 1.9 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: vector.c,v 1.15 1996/11/20 18:57:40 gwr Exp $ */ /*- @@ -60,8 +60,8 @@ #define fpunfl fpfault void (*vector_table[NVECTORS])(void) = { - (void*)0xfffe000, /* 0: NOT USED (reset SP) */ - (void*)0xfef0000, /* 1: NOT USED (reset PC) */ + (void *)0xfffe000, /* 0: NOT USED (reset SP) */ + (void *)0xfef0000, /* 1: NOT USED (reset PC) */ buserr, /* 2: bus error */ addrerr, /* 3: address error */ illinst, /* 4: illegal instruction */ diff --git a/sys/arch/sun3/sun3/vm_machdep.c b/sys/arch/sun3/sun3/vm_machdep.c index b9ae489831a..a51681625f3 100644 --- a/sys/arch/sun3/sun3/vm_machdep.c +++ b/sys/arch/sun3/sun3/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.22 2001/12/08 02:24:07 art Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.23 2002/03/14 03:16:01 millert Exp $ */ /* $NetBSD: vm_machdep.c,v 1.35 1996/04/26 18:38:06 gwr Exp $ */ /* @@ -119,7 +119,7 @@ cpu_fork(p1, p2, stack, stacksize, func, arg) * Leave one word unused at the end of the kernel stack * so the system stack pointer stays within its stack. */ - p2tf = (struct trapframe *)((char*)p2->p_addr + USPACE-4) - 1; + p2tf = (struct trapframe *)((char *)p2->p_addr + USPACE-4) - 1; p2->p_md.md_regs = (int *)p2tf; bcopy(p1->p_md.md_regs, p2tf, sizeof(*p2tf)); diff --git a/sys/arch/vax/bi/bi.c b/sys/arch/vax/bi/bi.c index 8b8c55bca44..11b69b12087 100644 --- a/sys/arch/vax/bi/bi.c +++ b/sys/arch/vax/bi/bi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bi.c,v 1.3 2002/03/14 01:26:47 millert Exp $ */ +/* $OpenBSD: bi.c,v 1.4 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: bi.c,v 1.4 1996/10/13 03:34:44 christos Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -52,7 +52,7 @@ #include <arch/vax/bi/bivar.h> static int bi_match(struct device *, void *, void *); -static void bi_attach(struct device *, struct device *, void*); +static void bi_attach(struct device *, struct device *, void *); static int bi_print(void *, const char *); struct cfdriver bi_cd = { diff --git a/sys/arch/vax/bi/bivar.h b/sys/arch/vax/bi/bivar.h index 53af17b53d4..a44ace650fb 100644 --- a/sys/arch/vax/bi/bivar.h +++ b/sys/arch/vax/bi/bivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bivar.h,v 1.4 2002/03/14 01:26:47 millert Exp $ */ +/* $OpenBSD: bivar.h,v 1.5 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: bivar.h,v 1.5 2000/03/26 11:45:04 ragge Exp $ */ /* * Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden. @@ -71,4 +71,4 @@ struct bi_list { /* Prototype */ void bi_attach(struct bi_softc *); -void bi_intr_establish __P((void *, int, void (*)(void *), void *)); +void bi_intr_establish(void *, int, void (*)(void *), void *); diff --git a/sys/arch/vax/boot/boot/if_qe.c b/sys/arch/vax/boot/boot/if_qe.c index 247f82a4728..a1c1c248907 100644 --- a/sys/arch/vax/boot/boot/if_qe.c +++ b/sys/arch/vax/boot/boot/if_qe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_qe.c,v 1.1 2000/04/27 02:26:25 bjc Exp $ */ +/* $OpenBSD: if_qe.c,v 1.2 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: if_qe.c,v 1.2 1999/06/30 18:19:26 ragge Exp $ */ /* @@ -218,7 +218,7 @@ retry: if (len == 0) goto retry; - bcopy((void*)sc->qein,pkt,len); + bcopy((void *)sc->qein,pkt,len); end: diff --git a/sys/arch/vax/boot/boot/mfm.c b/sys/arch/vax/boot/boot/mfm.c index 33fbbbc3065..2e22bda7139 100644 --- a/sys/arch/vax/boot/boot/mfm.c +++ b/sys/arch/vax/boot/boot/mfm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfm.c,v 1.1 2000/04/27 02:26:25 bjc Exp $ */ +/* $OpenBSD: mfm.c,v 1.2 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: mfm.c,v 1.2 1997/03/15 13:04:28 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -78,9 +78,9 @@ char io_buf[DEV_BSIZE]; * These should probably be somewhere else, but ka410 is the only * one with mfm disks anyway... */ -volatile unsigned char *ka410_intreq = (void*)0x2008000f; -volatile unsigned char *ka410_intclr = (void*)0x2008000f; -volatile unsigned char *ka410_intmsk = (void*)0x2008000c; +volatile unsigned char *ka410_intreq = (void *)0x2008000f; +volatile unsigned char *ka410_intclr = (void *)0x2008000f; +volatile unsigned char *ka410_intmsk = (void *)0x2008000c; static volatile struct hdc9224_DKCreg *dkc = (void *) 0x200c0000; static volatile struct hdc9224_UDCreg sreg; /* input */ diff --git a/sys/arch/vax/boot/boot/ra.c b/sys/arch/vax/boot/boot/ra.c index 96be3fcfc00..a0eeaa4cfb0 100644 --- a/sys/arch/vax/boot/boot/ra.c +++ b/sys/arch/vax/boot/boot/ra.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ra.c,v 1.1 2000/04/27 02:26:25 bjc Exp $ */ +/* $OpenBSD: ra.c,v 1.2 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: ra.c,v 1.4 1999/08/07 11:19:04 ragge Exp $ */ /* * Copyright (c) 1995 Ludd, University of Lule}, Sweden. @@ -111,7 +111,7 @@ raopen(f, adapt, ctlr, unit, part) nisse[494] = PG_V | (((u_int)&uda) >> 9); nisse[495] = nisse[494] + 1; udacsr = (int)uioaddr[adapt] + udaaddr[ctlr]; - ubauda = (void*)0x3dc00 + (((u_int)(&uda))&0x1ff); + ubauda = (void *)0x3dc00 + (((u_int)(&uda))&0x1ff); johan = (((u_int)ubauda) & 0xffff) + 8; johan2 = 3; ra->ra_ip = (short *)udacsr; diff --git a/sys/arch/vax/boot/boot/rom.c b/sys/arch/vax/boot/boot/rom.c index 21494022eb1..2d3f0c3a6b5 100644 --- a/sys/arch/vax/boot/boot/rom.c +++ b/sys/arch/vax/boot/boot/rom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rom.c,v 1.2 2000/10/04 04:48:54 bjc Exp $ */ +/* $OpenBSD: rom.c,v 1.3 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: rom.c,v 1.1 1996/08/02 11:22:21 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -73,7 +73,7 @@ romopen(f, adapt, ctlr, unit, part) int i,err; bootregs[11] = XXRPB; - bqo = (void*)rpb->iovec; + bqo = (void *)rpb->iovec; if (rpb->unit > 0 && (rpb->unit % 100) == 0) { printf ("changing rpb->unit from %d ", rpb->unit); @@ -93,7 +93,7 @@ romopen(f, adapt, ctlr, unit, part) msg = getdisklabel(io_buf+LABELOFFSET, lp); if (msg) printf("getdisklabel: %s\n",msg); - f->f_devdata = (void*)rsc; + f->f_devdata = (void *)rsc; return(0); } diff --git a/sys/arch/vax/boot/boot/tmscp.c b/sys/arch/vax/boot/boot/tmscp.c index 5dbd5aef582..ec0f185a01c 100644 --- a/sys/arch/vax/boot/boot/tmscp.c +++ b/sys/arch/vax/boot/boot/tmscp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmscp.c,v 1.1 2000/04/27 02:26:25 bjc Exp $ */ +/* $OpenBSD: tmscp.c,v 1.2 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: tmscp.c,v 1.3 1999/06/30 18:19:26 ragge Exp $ */ /* * Copyright (c) 1995 Ludd, University of Lule}, Sweden. @@ -95,11 +95,11 @@ tmscpopen(f, adapt, ctlr, unit, part) ra->udaddr=uioaddr[adapt]+tmsaddr; ra->ubaddr=(int)ubaaddr[adapt]; ra->unit=unit; - udacsr=(void*)ra->udaddr; + udacsr=(void *)ra->udaddr; nisse=((u_int *)ubaaddr[adapt]) + 512; nisse[494]=PG_V|(((u_int)&uda)>>9); nisse[495]=nisse[494]+1; - ubauda=(void*)0x3dc00+(((u_int)(&uda))&0x1ff); + ubauda=(void *)0x3dc00+(((u_int)(&uda))&0x1ff); /* * Init of this tmscp ctlr. @@ -165,7 +165,7 @@ tmscpstrategy(ra, func, dblk, size, buf, rsize) u_int size, *rsize; { u_int i,j,pfnum, mapnr, nsize, bn, cn, sn, tn; - volatile struct udadevice *udadev=(void*)ra->udaddr; + volatile struct udadevice *udadev=(void *)ra->udaddr; volatile u_int *ptmapp = (u_int *)ra->ubaddr + 512; volatile int hej; diff --git a/sys/arch/vax/boot/xxboot/bootxx.c b/sys/arch/vax/boot/xxboot/bootxx.c index e91679f2a9e..30007379ea1 100644 --- a/sys/arch/vax/boot/xxboot/bootxx.c +++ b/sys/arch/vax/boot/xxboot/bootxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bootxx.c,v 1.3 2002/03/14 01:26:47 millert Exp $ */ +/* $OpenBSD: bootxx.c,v 1.4 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: bootxx.c,v 1.2 1999/10/23 14:40:38 ragge Exp $ */ /*- * Copyright (c) 1982, 1986 The Regents of the University of California. @@ -118,11 +118,11 @@ Xmain() /* * now relocate rpb/bqo (which are used by ROM-routines) */ - rpb = (void*)XXRPB; - bcopy ((void*)bootregs[11], rpb, 512); + rpb = (void *)XXRPB; + bcopy ((void *)bootregs[11], rpb, 512); rpb->rpb_base = rpb; - bqo = (void*)(512+(int)rpb); - bcopy ((void*)rpb->iovec, bqo, rpb->iovecsz); + bqo = (void *)(512+(int)rpb); + bcopy ((void *)rpb->iovec, bqo, rpb->iovecsz); rpb->iovec = (int)bqo; bootregs[11] = (int)rpb; bootdev = rpb->devtyp; @@ -431,7 +431,7 @@ hpread(block, size, buf) char *buf; { volatile struct mba_regs *mr = (void *) bootregs[1]; - volatile struct hp_drv *hd = (void*)&mr->mba_md[bootregs[3]]; + volatile struct hp_drv *hd = (void *)&mr->mba_md[bootregs[3]]; struct disklabel *dp = &lp; u_int pfnum, nsize, mapnr, bn, cn, sn, tn; @@ -457,7 +457,7 @@ hpread(block, size, buf) } extern char end[]; -static char *top = (char*)end; +static char *top = (char *)end; void * alloc(size) diff --git a/sys/arch/vax/dec/lk201.h b/sys/arch/vax/dec/lk201.h index edec87498b9..a496cb17b45 100644 --- a/sys/arch/vax/dec/lk201.h +++ b/sys/arch/vax/dec/lk201.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lk201.h,v 1.2 2002/03/14 01:26:47 millert Exp $ */ +/* $OpenBSD: lk201.h,v 1.3 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: lk201.h,v 1.7 1999/03/19 18:34:01 ad Exp $ */ @@ -142,5 +142,5 @@ #ifdef _KERNEL extern int LKgetc(dev_t dev); -extern void lkdivert __P ((int (*getc_fn)(dev_t dev), dev_t dev)); +extern void lkdivert(int (*getc_fn)(dev_t dev), dev_t dev); #endif diff --git a/sys/arch/vax/stand/boot/if_qe.c b/sys/arch/vax/stand/boot/if_qe.c index 247f82a4728..a1c1c248907 100644 --- a/sys/arch/vax/stand/boot/if_qe.c +++ b/sys/arch/vax/stand/boot/if_qe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_qe.c,v 1.1 2000/04/27 02:26:25 bjc Exp $ */ +/* $OpenBSD: if_qe.c,v 1.2 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: if_qe.c,v 1.2 1999/06/30 18:19:26 ragge Exp $ */ /* @@ -218,7 +218,7 @@ retry: if (len == 0) goto retry; - bcopy((void*)sc->qein,pkt,len); + bcopy((void *)sc->qein,pkt,len); end: diff --git a/sys/arch/vax/stand/boot/mfm.c b/sys/arch/vax/stand/boot/mfm.c index 33fbbbc3065..2e22bda7139 100644 --- a/sys/arch/vax/stand/boot/mfm.c +++ b/sys/arch/vax/stand/boot/mfm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfm.c,v 1.1 2000/04/27 02:26:25 bjc Exp $ */ +/* $OpenBSD: mfm.c,v 1.2 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: mfm.c,v 1.2 1997/03/15 13:04:28 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -78,9 +78,9 @@ char io_buf[DEV_BSIZE]; * These should probably be somewhere else, but ka410 is the only * one with mfm disks anyway... */ -volatile unsigned char *ka410_intreq = (void*)0x2008000f; -volatile unsigned char *ka410_intclr = (void*)0x2008000f; -volatile unsigned char *ka410_intmsk = (void*)0x2008000c; +volatile unsigned char *ka410_intreq = (void *)0x2008000f; +volatile unsigned char *ka410_intclr = (void *)0x2008000f; +volatile unsigned char *ka410_intmsk = (void *)0x2008000c; static volatile struct hdc9224_DKCreg *dkc = (void *) 0x200c0000; static volatile struct hdc9224_UDCreg sreg; /* input */ diff --git a/sys/arch/vax/stand/boot/ra.c b/sys/arch/vax/stand/boot/ra.c index 96be3fcfc00..a0eeaa4cfb0 100644 --- a/sys/arch/vax/stand/boot/ra.c +++ b/sys/arch/vax/stand/boot/ra.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ra.c,v 1.1 2000/04/27 02:26:25 bjc Exp $ */ +/* $OpenBSD: ra.c,v 1.2 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: ra.c,v 1.4 1999/08/07 11:19:04 ragge Exp $ */ /* * Copyright (c) 1995 Ludd, University of Lule}, Sweden. @@ -111,7 +111,7 @@ raopen(f, adapt, ctlr, unit, part) nisse[494] = PG_V | (((u_int)&uda) >> 9); nisse[495] = nisse[494] + 1; udacsr = (int)uioaddr[adapt] + udaaddr[ctlr]; - ubauda = (void*)0x3dc00 + (((u_int)(&uda))&0x1ff); + ubauda = (void *)0x3dc00 + (((u_int)(&uda))&0x1ff); johan = (((u_int)ubauda) & 0xffff) + 8; johan2 = 3; ra->ra_ip = (short *)udacsr; diff --git a/sys/arch/vax/stand/boot/rom.c b/sys/arch/vax/stand/boot/rom.c index 21494022eb1..2d3f0c3a6b5 100644 --- a/sys/arch/vax/stand/boot/rom.c +++ b/sys/arch/vax/stand/boot/rom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rom.c,v 1.2 2000/10/04 04:48:54 bjc Exp $ */ +/* $OpenBSD: rom.c,v 1.3 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: rom.c,v 1.1 1996/08/02 11:22:21 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -73,7 +73,7 @@ romopen(f, adapt, ctlr, unit, part) int i,err; bootregs[11] = XXRPB; - bqo = (void*)rpb->iovec; + bqo = (void *)rpb->iovec; if (rpb->unit > 0 && (rpb->unit % 100) == 0) { printf ("changing rpb->unit from %d ", rpb->unit); @@ -93,7 +93,7 @@ romopen(f, adapt, ctlr, unit, part) msg = getdisklabel(io_buf+LABELOFFSET, lp); if (msg) printf("getdisklabel: %s\n",msg); - f->f_devdata = (void*)rsc; + f->f_devdata = (void *)rsc; return(0); } diff --git a/sys/arch/vax/stand/boot/tmscp.c b/sys/arch/vax/stand/boot/tmscp.c index 5dbd5aef582..ec0f185a01c 100644 --- a/sys/arch/vax/stand/boot/tmscp.c +++ b/sys/arch/vax/stand/boot/tmscp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmscp.c,v 1.1 2000/04/27 02:26:25 bjc Exp $ */ +/* $OpenBSD: tmscp.c,v 1.2 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: tmscp.c,v 1.3 1999/06/30 18:19:26 ragge Exp $ */ /* * Copyright (c) 1995 Ludd, University of Lule}, Sweden. @@ -95,11 +95,11 @@ tmscpopen(f, adapt, ctlr, unit, part) ra->udaddr=uioaddr[adapt]+tmsaddr; ra->ubaddr=(int)ubaaddr[adapt]; ra->unit=unit; - udacsr=(void*)ra->udaddr; + udacsr=(void *)ra->udaddr; nisse=((u_int *)ubaaddr[adapt]) + 512; nisse[494]=PG_V|(((u_int)&uda)>>9); nisse[495]=nisse[494]+1; - ubauda=(void*)0x3dc00+(((u_int)(&uda))&0x1ff); + ubauda=(void *)0x3dc00+(((u_int)(&uda))&0x1ff); /* * Init of this tmscp ctlr. @@ -165,7 +165,7 @@ tmscpstrategy(ra, func, dblk, size, buf, rsize) u_int size, *rsize; { u_int i,j,pfnum, mapnr, nsize, bn, cn, sn, tn; - volatile struct udadevice *udadev=(void*)ra->udaddr; + volatile struct udadevice *udadev=(void *)ra->udaddr; volatile u_int *ptmapp = (u_int *)ra->ubaddr + 512; volatile int hej; diff --git a/sys/arch/vax/stand/xxboot/bootxx.c b/sys/arch/vax/stand/xxboot/bootxx.c index e91679f2a9e..30007379ea1 100644 --- a/sys/arch/vax/stand/xxboot/bootxx.c +++ b/sys/arch/vax/stand/xxboot/bootxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bootxx.c,v 1.3 2002/03/14 01:26:47 millert Exp $ */ +/* $OpenBSD: bootxx.c,v 1.4 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: bootxx.c,v 1.2 1999/10/23 14:40:38 ragge Exp $ */ /*- * Copyright (c) 1982, 1986 The Regents of the University of California. @@ -118,11 +118,11 @@ Xmain() /* * now relocate rpb/bqo (which are used by ROM-routines) */ - rpb = (void*)XXRPB; - bcopy ((void*)bootregs[11], rpb, 512); + rpb = (void *)XXRPB; + bcopy ((void *)bootregs[11], rpb, 512); rpb->rpb_base = rpb; - bqo = (void*)(512+(int)rpb); - bcopy ((void*)rpb->iovec, bqo, rpb->iovecsz); + bqo = (void *)(512+(int)rpb); + bcopy ((void *)rpb->iovec, bqo, rpb->iovecsz); rpb->iovec = (int)bqo; bootregs[11] = (int)rpb; bootdev = rpb->devtyp; @@ -431,7 +431,7 @@ hpread(block, size, buf) char *buf; { volatile struct mba_regs *mr = (void *) bootregs[1]; - volatile struct hp_drv *hd = (void*)&mr->mba_md[bootregs[3]]; + volatile struct hp_drv *hd = (void *)&mr->mba_md[bootregs[3]]; struct disklabel *dp = &lp; u_int pfnum, nsize, mapnr, bn, cn, sn, tn; @@ -457,7 +457,7 @@ hpread(block, size, buf) } extern char end[]; -static char *top = (char*)end; +static char *top = (char *)end; void * alloc(size) diff --git a/sys/arch/vax/uba/ts.c b/sys/arch/vax/uba/ts.c index 97db187bf21..6da9ce768b9 100644 --- a/sys/arch/vax/uba/ts.c +++ b/sys/arch/vax/uba/ts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ts.c,v 1.7 2002/03/14 01:26:48 millert Exp $ */ +/* $OpenBSD: ts.c,v 1.8 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: ts.c,v 1.11 1997/01/11 11:34:43 ragge Exp $ */ /*- @@ -286,7 +286,7 @@ tsexec (ctlr, cmd) register struct tscmd *tscmdp = &ts[ctlr].cmd; register long tscmdma = (long)&sc->sc_ts->cmd; /* mapped address */ volatile struct tsdevice *tsreg = ts[ctlr].reg; - volatile char *dbx = ((char*)tsreg) + 3; + volatile char *dbx = ((char *)tsreg) + 3; volatile short sr; sc->sc_cmdf |= TS_CF_ACK | TS_CF_IE; @@ -319,7 +319,7 @@ tsexec (ctlr, cmd) sc->sc_dev.dv_xname, sr); return (-1); } - dbx = ((char*)tsreg) + 3; /* dbx is located at the fourth byte */ + dbx = ((char *)tsreg) + 3; /* dbx is located at the fourth byte */ *dbx = (tscmdma >> 18) & 0x0F; /* load bits 18-21 into dbx */ /* possible race-condition with ATTN !!! */ diff --git a/sys/arch/vax/vax/cmi.c b/sys/arch/vax/vax/cmi.c index ec7182df536..8cb34ca1e57 100644 --- a/sys/arch/vax/vax/cmi.c +++ b/sys/arch/vax/vax/cmi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmi.c,v 1.2 2002/03/14 01:26:48 millert Exp $ */ +/* $OpenBSD: cmi.c,v 1.3 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: cmi.c,v 1.2 1999/08/14 11:30:48 ragge Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. @@ -42,7 +42,7 @@ static int cmi_print(void *, const char *); static int cmi_match(struct device *, struct cfdata *, void *); -static void cmi_attach(struct device *, struct device *, void*); +static void cmi_attach(struct device *, struct device *, void *); struct cfattach cmi_ca = { sizeof(struct device), cmi_match, cmi_attach @@ -93,7 +93,7 @@ cmi_attach(parent, self, aux) vax_unmap_physmem((vaddr_t)sa.nexaddr, NEXPAGES); } else { sa.type = NEX_MEM16; - config_found(self, (void*)&sa, cmi_print); + config_found(self, (void *)&sa, cmi_print); } } @@ -107,7 +107,7 @@ cmi_attach(parent, self, aux) vax_unmap_physmem((vaddr_t)sa.nexaddr, NEXPAGES); } else { sa.type = NEX_MBA; - config_found(self, (void*)&sa, cmi_print); + config_found(self, (void *)&sa, cmi_print); } } @@ -118,7 +118,7 @@ cmi_attach(parent, self, aux) sa.nexaddr = (struct nexus *)vax_map_physmem(NEX750 + sizeof(struct nexus) * sa.nexnum, NEXPAGES); sa.type = NEX_UBA0; - config_found(self, (void*)&sa, cmi_print); + config_found(self, (void *)&sa, cmi_print); sa.nexnum = 9; sa.nexaddr = (struct nexus *)vax_map_physmem(NEX750 + @@ -127,5 +127,5 @@ cmi_attach(parent, self, aux) if (badaddr((caddr_t)sa.nexaddr, 4)) vax_unmap_physmem((vaddr_t)sa.nexaddr, NEXPAGES); else - config_found(self, (void*)&sa, cmi_print); + config_found(self, (void *)&sa, cmi_print); } diff --git a/sys/arch/vax/vax/dzcons.c b/sys/arch/vax/vax/dzcons.c index bb97d781b16..9deb9be3e37 100644 --- a/sys/arch/vax/vax/dzcons.c +++ b/sys/arch/vax/vax/dzcons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dzcons.c,v 1.4 2002/03/14 01:26:48 millert Exp $ */ +/* $OpenBSD: dzcons.c,v 1.5 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: dzcons.c,v 1.5 1997/03/22 12:51:01 ragge Exp $ */ /* * Copyright (c) 1994 Gordon W. Ross @@ -51,9 +51,9 @@ #include <machine/ka410.h> #include <machine/../vax/gencons.h> -volatile unsigned char *ka410_intreq = (void*)KA410_INTREQ; -volatile unsigned char *ka410_intclr = (void*)KA410_INTCLR; -volatile unsigned char *ka410_intmsk = (void*)KA410_INTMSK; +volatile unsigned char *ka410_intreq = (void *)KA410_INTREQ; +volatile unsigned char *ka410_intclr = (void *)KA410_INTCLR; +volatile unsigned char *ka410_intmsk = (void *)KA410_INTMSK; @@ -69,7 +69,7 @@ static volatile struct {/* base address of DZ-controller: 0x200A0000 */ REG(lpr1); /* 14 Lpr0: */ REG(lpr2); /* 18 Lpr0: */ REG(lpr3); /* 1C Lpr0: */ -} *dz = (void*)0x200A0000; +} *dz = (void *)0x200A0000; #undef REG void dzcnputc (); @@ -322,10 +322,10 @@ int dzcninit(cndev) struct consdev *cndev; { - dz = (void*)uvax_phys2virt ((int) dz); - ka410_intreq = (void*)uvax_phys2virt ((int)ka410_intreq); - ka410_intclr = (void*)uvax_phys2virt ((int)ka410_intclr); - ka410_intmsk = (void*)uvax_phys2virt ((int)ka410_intmsk); + dz = (void *)uvax_phys2virt ((int) dz); + ka410_intreq = (void *)uvax_phys2virt ((int)ka410_intreq); + ka410_intclr = (void *)uvax_phys2virt ((int)ka410_intclr); + ka410_intmsk = (void *)uvax_phys2virt ((int)ka410_intmsk); dz->csr = 0; /* Disable scanning until initting is done */ dz->rbuf = 0; /* Turn off line 0's receiver */ diff --git a/sys/arch/vax/vax/ibus.c b/sys/arch/vax/vax/ibus.c index e804ad2d416..b694175891f 100644 --- a/sys/arch/vax/vax/ibus.c +++ b/sys/arch/vax/vax/ibus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ibus.c,v 1.4 2001/08/25 13:33:37 hugh Exp $ */ +/* $OpenBSD: ibus.c,v 1.5 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: ibus.c,v 1.7 2001/02/04 20:36:32 ragge Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. @@ -41,7 +41,7 @@ static int ibus_print(void *, const char *); static int ibus_match(struct device *, struct cfdata *, void *); -static void ibus_attach(struct device *, struct device *, void*); +static void ibus_attach(struct device *, struct device *, void *); struct cfdriver ibus_cd = { NULL, "ibus", DV_DULL diff --git a/sys/arch/vax/vax/ka43.c b/sys/arch/vax/vax/ka43.c index 9c57da6bda2..f31f79a88b9 100644 --- a/sys/arch/vax/vax/ka43.c +++ b/sys/arch/vax/vax/ka43.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka43.c,v 1.8 2002/03/14 01:26:48 millert Exp $ */ +/* $OpenBSD: ka43.c,v 1.9 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: ka43.c,v 1.19 1999/09/06 19:52:53 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -89,9 +89,9 @@ struct cpu_dep ka43_calls = { * enabled. Thus we initialize these four pointers with physical addresses, * but before leving ka43_steal_pages() we reset them to virtual addresses. */ -static volatile struct ka43_cpu *ka43_cpu = (void*)KA43_CPU_BASE; -static volatile u_int *ka43_creg = (void*)KA43_CH2_CREG; -static volatile u_int *ka43_ctag = (void*)KA43_CT2_BASE; +static volatile struct ka43_cpu *ka43_cpu = (void *)KA43_CPU_BASE; +static volatile u_int *ka43_creg = (void *)KA43_CH2_CREG; +static volatile u_int *ka43_ctag = (void *)KA43_CT2_BASE; #define KA43_MC_RESTART 0x00008000 /* Restart possible*/ #define KA43_PSL_FPDONE 0x00010000 /* First Part Done */ @@ -138,7 +138,7 @@ int ka43_mchk(addr) caddr_t addr; { - register struct ka43_mcframe *mcf = (void*)addr; + register struct ka43_mcframe *mcf = (void *)addr; mtpr(0x00, PR_MCESR); /* Acknowledge the machine check */ printf("machine check %d (0x%x)\n", mcf->mc43_code, mcf->mc43_code); @@ -276,7 +276,7 @@ ka43_cache_invalidate() int ka43_cache_enable() { - volatile char *membase = (void*)0x80000000; /* physical 0x00 */ + volatile char *membase = (void *)0x80000000; /* physical 0x00 */ int i, val; val = KA43_PCS_FLUSH | KA43_PCS_REFRESH; diff --git a/sys/arch/vax/vax/ka670.c b/sys/arch/vax/vax/ka670.c index 69d08c9a4e5..9e73780932b 100644 --- a/sys/arch/vax/vax/ka670.c +++ b/sys/arch/vax/vax/ka670.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka670.c,v 1.4 2002/03/14 01:26:48 millert Exp $ */ +/* $OpenBSD: ka670.c,v 1.5 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: ka670.c,v 1.4 2000/03/13 23:52:35 soren Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. @@ -125,7 +125,7 @@ int ka670_mchk(addr) caddr_t addr; { - register struct ka670_mcframe *mcf = (void*)addr; + register struct ka670_mcframe *mcf = (void *)addr; mtpr(0x00, PR_MCESR); /* Acknowledge the machine check */ printf("machine check %d (0x%x)\n", mcf->mc670_code, mcf->mc670_code); diff --git a/sys/arch/vax/vax/ka780.c b/sys/arch/vax/vax/ka780.c index 346ca3b23a7..335bd359e11 100644 --- a/sys/arch/vax/vax/ka780.c +++ b/sys/arch/vax/vax/ka780.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka780.c,v 1.7 2002/03/14 01:26:48 millert Exp $ */ +/* $OpenBSD: ka780.c,v 1.8 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: ka780.c,v 1.14 1999/08/07 10:36:49 ragge Exp $ */ /*- * Copyright (c) 1982, 1986, 1988 The Regents of the University of California. @@ -52,7 +52,7 @@ static void ka780_memerr(void); static int ka780_mchk(caddr_t); static void ka780_conf(void); static int mem_sbi_match(struct device *, struct cfdata *, void *); -static void mem_sbi_attach(struct device *, struct device *, void*); +static void mem_sbi_attach(struct device *, struct device *, void *); struct cfattach mem_sbi_ca = { sizeof(struct mem_softc), mem_sbi_match, mem_sbi_attach diff --git a/sys/arch/vax/vax/ka820.c b/sys/arch/vax/vax/ka820.c index d1a994ef821..334450f1849 100644 --- a/sys/arch/vax/vax/ka820.c +++ b/sys/arch/vax/vax/ka820.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka820.c,v 1.8 2002/03/14 01:26:48 millert Exp $ */ +/* $OpenBSD: ka820.c,v 1.9 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: ka820.c,v 1.22 2000/06/04 02:19:27 matt Exp $ */ /* * Copyright (c) 1988 Regents of the University of California. @@ -69,7 +69,7 @@ struct rx50device *rx50device_ptr; static volatile struct ka820clock *ka820_clkpage; static int ka820_match(struct device *, struct cfdata *, void *); -static void ka820_attach(struct device *, struct device *, void*); +static void ka820_attach(struct device *, struct device *, void *); static void ka820_memerr(void); static void ka820_conf(void); static int ka820_mchk(caddr_t); @@ -228,7 +228,7 @@ struct ms820regs { #define MS2_SYN 0x0000007f /* error syndrome (ro, rw diag) */ static int ms820_match(struct device *, struct cfdata *, void *); -static void ms820_attach(struct device *, struct device *, void*); +static void ms820_attach(struct device *, struct device *, void *); struct mem_bi_softc { struct device sc_dev; diff --git a/sys/arch/vax/vax/ka860.c b/sys/arch/vax/vax/ka860.c index ab6349893dc..bc6343c1401 100644 --- a/sys/arch/vax/vax/ka860.c +++ b/sys/arch/vax/vax/ka860.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ka860.c,v 1.6 2002/03/14 01:26:48 millert Exp $ */ +/* $OpenBSD: ka860.c,v 1.7 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: ka860.c,v 1.15 1999/08/07 10:36:49 ragge Exp $ */ /* * Copyright (c) 1986, 1988 Regents of the University of California. @@ -339,7 +339,7 @@ ka86_reboot(howto) static int abus_print(void *, const char *); static int abus_match(struct device *, struct cfdata *, void *); -static void abus_attach(struct device *, struct device *, void*); +static void abus_attach(struct device *, struct device *, void *); struct cfattach abus_ca = { sizeof(struct device), abus_match, abus_attach diff --git a/sys/arch/vax/vax/sbi.c b/sys/arch/vax/vax/sbi.c index 9e8a487e58c..725c2fda9b8 100644 --- a/sys/arch/vax/vax/sbi.c +++ b/sys/arch/vax/vax/sbi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbi.c,v 1.9 2002/03/14 01:26:49 millert Exp $ */ +/* $OpenBSD: sbi.c,v 1.10 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: sbi.c,v 1.20 1999/08/07 10:36:50 ragge Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden. @@ -45,7 +45,7 @@ static int sbi_print(void *, const char *); static int sbi_match(struct device *, struct cfdata *, void *); -static void sbi_attach(struct device *, struct device *, void*); +static void sbi_attach(struct device *, struct device *, void *); int sbi_print(aux, name) @@ -106,7 +106,7 @@ sbi_attach(parent, self, aux) sa.nexnum = nexnum; sa.nexaddr = nexusP; - config_found(self, (void*)&sa, sbi_print); + config_found(self, (void *)&sa, sbi_print); } } } diff --git a/sys/arch/vax/vax/trap.c b/sys/arch/vax/vax/trap.c index 4755e6f168b..25dec04a9ee 100644 --- a/sys/arch/vax/vax/trap.c +++ b/sys/arch/vax/vax/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.21 2002/03/14 01:26:49 millert Exp $ */ +/* $OpenBSD: trap.c,v 1.22 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: trap.c,v 1.47 1999/08/21 19:26:20 matt Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden. @@ -382,7 +382,7 @@ if(startsysc)printf("trap syscall %s pc %lx, psl %lx, sp %lx, pid %d, frame %p\n rval[0] = 0; rval[1] = frame->r1; if(callp->sy_narg) { - err = copyin((char*)frame->ap + 4, args, callp->sy_argsize); + err = copyin((char *)frame->ap + 4, args, callp->sy_argsize); if (err) { #ifdef KTRACE if (KTRPOINT(p, KTR_SYSCALL)) diff --git a/sys/arch/vax/vsa/dc.c b/sys/arch/vax/vsa/dc.c index 5904be8291c..8f33e5a7da2 100644 --- a/sys/arch/vax/vsa/dc.c +++ b/sys/arch/vax/vsa/dc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dc.c,v 1.7 2002/03/14 01:26:49 millert Exp $ */ +/* $OpenBSD: dc.c,v 1.8 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: dc.c,v 1.4 1996/10/13 03:36:10 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -252,7 +252,7 @@ dcattach(parent, self, aux) u_long dcaddr; dcaddr = (u_long)ca->ca_ioaddr; - (void) dc_doprobe((void*)uvax_phys2virt(dcaddr), + (void) dc_doprobe((void *)uvax_phys2virt(dcaddr), self->dv_unit, self->dv_cfdata->cf_flags, ca->ca_intslot); diff --git a/sys/arch/vax/vsa/dz_ibus.c b/sys/arch/vax/vsa/dz_ibus.c index 34dbf058c43..9b8d9cce23f 100644 --- a/sys/arch/vax/vsa/dz_ibus.c +++ b/sys/arch/vax/vsa/dz_ibus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dz_ibus.c,v 1.10 2002/03/14 01:26:49 millert Exp $ */ +/* $OpenBSD: dz_ibus.c,v 1.11 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: dz_ibus.c,v 1.15 1999/08/27 17:50:42 ragge Exp $ */ /* * Copyright (c) 1998 Ludd, University of Lule}, Sweden. @@ -286,7 +286,7 @@ void dzcninit(cndev) struct consdev *cndev; { - dz = (void*)dz_regs; + dz = (void *)dz_regs; dz->csr = 0; /* Disable scanning until initting is done */ dz->tcr = (1 << minor(cndev->cn_dev)); /* Turn on xmitter */ diff --git a/sys/arch/vax/vsa/hdc9224.c b/sys/arch/vax/vsa/hdc9224.c index 0cc15e94874..1fbbaf07a6c 100644 --- a/sys/arch/vax/vsa/hdc9224.c +++ b/sys/arch/vax/vsa/hdc9224.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hdc9224.c,v 1.7 2002/03/14 01:26:49 millert Exp $ */ +/* $OpenBSD: hdc9224.c,v 1.8 2002/03/14 03:16:02 millert Exp $ */ /* $NetBSD: hdc9224.c,v 1.6 1997/03/15 16:32:22 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -276,7 +276,7 @@ hdcattach(parent, self, aux) struct device *parent, *self; void *aux; { - struct hdcsoftc *sc = (void*)self; + struct hdcsoftc *sc = (void *)self; struct confargs *ca = aux; struct hdc_attach_args ha; @@ -289,7 +289,7 @@ hdcattach(parent, self, aux) sc->sc_cfargs = ca; sc->sc_ioaddr = ca->ca_ioaddr; - sc->sc_dkc = (void*)uvax_phys2virt(sc->sc_ioaddr); + sc->sc_dkc = (void *)uvax_phys2virt(sc->sc_ioaddr); sc->sc_ibit = ca->ca_intbit; sc->sc_ivec = ca->ca_intvec; sc->sc_status = 0; @@ -297,8 +297,8 @@ hdcattach(parent, self, aux) sc->sc_flags = 0; sc->sc_errors = 0; - sc->sc_dkc = (void*)uvax_phys2virt(KA410_DKC_BASE); - sc->sc_dmabase = (void*)uvax_phys2virt(KA410_DMA_BASE); + sc->sc_dkc = (void *)uvax_phys2virt(KA410_DKC_BASE); + sc->sc_dmabase = (void *)uvax_phys2virt(KA410_DMA_BASE); sc->sc_dmasize = KA410_DMA_SIZE; if (hdc_reset(sc) != 0) { @@ -311,7 +311,7 @@ hdcattach(parent, self, aux) * now probe for all possible disks */ for (ha.ha_drive=0; ha.ha_drive<3; ha.ha_drive++) - (void)config_found(self, (void*)&ha, hdprint); + (void)config_found(self, (void *)&ha, hdprint); #ifdef notyet /* @@ -330,7 +330,7 @@ hdmatch(parent, match, aux) struct device *parent; void *match, *aux; { - struct hdcsoftc *hdc = (void*)parent; + struct hdcsoftc *hdc = (void *)parent; struct cfdata *cf = match; struct hdc_attach_args *ha = aux; int drive = ha->ha_drive; @@ -365,8 +365,8 @@ hdattach(parent, self, aux) struct device *parent, *self; void *aux; { - struct hdcsoftc *hdc = (void*)parent; - struct hdsoftc *hd = (void*)self; + struct hdcsoftc *hdc = (void *)parent; + struct hdsoftc *hd = (void *)self; struct hdc_attach_args *ha = aux; struct hdparams *hp = &hd->sc_param; @@ -626,7 +626,7 @@ hdc_mid2str(media_id, name) u_long a0:5; /* 'R' encoded with base '@' */ u_long d1:5; /* 'U' encoded with base '@' */ u_long d0:5; /* 'D' encoded with base '@' */ - } *p = (void*)&media_id; + } *p = (void *)&media_id; #define MIDCHR(x) (x ? x + '@' : ' ') @@ -688,7 +688,7 @@ hdc_getlabel(hdc, hd, unit) int unit; { struct disklabel *lp = hd->sc_dk.dk_label; - struct disklabel *xp = (void*)(hdc_iobuf + 64); + struct disklabel *xp = (void *)(hdc_iobuf + 64); int res; trace(("hdc_getlabel(%d)\n", unit)); @@ -935,7 +935,7 @@ hdc_readregs(sc) trace(("hdc_readregs()\n")); sc->sc_dkc->dkc_cmd = 0x40; /* set internal counter to zero */ - p = (void*)&sc->sc_sreg; + p = (void *)&sc->sc_sreg; for (i=0; i<10; i++) *p++ = sc->sc_dkc->dkc_reg; /* dkc_reg auto-increments */ } @@ -950,7 +950,7 @@ hdc_writeregs(sc) trace(("hdc_writeregs()\n")); sc->sc_dkc->dkc_cmd = 0x40; /* set internal counter to zero */ - p = (void*)&sc->sc_creg; + p = (void *)&sc->sc_creg; for (i=0; i<10; i++) sc->sc_dkc->dkc_reg = *p++; /* dkc_reg auto-increments */ } @@ -964,9 +964,9 @@ hdc_command(sc, cmd) struct hdcsoftc *sc; int cmd; { - volatile u_char *intreq = (void*)uvax_phys2virt(KA410_INTREQ); - volatile u_char *intclr = (void*)uvax_phys2virt(KA410_INTCLR); - volatile u_char *intmsk = (void*)uvax_phys2virt(KA410_INTMSK); + volatile u_char *intreq = (void *)uvax_phys2virt(KA410_INTREQ); + volatile u_char *intclr = (void *)uvax_phys2virt(KA410_INTCLR); + volatile u_char *intmsk = (void *)uvax_phys2virt(KA410_INTMSK); int i, c; trace (("hdc_command(%x)\n", cmd)); diff --git a/sys/arch/vax/vsa/lk201.c b/sys/arch/vax/vsa/lk201.c index c57dc8e9d09..3413416ee00 100644 --- a/sys/arch/vax/vsa/lk201.c +++ b/sys/arch/vax/vsa/lk201.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lk201.c,v 1.4 2002/03/14 01:26:49 millert Exp $ */ +/* $OpenBSD: lk201.c,v 1.5 2002/03/14 03:16:02 millert Exp $ */ /* * The LK201 keycode mapping routine is here, along with initialization @@ -19,7 +19,7 @@ /* Exported functions */ extern int kbdMapChar(int keycode); -extern void KBDReset __P(( dev_t dev, void (*putc) (dev_t, int) )); +extern void KBDReset(dev_t dev, void (*putc)(dev_t, int)); /* * Keyboard to Ascii, unshifted. diff --git a/sys/compat/common/compat_dir.h b/sys/compat/common/compat_dir.h index d070d578138..1fb3baba9c9 100644 --- a/sys/compat/common/compat_dir.h +++ b/sys/compat/common/compat_dir.h @@ -1,4 +1,4 @@ -/* $OpenBSD: compat_dir.h,v 1.1 2001/01/23 05:48:04 csapuntz Exp $ */ +/* $OpenBSD: compat_dir.h,v 1.2 2002/03/14 03:16:02 millert Exp $ */ /* * Copyright (c) 2000 Constantine Sapuntzakis @@ -27,7 +27,7 @@ #ifdef _KERNEL -int readdir_with_callback __P((struct file *, off_t *, u_long, - int (*append_func) (void *, struct dirent *, off_t), void *)); +int readdir_with_callback(struct file *, off_t *, u_long, + int (*append_func) (void *, struct dirent *, off_t), void *); #endif diff --git a/sys/compat/ibcs2/ibcs2_misc.c b/sys/compat/ibcs2/ibcs2_misc.c index 3b3137ba2c2..70462e15189 100644 --- a/sys/compat/ibcs2/ibcs2_misc.c +++ b/sys/compat/ibcs2/ibcs2_misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ibcs2_misc.c,v 1.22 2002/03/14 01:26:50 millert Exp $ */ +/* $OpenBSD: ibcs2_misc.c,v 1.23 2002/03/14 03:16:03 millert Exp $ */ /* $NetBSD: ibcs2_misc.c,v 1.23 1997/01/15 01:37:49 perry Exp $ */ /* @@ -1145,7 +1145,7 @@ xenix_sys_rdchk(p, v, retval) SCARG(&sa, data) = stackgap_alloc(&sg, sizeof(int)); if ((error = sys_ioctl(p, &sa, retval)) != 0) return error; - *retval = (*((int*)SCARG(&sa, data))) ? 1 : 0; + *retval = (*((int *)SCARG(&sa, data))) ? 1 : 0; return 0; } diff --git a/sys/compat/ibcs2/syscalls.master b/sys/compat/ibcs2/syscalls.master index 70ca3f47c9f..35b75efbe68 100644 --- a/sys/compat/ibcs2/syscalls.master +++ b/sys/compat/ibcs2/syscalls.master @@ -1,4 +1,4 @@ - $OpenBSD: syscalls.master,v 1.7 1999/06/07 07:17:47 deraadt Exp $ + $OpenBSD: syscalls.master,v 1.8 2002/03/14 03:16:03 millert Exp $ ; $NetBSD: syscalls.master,v 1.10 1996/09/07 14:21:59 mycroft Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -58,11 +58,11 @@ 11 STD { int ibcs2_sys_execv(char *path, char **argp); } 12 STD { int ibcs2_sys_chdir(char *path); } 13 STD { int ibcs2_sys_time(ibcs2_time_t *tp); } -14 STD { int ibcs2_sys_mknod(char* path, int mode, int dev); } +14 STD { int ibcs2_sys_mknod(char *path, int mode, int dev); } 15 STD { int ibcs2_sys_chmod(char *path, int mode); } 16 STD { int ibcs2_sys_chown(char *path, int uid, int gid); } 17 NOARGS { int sys_obreak(caddr_t nsize); } -18 STD { int ibcs2_sys_stat(char* path, \ +18 STD { int ibcs2_sys_stat(char *path, \ struct ibcs2_stat *st); } 19 NOARGS { long compat_43_sys_lseek(int fd, long offset, \ int whence); } diff --git a/sys/compat/svr4/syscalls.master b/sys/compat/svr4/syscalls.master index 4eb37afb183..f2eaa6f6fc3 100644 --- a/sys/compat/svr4/syscalls.master +++ b/sys/compat/svr4/syscalls.master @@ -1,4 +1,4 @@ - $OpenBSD: syscalls.master,v 1.30 2000/08/23 19:31:35 fgsch Exp $ + $OpenBSD: syscalls.master,v 1.31 2002/03/14 03:16:03 millert Exp $ ; $NetBSD: syscalls.master,v 1.17 1996/02/10 17:12:51 christos Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -60,11 +60,11 @@ 11 STD { int svr4_sys_execv(char *path, char **argp); } 12 NOARGS { int sys_chdir(char *path); } 13 STD { int svr4_sys_time(svr4_time_t *t); } -14 STD { int svr4_sys_mknod(char* path, int mode, int dev); } +14 STD { int svr4_sys_mknod(char *path, int mode, int dev); } 15 NOARGS { int sys_chmod(char *path, int mode); } 16 NOARGS { int sys_chown(char *path, int uid, int gid); } 17 STD { int svr4_sys_break(caddr_t nsize); } -18 STD { int svr4_sys_stat(char* path, struct svr4_stat* ub); } +18 STD { int svr4_sys_stat(char *path, struct svr4_stat* ub); } 19 NOARGS { long compat_43_sys_lseek(int fd, long offset, \ int whence); } 20 NOARGS { pid_t sys_getpid(void); } diff --git a/sys/compat/ultrix/ultrix_fs.c b/sys/compat/ultrix/ultrix_fs.c index 1c36b2910ef..a088fedf7f0 100644 --- a/sys/compat/ultrix/ultrix_fs.c +++ b/sys/compat/ultrix/ultrix_fs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ultrix_fs.c,v 1.6 2001/11/06 19:53:18 miod Exp $ */ +/* $OpenBSD: ultrix_fs.c,v 1.7 2002/03/14 03:16:03 millert Exp $ */ /* $NetBSD: ultrix_fs.c,v 1.4 1996/04/07 17:23:06 jonathan Exp $ */ /* @@ -237,12 +237,12 @@ ultrix_sys_getmnt(p, v, retval) sizeof(*SCARG(uap, start)))) != 0) goto bad; for (skip = start, mp = mountlist.cqh_first; - mp != (void*)&mountlist && skip-- > 0; mp = nmp) + mp != (void *)&mountlist && skip-- > 0; mp = nmp) nmp = mp->mnt_list.cqe_next; } for (count = 0, mp = mountlist.cqh_first; - mp != (void*)&mountlist && count < maxcount; mp = nmp) { + mp != (void *)&mountlist && count < maxcount; mp = nmp) { nmp = mp->mnt_list.cqe_next; if (sfsp != NULL && (mp->mnt_flag & MNT_MLOCK) == 0) { struct ultrix_fs_data tem; @@ -390,7 +390,7 @@ ultrix_sys_mount(p, v, retval) */ fsname[0] = 0; if ((error = copyinstr((caddr_t)SCARG(&nuap, path), fsname, - sizeof fsname, (u_int*)0)) != 0) + sizeof fsname, (u_int *)0)) != 0) return(error); if (strcmp(fsname, "/") == 0) { SCARG(&nuap, flags) |= MNT_UPDATE; diff --git a/sys/compat/ultrix/ultrix_misc.c b/sys/compat/ultrix/ultrix_misc.c index 8baba7f1d91..7860af1e99e 100644 --- a/sys/compat/ultrix/ultrix_misc.c +++ b/sys/compat/ultrix/ultrix_misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ultrix_misc.c,v 1.24 2002/03/14 01:26:51 millert Exp $ */ +/* $OpenBSD: ultrix_misc.c,v 1.25 2002/03/14 03:16:03 millert Exp $ */ /* $NetBSD: ultrix_misc.c,v 1.23 1996/04/07 17:23:04 jonathan Exp $ */ /* @@ -279,7 +279,7 @@ ultrix_sys_select(p, v, retval) #endif } - error = sys_select(p, (void*) uap, retval); + error = sys_select(p, (void *) uap, retval); if (error == EINVAL) printf("ultrix select: bad args?\n"); diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c index 6a51b3298e5..24520db7716 100644 --- a/sys/ddb/db_command.c +++ b/sys/ddb/db_command.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_command.c,v 1.27 2002/03/14 01:26:51 millert Exp $ */ +/* $OpenBSD: db_command.c,v 1.28 2002/03/14 03:16:03 millert Exp $ */ /* $NetBSD: db_command.c,v 1.20 1996/03/30 22:30:05 christos Exp $ */ /* @@ -302,7 +302,7 @@ db_malloc_print_cmd(addr, have_addr, count, modif) char * modif; { #if defined(MALLOC_DEBUG) - extern void debug_malloc_printit __P((int (*)(const char *, ...), vaddr_t)); + extern void debug_malloc_printit(int (*)(const char *, ...), vaddr_t); if (!have_addr) addr = 0; diff --git a/sys/ddb/db_elf.c b/sys/ddb/db_elf.c index a280085b568..bcdc8dc0aa0 100644 --- a/sys/ddb/db_elf.c +++ b/sys/ddb/db_elf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_elf.c,v 1.4 2002/03/14 01:26:51 millert Exp $ */ +/* $OpenBSD: db_elf.c,v 1.5 2002/03/14 03:16:03 millert Exp $ */ /* $NetBSD: db_elf.c,v 1.13 2000/07/07 21:55:18 jhawk Exp $ */ /*- @@ -156,7 +156,7 @@ db_elf_sym_init(symsize, symtab, esymtab, name) * stabs data found when booting bsd.gdb. */ shp = (Elf_Shdr *)((char *)symtab + elf->e_shoff); - shstrtab = (char*)symtab + shp[elf->e_shstrndx].sh_offset; + shstrtab = (char *)symtab + shp[elf->e_shstrndx].sh_offset; for (i = 0; i < elf->e_shnum; i++) { if (strcmp(".strtab", shstrtab+shp[i].sh_name) == 0) { strtab_start = (char *)symtab + shp[i].sh_offset; @@ -216,10 +216,10 @@ db_elf_find_strtab(stab) char *shstrtab; int i; - shstrtab = (char*)elf + shp[elf->e_shstrndx].sh_offset; + shstrtab = (char *)elf + shp[elf->e_shstrndx].sh_offset; for (i = 0; i < elf->e_shnum; i++) { if (strcmp(".strtab", shstrtab+shp[i].sh_name) == 0) - return ((char*)elf + shp[i].sh_offset); + return ((char *)elf + shp[i].sh_offset); } return (NULL); diff --git a/sys/dev/ata/atavar.h b/sys/dev/ata/atavar.h index b8118fb74b2..11ca5fffe51 100644 --- a/sys/dev/ata/atavar.h +++ b/sys/dev/ata/atavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: atavar.h,v 1.10 2002/03/14 01:26:52 millert Exp $ */ +/* $OpenBSD: atavar.h,v 1.11 2002/03/14 03:16:03 millert Exp $ */ /* $NetBSD: atavar.h,v 1.13 1999/03/10 13:11:43 bouyer Exp $ */ /* @@ -153,7 +153,7 @@ struct wdc_command { int timeout; /* timeout (in ms) */ void *data; /* Data buffer address */ int bcount; /* number of bytes to transfer */ - void (*callback)(void*); /* command to call once command completed */ + void (*callback)(void *); /* command to call once command completed */ void *callback_arg; /* argument passed to *callback() */ }; diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c index b19f452878e..de9cc14526e 100644 --- a/sys/dev/ata/wd.c +++ b/sys/dev/ata/wd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wd.c,v 1.22 2002/03/14 01:26:52 millert Exp $ */ +/* $OpenBSD: wd.c,v 1.23 2002/03/14 03:16:03 millert Exp $ */ /* $NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */ /* @@ -201,10 +201,10 @@ void wdgetdisklabel(dev_t dev, struct wd_softc *, void wdstrategy(struct buf *); void wdstart(void *); void __wdstart(struct wd_softc*, struct buf *); -void wdrestart(void*); +void wdrestart(void *); int wd_get_params(struct wd_softc *, u_int8_t, struct ataparams *); void wd_flushcache(struct wd_softc *, int); -void wd_shutdown(void*); +void wd_shutdown(void *); struct dkdriver wddkdriver = { wdstrategy }; diff --git a/sys/dev/ata/wdvar.h b/sys/dev/ata/wdvar.h index 79457d98210..15cae9a3e37 100644 --- a/sys/dev/ata/wdvar.h +++ b/sys/dev/ata/wdvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wdvar.h,v 1.4 2002/03/14 01:26:52 millert Exp $ */ +/* $OpenBSD: wdvar.h,v 1.5 2002/03/14 03:16:04 millert Exp $ */ /* $NetBSD: wdvar.h,v 1.3 1998/11/11 19:38:27 bouyer Exp $ */ /* @@ -51,7 +51,7 @@ struct ata_bio { daddr_t nblks; /* number of block currently transfering */ int nbytes; /* number of bytes currently transfering */ long bcount; /* total number of bytes */ - char* databuf; /* data buffer adress */ + char *databuf; /* data buffer adress */ volatile int error; #define NOERROR 0 /* There was no error (r_error invalid) */ #define ERROR 1 /* check r_error */ diff --git a/sys/dev/audio_if.h b/sys/dev/audio_if.h index 96cc3708c85..9d1be342480 100644 --- a/sys/dev/audio_if.h +++ b/sys/dev/audio_if.h @@ -1,4 +1,4 @@ -/* $OpenBSD: audio_if.h,v 1.15 2002/03/14 01:26:52 millert Exp $ */ +/* $OpenBSD: audio_if.h,v 1.16 2002/03/14 03:16:03 millert Exp $ */ /* $NetBSD: audio_if.h,v 1.24 1998/01/10 14:07:25 tv Exp $ */ /* @@ -91,10 +91,8 @@ struct audio_hw_if { /* Start input/output routines. These usually control DMA. */ int (*init_output)(void *, void *, int); int (*init_input)(void *, void *, int); - int (*start_output)__P((void *, void *, int, - void (*)(void *), void *)); - int (*start_input)__P((void *, void *, int, - void (*)(void *), void *)); + int (*start_output)(void *, void *, int, void (*)(void *), void *); + int (*start_input)(void *, void *, int, void (*)(void *), void *); int (*halt_output)(void *); int (*halt_input)(void *); @@ -121,10 +119,10 @@ struct audio_hw_if { int (*get_props)(void *); /* device properties */ - int (*trigger_output)__P((void *, void *, void *, int, - void (*)(void *), void *, struct audio_params *)); - int (*trigger_input)__P((void *, void *, void *, int, - void (*)(void *), void *, struct audio_params *)); + int (*trigger_output)(void *, void *, void *, int, + void (*)(void *), void *, struct audio_params *); + int (*trigger_input)(void *, void *, void *, int, + void (*)(void *), void *, struct audio_params *); }; struct audio_attach_args { diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index b8bc427c5bf..81e40c95588 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cardbus.c,v 1.5 2002/03/14 01:26:52 millert Exp $ */ +/* $OpenBSD: cardbus.c,v 1.6 2002/03/14 03:16:04 millert Exp $ */ /* $NetBSD: cardbus.c,v 1.24 2000/04/02 19:11:37 mycroft Exp $ */ /* @@ -70,11 +70,11 @@ STATIC int cardbusmatch(struct device *, void *, void *); static int cardbussubmatch(struct device *, void *, void *); static int cardbusprint(void *, const char *); -typedef void (*tuple_decode_func)(u_int8_t*, int, void*); +typedef void (*tuple_decode_func)(u_int8_t*, int, void *); -static int decode_tuples(u_int8_t *, int, tuple_decode_func, void*); +static int decode_tuples(u_int8_t *, int, tuple_decode_func, void *); #ifdef CARDBUS_DEBUG -static void print_tuple(u_int8_t*, int, void*); +static void print_tuple(u_int8_t*, int, void *); #endif static int cardbus_read_tuples(struct cardbus_attach_args *, diff --git a/sys/dev/cardbus/cardbusvar.h b/sys/dev/cardbus/cardbusvar.h index 22d4df77f3e..b2362ccbe59 100644 --- a/sys/dev/cardbus/cardbusvar.h +++ b/sys/dev/cardbus/cardbusvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cardbusvar.h,v 1.5 2002/03/14 01:26:52 millert Exp $ */ +/* $OpenBSD: cardbusvar.h,v 1.6 2002/03/14 03:16:04 millert Exp $ */ /* $NetBSD: cardbusvar.h,v 1.17 2000/04/02 19:11:37 mycroft Exp $ */ /* @@ -191,7 +191,7 @@ typedef struct cardbus_functions { bus_space_handle_t *bshp); int (*cardbus_space_free)(cardbus_chipset_tag_t, rbus_tag_t, bus_space_handle_t, bus_size_t); - void *(*cardbus_intr_establish) __P((cardbus_chipset_tag_t, int irq, int level, int (*ih)(void *), void *sc)); + void *(*cardbus_intr_establish)(cardbus_chipset_tag_t, int irq, int level, int (*ih)(void *), void *sc); void (*cardbus_intr_disestablish)(cardbus_chipset_tag_t ct, void *ih); int (*cardbus_ctrl)(cardbus_chipset_tag_t, int); int (*cardbus_power)(cardbus_chipset_tag_t, int); @@ -211,7 +211,7 @@ typedef struct cardbus_functions { int (*cardbus_mem_close)(cardbus_chipset_tag_t, int); int (*cardbus_io_open)(cardbus_chipset_tag_t, int, u_int32_t, u_int32_t); int (*cardbus_io_close)(cardbus_chipset_tag_t, int); - void *(*cardbus_intr_establish) __P((cardbus_chipset_tag_t, int irq, int level, int (*ih)(void *), void *sc)); + void *(*cardbus_intr_establish)(cardbus_chipset_tag_t, int irq, int level, int (*ih)(void *), void *sc); void (*cardbus_intr_disestablish)(cardbus_chipset_tag_t ct, void *ih); cardbustag_t (*cardbus_make_tag)(cardbus_chipset_tag_t, int, int, int); cardbusreg_t (*cardbus_conf_read)(cardbus_chipset_tag_t, cardbustag_t, int); @@ -322,7 +322,7 @@ struct cardbus_cis_info { int32_t manufacturer; int32_t product; char cis1_info_buf[256]; - char* cis1_info[4]; + char *cis1_info[4]; struct cb_bar_info { unsigned int flags; unsigned int size; @@ -413,7 +413,7 @@ struct cardbus_attach_args { int cardbus_attach_card(struct cardbus_softc *); void cardbus_detach_card(struct cardbus_softc *); -void *cardbus_intr_establish __P((cardbus_chipset_tag_t, cardbus_function_tag_t, cardbus_intr_handle_t irq, int level, int (*func) (void *), void *arg)); +void *cardbus_intr_establish(cardbus_chipset_tag_t, cardbus_function_tag_t, cardbus_intr_handle_t irq, int level, int (*func) (void *), void *arg); void cardbus_intr_disestablish(cardbus_chipset_tag_t, cardbus_function_tag_t, void *handler); int cardbus_mapreg_map(struct cardbus_softc *, int, int, cardbusreg_t, diff --git a/sys/dev/ic/bha.c b/sys/dev/ic/bha.c index f3a817400e8..276764893d2 100644 --- a/sys/dev/ic/bha.c +++ b/sys/dev/ic/bha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bha.c,v 1.2 2002/03/14 01:26:54 millert Exp $ */ +/* $OpenBSD: bha.c,v 1.3 2002/03/14 03:16:04 millert Exp $ */ /* $NetBSD: bha.c,v 1.27 1998/11/19 21:53:00 thorpej Exp $ */ #undef BHADEBUG @@ -1050,7 +1050,7 @@ bha_disable_isacompat(sc) isa_disable.cmd.opcode = BHA_MODIFY_IOPORT; isa_disable.cmd.modifier = BHA_IOMODIFY_DISABLE1; bha_cmd(sc->sc_iot, sc->sc_ioh, sc, - sizeof(isa_disable.cmd), (u_char*)&isa_disable.cmd, + sizeof(isa_disable.cmd), (u_char *)&isa_disable.cmd, 0, (u_char *)0); return (0); } diff --git a/sys/dev/ic/bt463.c b/sys/dev/ic/bt463.c index e42851afa45..1937d1e8703 100644 --- a/sys/dev/ic/bt463.c +++ b/sys/dev/ic/bt463.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bt463.c,v 1.6 2002/03/14 01:26:54 millert Exp $ */ +/* $OpenBSD: bt463.c,v 1.7 2002/03/14 03:16:04 millert Exp $ */ /* $NetBSD: bt463.c,v 1.2 2000/06/13 17:21:06 nathanw Exp $ */ /*- @@ -143,7 +143,7 @@ struct bt463data { * struct tga_devconfig * */ - int (*ramdac_sched_update) __P((void *, void (*)(void *))); + int (*ramdac_sched_update)(void *, void (*)(void *)); void (*ramdac_wr)(void *, u_int, u_int8_t); u_int8_t (*ramdac_rd)(void *, u_int); diff --git a/sys/dev/ic/bt463var.h b/sys/dev/ic/bt463var.h index 3e4cf1d80d6..60f7bfe6738 100644 --- a/sys/dev/ic/bt463var.h +++ b/sys/dev/ic/bt463var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bt463var.h,v 1.2 2001/04/21 20:03:54 aaron Exp $ */ +/* $OpenBSD: bt463var.h,v 1.3 2002/03/14 03:16:04 millert Exp $ */ /* $NetBSD: bt485var.h,v 1.1 2000/03/04 10:25:57 elric Exp $ */ /*- @@ -39,11 +39,11 @@ struct ramdac_funcs *bt463_funcs(void); -struct ramdac_cookie *bt463_register __P((void *, +struct ramdac_cookie *bt463_register(void *, int (*)(void *, void (*)(void *)), void (*)(void *, u_int, u_int8_t), - u_int8_t (*)(void *, u_int))); -void bt463_cninit __P((void *, + u_int8_t (*)(void *, u_int)); +void bt463_cninit(void *, int (*)(void *, void (*)(void *)), void (*)(void *, u_int, u_int8_t), - u_int8_t (*)(void *, u_int))); + u_int8_t (*)(void *, u_int)); diff --git a/sys/dev/ic/bt485.c b/sys/dev/ic/bt485.c index d1728a4ed3a..39d0b24a88d 100644 --- a/sys/dev/ic/bt485.c +++ b/sys/dev/ic/bt485.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bt485.c,v 1.8 2002/03/14 01:26:54 millert Exp $ */ +/* $OpenBSD: bt485.c,v 1.9 2002/03/14 03:16:04 millert Exp $ */ /* $NetBSD: bt485.c,v 1.2 2000/04/02 18:55:01 nathanw Exp $ */ /* @@ -95,7 +95,7 @@ struct bt485data { * struct tga_devconfig * */ - int (*ramdac_sched_update) __P((void *, void (*)(void *))); + int (*ramdac_sched_update)(void *, void (*)(void *)); void (*ramdac_wr)(void *, u_int, u_int8_t); u_int8_t (*ramdac_rd)(void *, u_int); diff --git a/sys/dev/ic/bt485var.h b/sys/dev/ic/bt485var.h index c79b78fd8de..644dce6fdc5 100644 --- a/sys/dev/ic/bt485var.h +++ b/sys/dev/ic/bt485var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bt485var.h,v 1.2 2001/04/21 20:03:55 aaron Exp $ */ +/* $OpenBSD: bt485var.h,v 1.3 2002/03/14 03:16:04 millert Exp $ */ /* $NetBSD$ */ /*- @@ -39,11 +39,11 @@ struct ramdac_funcs *bt485_funcs(void); -struct ramdac_cookie *bt485_register __P((void *, +struct ramdac_cookie *bt485_register(void *, int (*)(void *, void (*)(void *)), void (*)(void *, u_int, u_int8_t), - u_int8_t (*)(void *, u_int))); -void bt485_cninit __P((void *, + u_int8_t (*)(void *, u_int)); +void bt485_cninit(void *, int (*)(void *, void (*)(void *)), void (*)(void *, u_int, u_int8_t), - u_int8_t (*)(void *, u_int))); + u_int8_t (*)(void *, u_int)); diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c index d789ae76eab..bcbb91ec072 100644 --- a/sys/dev/ic/elink3.c +++ b/sys/dev/ic/elink3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: elink3.c,v 1.56 2002/03/14 01:26:54 millert Exp $ */ +/* $OpenBSD: elink3.c,v 1.57 2002/03/14 03:16:04 millert Exp $ */ /* $NetBSD: elink3.c,v 1.32 1997/05/14 00:22:00 thorpej Exp $ */ /* @@ -81,7 +81,7 @@ struct ep_media { int epm_eeprom_data; /* bitmask for eeprom config */ int epm_conn; /* sc->ep_connectors code for medium */ - char* epm_name; /* name of medium */ + char *epm_name; /* name of medium */ int epm_ifmedia; /* ifmedia word for medium */ int epm_ifdata; }; diff --git a/sys/dev/ic/i82596var.h b/sys/dev/ic/i82596var.h index 4ac0c007208..fc6b3a9e304 100644 --- a/sys/dev/ic/i82596var.h +++ b/sys/dev/ic/i82596var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i82596var.h,v 1.6 2002/03/14 01:26:54 millert Exp $ */ +/* $OpenBSD: i82596var.h,v 1.7 2002/03/14 03:16:04 millert Exp $ */ /* $NetBSD: i82586var.h,v 1.10 1998/08/15 04:42:42 mycroft Exp $ */ /*- @@ -285,7 +285,7 @@ int i82596_intr(void *); int i82596_probe(struct ie_softc *); int i82596_proberam(struct ie_softc *); void i82596_attach(struct ie_softc *, const char *, u_int8_t *, - int*, int, int); + int *, int, int); int i82596_start_cmd(struct ie_softc *, int, int, int, int); /* diff --git a/sys/dev/ic/mpuvar.h b/sys/dev/ic/mpuvar.h index adafa94bcfb..e3ebcc12cac 100644 --- a/sys/dev/ic/mpuvar.h +++ b/sys/dev/ic/mpuvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mpuvar.h,v 1.2 2002/03/14 01:26:55 millert Exp $ */ +/* $OpenBSD: mpuvar.h,v 1.3 2002/03/14 03:16:05 millert Exp $ */ /* $NetBSD: mpu401var.h,v 1.3 1998/11/25 22:17:06 augustss Exp $ */ /* @@ -42,7 +42,7 @@ struct mpu_softc { bus_space_handle_t ioh; /* handle */ int iobase; int open; - void (*intr)(void*, int); /* midi input intr handler */ + void (*intr)(void *, int); /* midi input intr handler */ void *arg; /* arg for intr() */ }; @@ -50,9 +50,9 @@ struct midi_hw_if mpu_midi_hw_if; int mpu_intr(void *); int mpu_find(void *); -int mpu_open __P((void *, int, - void (*iintr)(void *, int), - void (*ointr)(void *), void *arg)); +int mpu_open(void *, int, + void (*iintr)(void *, int), + void (*ointr)(void *), void *arg); void mpu_close(void *); int mpu_output(void *, int); void mpu_getinfo(void *addr, struct midi_info *mi); diff --git a/sys/dev/ic/ncr5380sbc.c b/sys/dev/ic/ncr5380sbc.c index ea8633a164c..fa4f4125ee1 100644 --- a/sys/dev/ic/ncr5380sbc.c +++ b/sys/dev/ic/ncr5380sbc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr5380sbc.c,v 1.14 2002/03/14 01:26:55 millert Exp $ */ +/* $OpenBSD: ncr5380sbc.c,v 1.15 2002/03/14 03:16:05 millert Exp $ */ /* $NetBSD: ncr5380sbc.c,v 1.13 1996/10/13 01:37:25 christos Exp $ */ /* @@ -2505,7 +2505,7 @@ void ncr5380_clear_trace() { ncr5380_traceidx = 0; - bzero((char*) ncr5380_tracebuf, sizeof(ncr5380_tracebuf)); + bzero((char *) ncr5380_tracebuf, sizeof(ncr5380_tracebuf)); } void diff --git a/sys/dev/ic/ramdac.h b/sys/dev/ic/ramdac.h index ea6398f7cd4..af17750c9c7 100644 --- a/sys/dev/ic/ramdac.h +++ b/sys/dev/ic/ramdac.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ramdac.h,v 1.3 2002/03/14 01:26:55 millert Exp $ */ +/* $OpenBSD: ramdac.h,v 1.4 2002/03/14 03:16:05 millert Exp $ */ /* $NetBSD: ramdac.h,v 1.1 2000/03/04 10:23:39 elric Exp $ */ /*- @@ -48,10 +48,10 @@ struct ramdac_cookie; struct ramdac_funcs { char *ramdac_name; - struct ramdac_cookie *(*ramdac_register) __P((void *, + struct ramdac_cookie *(*ramdac_register)(void *, int (*)(void *, void (*)(void *)), void (*)(void *, u_int, u_int8_t), - u_int8_t (*)(void *, u_int))); + u_int8_t (*)(void *, u_int)); void (*ramdac_init)(struct ramdac_cookie *); int (*ramdac_set_cmap)(struct ramdac_cookie *, diff --git a/sys/dev/ic/rln.c b/sys/dev/ic/rln.c index b5e6e463cba..1d138bf7d5e 100644 --- a/sys/dev/ic/rln.c +++ b/sys/dev/ic/rln.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rln.c,v 1.14 2002/03/14 01:26:55 millert Exp $ */ +/* $OpenBSD: rln.c,v 1.15 2002/03/14 03:16:05 millert Exp $ */ /* * David Leonard <d@openbsd.org>, 1999. Public Domain. * @@ -960,7 +960,7 @@ rln_sendinit(sc) struct rln_mm_cmd response; #endif - bzero((char*)&init + sizeof init.mm_cmd, + bzero((char *)&init + sizeof init.mm_cmd, sizeof init - sizeof init.mm_cmd); dprintf(" [setting parameters]"); diff --git a/sys/dev/ic/rlnvar.h b/sys/dev/ic/rlnvar.h index 265a76f6e59..ae09985a1b5 100644 --- a/sys/dev/ic/rlnvar.h +++ b/sys/dev/ic/rlnvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rlnvar.h,v 1.5 2002/03/14 01:26:55 millert Exp $ */ +/* $OpenBSD: rlnvar.h,v 1.6 2002/03/14 03:16:05 millert Exp $ */ /* * David Leonard <d@openbsd.org>, 1999. Public domain. * @@ -119,7 +119,7 @@ void rln_mbox_unlock(struct rln_softc *, u_int8_t, size_t); #define dprintf(fmt, args...) printf(fmt , ## args) /* log(LOG_DEBUG, fmt , ## args) */ #define dprinthex(buf, len) do { \ - unsigned char *_b = (unsigned char*)(buf); \ + unsigned char *_b = (unsigned char *)(buf); \ int _i, _l=(len); \ printf("{"); \ for(_i = 0; _i < _l; _i++) { \ diff --git a/sys/dev/ic/sti.c b/sys/dev/ic/sti.c index 32859cee1d4..5e33fccba4a 100644 --- a/sys/dev/ic/sti.c +++ b/sys/dev/ic/sti.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sti.c,v 1.13 2002/03/14 01:26:55 millert Exp $ */ +/* $OpenBSD: sti.c,v 1.14 2002/03/14 03:16:05 millert Exp $ */ /* * Copyright (c) 2000-2001 Michael Shalayeff @@ -83,8 +83,8 @@ paddr_t sti_mmap(void *v, off_t offset, int prot); int sti_alloc_screen(void *v, const struct wsscreen_descr *type, void **cookiep, int *cxp, int *cyp, long *defattr); void sti_free_screen(void *v, void *cookie); -int sti_show_screen __P((void *v, void *cookie, int waitok, - void (*cb)(void *, int, int), void *cbarg)); +int sti_show_screen(void *v, void *cookie, int waitok, + void (*cb)(void *, int, int), void *cbarg); int sti_load_font(void *v, void *cookie, struct wsdisplay_font *); const struct wsdisplay_accessops sti_accessops = { diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c index 09b64963076..1dc3f035154 100644 --- a/sys/dev/ic/vga.c +++ b/sys/dev/ic/vga.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vga.c,v 1.28 2002/03/14 01:26:55 millert Exp $ */ +/* $OpenBSD: vga.c,v 1.29 2002/03/14 03:16:05 millert Exp $ */ /* $NetBSD: vga.c,v 1.28.2.1 2000/06/30 16:27:47 simonb Exp $ */ /* @@ -91,16 +91,16 @@ int vgaconsole, vga_console_type, vga_console_attached; struct vgascreen vga_console_screen; struct vga_config vga_console_vc; -int vga_selectfont(struct vga_config *, struct vgascreen *, +int vga_selectfont(struct vga_config *, struct vgascreen *, const char *, const char *); void vga_init_screen(struct vga_config *, struct vgascreen *, const struct wsscreen_descr *, int, long *); void vga_init(struct vga_config *, bus_space_tag_t, bus_space_tag_t); -void vga_setfont(struct vga_config *, struct vgascreen *); +void vga_setfont(struct vga_config *, struct vgascreen *); -int vga_mapchar(void *, int, unsigned int *); -void vga_putchar(void *, int, int, u_int, long); -int vga_alloc_attr(void *, int, int, int, long *); +int vga_mapchar(void *, int, unsigned int *); +void vga_putchar(void *, int, int, u_int, long); +int vga_alloc_attr(void *, int, int, int, long *); void vga_copyrows(void *, int, int, int); static const struct wsdisplay_emulops vga_emulops = { @@ -215,10 +215,10 @@ const struct wsscreen_list vga_screenlist = { int vga_ioctl(void *, u_long, caddr_t, int, struct proc *); paddr_t vga_mmap(void *, off_t, int); int vga_alloc_screen(void *, const struct wsscreen_descr *, - void **, int *, int *, long *); + void **, int *, int *, long *); void vga_free_screen(void *, void *); -int vga_show_screen __P((void *, void *, int, - void (*) (void *, int, int), void *)); +int vga_show_screen(void *, void *, int, + void (*) (void *, int, int), void *); int vga_load_font(void *, void *, struct wsdisplay_font *); void vga_scrollback(void *, void *, int); void vga_burner(void *v, u_int on, u_int flags); diff --git a/sys/dev/ic/vgavar.h b/sys/dev/ic/vgavar.h index 12236ff33b8..5a5db102d10 100644 --- a/sys/dev/ic/vgavar.h +++ b/sys/dev/ic/vgavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vgavar.h,v 1.6 2002/03/14 01:26:55 millert Exp $ */ +/* $OpenBSD: vgavar.h,v 1.7 2002/03/14 03:16:05 millert Exp $ */ /* $NetBSD: vgavar.h,v 1.4 2000/06/17 07:11:50 soda Exp $ */ /* @@ -164,11 +164,11 @@ static inline void _vga_gdc_write(vh, reg, val) int vga_common_probe(bus_space_tag_t, bus_space_tag_t); void vga_common_attach(struct device *, bus_space_tag_t, - bus_space_tag_t, int); + bus_space_tag_t, int); #ifdef arc -void vga_extended_attach __P((struct device *, bus_space_tag_t, - bus_space_tag_t, int, - int (*)(void *, off_t, int))); +void vga_extended_attach(struct device *, bus_space_tag_t, + bus_space_tag_t, int, + int (*)(void *, off_t, int)); #endif int vga_is_console(bus_space_tag_t, int); @@ -178,7 +178,7 @@ struct wsscreen_descr; void vga_loadchars(struct vga_handle *, int, int, int, int, char *); void vga_setfontset(struct vga_handle *, int, int); void vga_setscreentype(struct vga_handle *, - const struct wsscreen_descr *); + const struct wsscreen_descr *); #if NVGA_PCI > 0 int vga_pci_ioctl(void *, u_long, caddr_t, int, struct proc *); #endif diff --git a/sys/dev/ic/wdcvar.h b/sys/dev/ic/wdcvar.h index 7303c7ecd83..a6ab5d29aa7 100644 --- a/sys/dev/ic/wdcvar.h +++ b/sys/dev/ic/wdcvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wdcvar.h,v 1.22 2002/03/14 01:26:55 millert Exp $ */ +/* $OpenBSD: wdcvar.h,v 1.23 2002/03/14 03:16:05 millert Exp $ */ /* $NetBSD: wdcvar.h,v 1.17 1999/04/11 20:50:29 bouyer Exp $ */ /*- @@ -249,7 +249,7 @@ struct wdc_xfer *wdc_get_xfer(int); /* int = WDC_NOSLEEP/CANSLEEP */ #define WDC_NOSLEEP 0x01 void wdc_free_xfer(struct channel_softc *, struct wdc_xfer *); void wdcstart(struct channel_softc *); -void wdcrestart(void*); +void wdcrestart(void *); int wdcreset(struct channel_softc *, int); #define VERBOSE 1 #define SILENT 0 /* wdcreset will not print errors */ diff --git a/sys/dev/isa/ad1848var.h b/sys/dev/isa/ad1848var.h index 00687e6eda8..e96fada888a 100644 --- a/sys/dev/isa/ad1848var.h +++ b/sys/dev/isa/ad1848var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ad1848var.h,v 1.11 2002/03/14 01:26:56 millert Exp $ */ +/* $OpenBSD: ad1848var.h,v 1.12 2002/03/14 03:16:05 millert Exp $ */ /* $NetBSD: ad1848var.h,v 1.22 1998/01/19 22:18:26 augustss Exp $ */ /* @@ -196,8 +196,8 @@ int ad1848_round_blocksize(void *, int); int ad1848_dma_init_output(void *, void *, int); int ad1848_dma_init_input(void *, void *, int); -int ad1848_dma_output __P((void *, void *, int, void (*)(void *), void*)); -int ad1848_dma_input __P((void *, void *, int, void (*)(void *), void*)); +int ad1848_dma_output(void *, void *, int, void (*)(void *), void *); +int ad1848_dma_input(void *, void *, int, void (*)(void *), void *); int ad1848_commit_settings(void *); diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c index 71850dada37..2566e5f65ee 100644 --- a/sys/dev/isa/aha.c +++ b/sys/dev/isa/aha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aha.c,v 1.43 2002/03/14 01:26:56 millert Exp $ */ +/* $OpenBSD: aha.c,v 1.44 2002/03/14 03:16:05 millert Exp $ */ /* $NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $ */ #undef AHADIAG @@ -451,7 +451,7 @@ AGAIN: #ifdef AHADEBUG if (aha_debug) { - u_char *cp = (u_char*)&ccb->scsi_cmd; + u_char *cp = (u_char *)&ccb->scsi_cmd; printf("op=%x %x %x %x %x %x\n", cp[0], cp[1], cp[2], cp[3], cp[4], cp[5]); printf("stat %x for mbi addr = 0x%08x, ", diff --git a/sys/dev/isa/aria.c b/sys/dev/isa/aria.c index 228ce00a0e2..ad23c43ea8c 100644 --- a/sys/dev/isa/aria.c +++ b/sys/dev/isa/aria.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aria.c,v 1.7 2002/03/14 01:26:56 millert Exp $ */ +/* $OpenBSD: aria.c,v 1.8 2002/03/14 03:16:05 millert Exp $ */ /* * Copyright (c) 1995, 1996 Roland C. Dowdeswell. All rights reserved. @@ -127,8 +127,8 @@ struct aria_softc { int sc_precision; /* # bits per sample */ u_long sc_interrupts; /* number of interrupts taken */ - void (*sc_rintr)(void*); /* record transfer completion intr handler */ - void (*sc_pintr)(void*); /* play transfer completion intr handler */ + void (*sc_rintr)(void *); /* record transfer completion intr handler */ + void (*sc_pintr)(void *); /* play transfer completion intr handler */ void *sc_rarg; /* arg for sc_rintr() */ void *sc_parg; /* arg for sc_pintr() */ @@ -178,8 +178,8 @@ int aria_get_in_port(void *); int aria_speaker_ctl(void *, int); int aria_commit_settings(void *); -int aria_start_output __P((void *, void *, int, void (*)(), void*)); -int aria_start_input __P((void *, void *, int, void (*)(), void*)); +int aria_start_output(void *, void *, int, void (*)(), void *); +int aria_start_input(void *, void *, int, void (*)(), void *); int aria_halt_input(void *); int aria_halt_output(void *); diff --git a/sys/dev/isa/ega.c b/sys/dev/isa/ega.c index 0484b14c20f..4841f4bba8d 100644 --- a/sys/dev/isa/ega.c +++ b/sys/dev/isa/ega.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ega.c,v 1.3 2002/03/14 01:26:56 millert Exp $ */ +/* $OpenBSD: ega.c,v 1.4 2002/03/14 03:16:05 millert Exp $ */ /* $NetBSD: ega.c,v 1.4.4.1 2000/06/30 16:27:47 simonb Exp $ */ /* @@ -220,10 +220,10 @@ const struct wsscreen_list ega_screenlist = { static int ega_ioctl(void *, u_long, caddr_t, int, struct proc *); static paddr_t ega_mmap(void *, off_t, int); static int ega_alloc_screen(void *, const struct wsscreen_descr *, - void **, int *, int *, long *); + void **, int *, int *, long *); static void ega_free_screen(void *, void *); -static int ega_show_screen __P((void *, void *, int, - void (*) (void *, int, int), void *)); +static int ega_show_screen(void *, void *, int, + void (*) (void *, int, int), void *); static int ega_load_font(void *, void *, struct wsdisplay_font *); void ega_doswitch(struct ega_config *); diff --git a/sys/dev/isa/ess.c b/sys/dev/isa/ess.c index 88753c9e062..69b4a903f3f 100644 --- a/sys/dev/isa/ess.c +++ b/sys/dev/isa/ess.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ess.c,v 1.7 2002/03/14 01:26:56 millert Exp $ */ +/* $OpenBSD: ess.c,v 1.8 2002/03/14 03:16:05 millert Exp $ */ /* $NetBSD: ess.c,v 1.44.4.1 1999/06/21 01:18:00 thorpej Exp $ */ /* @@ -128,12 +128,12 @@ int ess_set_params(void *, int, int, struct audio_params *, int ess_round_blocksize(void *, int); -int ess_audio1_trigger_output __P((void *, void *, void *, int, - void (*)(void *), void *, struct audio_params *)); -int ess_audio2_trigger_output __P((void *, void *, void *, int, - void (*)(void *), void *, struct audio_params *)); -int ess_audio1_trigger_input __P((void *, void *, void *, int, - void (*)(void *), void *, struct audio_params *)); +int ess_audio1_trigger_output(void *, void *, void *, int, + void (*)(void *), void *, struct audio_params *); +int ess_audio2_trigger_output(void *, void *, void *, int, + void (*)(void *), void *, struct audio_params *); +int ess_audio1_trigger_input(void *, void *, void *, int, + void (*)(void *), void *, struct audio_params *); int ess_audio1_halt(void *); int ess_audio2_halt(void *); int ess_audio1_intr(void *); diff --git a/sys/dev/isa/essvar.h b/sys/dev/isa/essvar.h index b2163842d7c..f20fe6cfe29 100644 --- a/sys/dev/isa/essvar.h +++ b/sys/dev/isa/essvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: essvar.h,v 1.4 2002/03/14 01:26:56 millert Exp $ */ +/* $OpenBSD: essvar.h,v 1.5 2002/03/14 03:16:05 millert Exp $ */ /* $NetBSD: essvar.h,v 1.14 1999/03/18 06:03:31 mycroft Exp $ */ /* * Copyright 1997 @@ -34,7 +34,7 @@ */ /* -** @(#) $RCSfile: essvar.h,v $ $Revision: 1.4 $ (SHARK) $Date: 2002/03/14 01:26:56 $ +** @(#) $RCSfile: essvar.h,v $ $Revision: 1.5 $ (SHARK) $Date: 2002/03/14 03:16:05 $ ** **++ ** @@ -103,7 +103,7 @@ struct ess_audio_channel int ist; void *ih; /* interrupt vectoring */ u_long nintr; /* number of interrupts taken */ - void (*intr)(void*); /* ISR for DMA complete */ + void (*intr)(void *); /* ISR for DMA complete */ void *arg; /* arg for intr() */ /* Status information */ diff --git a/sys/dev/isa/gusvar.h b/sys/dev/isa/gusvar.h index 167bded51ba..b492b771e7d 100644 --- a/sys/dev/isa/gusvar.h +++ b/sys/dev/isa/gusvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: gusvar.h,v 1.4 2002/03/14 01:26:56 millert Exp $ */ +/* $OpenBSD: gusvar.h,v 1.5 2002/03/14 03:16:05 millert Exp $ */ /* $NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $ */ /*- @@ -178,13 +178,13 @@ struct gus_softc { u_char sc_out_port; /* Current out port (generic only) */ u_char sc_in_port; /* keep track of it when no codec */ - void (*sc_dmaoutintr)(void*); /* DMA completion intr handler */ + void (*sc_dmaoutintr)(void *); /* DMA completion intr handler */ void *sc_outarg; /* argument for sc_dmaoutintr() */ u_char *sc_dmaoutaddr; /* for isadma_done */ u_long sc_gusaddr; /* where did we just put it? */ int sc_dmaoutcnt; /* for isadma_done */ - void (*sc_dmainintr)(void*); /* DMA completion intr handler */ + void (*sc_dmainintr)(void *); /* DMA completion intr handler */ void *sc_inarg; /* argument for sc_dmaoutintr() */ u_char *sc_dmainaddr; /* for isadma_done */ int sc_dmaincnt; /* for isadma_done */ @@ -323,16 +323,16 @@ int gus_set_params(void *, int, int, struct audio_params *, struct audio_params int gusmax_set_params(void *, int, int, struct audio_params *, struct audio_params *); int gus_round_blocksize(void *, int); int gus_commit_settings(void *); -int gus_dma_output __P((void *, void *, int, void (*)(void *), void *)); -int gus_dma_input __P((void *, void *, int, void (*)(void *), void *)); +int gus_dma_output(void *, void *, int, void (*)(void *), void *); +int gus_dma_input(void *, void *, int, void (*)(void *), void *); int gus_halt_out_dma(void *); int gus_halt_in_dma(void *); int gus_speaker_ctl(void *, int); int gusmaxopen(void *, int); int gusmax_round_blocksize(void *, int); int gusmax_commit_settings(void *); -int gusmax_dma_output __P((void *, void *, int, void (*)(void *), void *)); -int gusmax_dma_input __P((void *, void *, int, void (*)(void *), void *)); +int gusmax_dma_output(void *, void *, int, void (*)(void *), void *); +int gusmax_dma_input(void *, void *, int, void (*)(void *), void *); int gusmax_halt_out_dma(void *); int gusmax_halt_in_dma(void *); int gusmax_speaker_ctl(void *, int); diff --git a/sys/dev/isa/i82365_isa.c b/sys/dev/isa/i82365_isa.c index 91b7e6be9a6..0a1ce406681 100644 --- a/sys/dev/isa/i82365_isa.c +++ b/sys/dev/isa/i82365_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i82365_isa.c,v 1.16 2002/03/14 01:26:56 millert Exp $ */ +/* $OpenBSD: i82365_isa.c,v 1.17 2002/03/14 03:16:05 millert Exp $ */ /* $NetBSD: i82365_isa.c,v 1.11 1998/06/09 07:25:00 thorpej Exp $ */ /* @@ -63,8 +63,8 @@ int pcic_isa_probe(struct device *, void *, void *); void pcic_isa_attach(struct device *, struct device *, void *); -void *pcic_isa_chip_intr_establish __P((pcmcia_chipset_handle_t, - struct pcmcia_function *, int, int (*) (void *), void *, char *)); +void *pcic_isa_chip_intr_establish(pcmcia_chipset_handle_t, + struct pcmcia_function *, int, int (*) (void *), void *, char *); void pcic_isa_chip_intr_disestablish(pcmcia_chipset_handle_t, void *); struct cfattach pcic_isa_ca = { diff --git a/sys/dev/isa/i82365_isavar.h b/sys/dev/isa/i82365_isavar.h index d1b854c0493..fad174e6139 100644 --- a/sys/dev/isa/i82365_isavar.h +++ b/sys/dev/isa/i82365_isavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i82365_isavar.h,v 1.5 2002/03/14 01:26:56 millert Exp $ */ +/* $OpenBSD: i82365_isavar.h,v 1.6 2002/03/14 03:16:05 millert Exp $ */ /* $NetBSD: i82365_isavar.h,v 1.1 1998/06/07 18:28:31 sommerfe Exp $ */ /* @@ -38,8 +38,8 @@ extern int npcic_isa_intr_list; * Establish/disestablish interrupts for PCMCIA functions. */ -void *pcic_isa_chip_intr_establish __P((pcmcia_chipset_handle_t, - struct pcmcia_function *, int, int (*) (void *), void *, char *)); +void *pcic_isa_chip_intr_establish(pcmcia_chipset_handle_t, + struct pcmcia_function *, int, int (*) (void *), void *, char *); void pcic_isa_chip_intr_disestablish(pcmcia_chipset_handle_t, void *); /* diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c index c5c34b3c64f..bcdee011c6c 100644 --- a/sys/dev/isa/if_eg.c +++ b/sys/dev/isa/if_eg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_eg.c,v 1.22 2002/03/14 01:26:56 millert Exp $ */ +/* $OpenBSD: if_eg.c,v 1.23 2002/03/14 03:16:05 millert Exp $ */ /* $NetBSD: if_eg.c,v 1.26 1996/05/12 23:52:27 mycroft Exp $ */ /* @@ -651,13 +651,13 @@ egintr(arg) dprintf(("Receive Packets %d\n", i)); bcopy(&sc->eg_pcb[6], &i, sizeof(i)); dprintf(("Transmit Packets %d\n", i)); - dprintf(("CRC errors %d\n", *(short*)&sc->eg_pcb[10])); + dprintf(("CRC errors %d\n", *(short *)&sc->eg_pcb[10])); dprintf(("alignment errors %d\n", - *(short*)&sc->eg_pcb[12])); + *(short *)&sc->eg_pcb[12])); dprintf(("no resources errors %d\n", - *(short*)&sc->eg_pcb[14])); + *(short *)&sc->eg_pcb[14])); dprintf(("overrun errors %d\n", - *(short*)&sc->eg_pcb[16])); + *(short *)&sc->eg_pcb[16])); break; default: diff --git a/sys/dev/isa/pcdisplay.c b/sys/dev/isa/pcdisplay.c index d69ce80ad55..72babcce6ed 100644 --- a/sys/dev/isa/pcdisplay.c +++ b/sys/dev/isa/pcdisplay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcdisplay.c,v 1.5 2002/03/14 01:26:56 millert Exp $ */ +/* $OpenBSD: pcdisplay.c,v 1.6 2002/03/14 03:16:05 millert Exp $ */ /* $NetBSD: pcdisplay.c,v 1.9.4.1 2000/06/30 16:27:48 simonb Exp $ */ /* @@ -114,8 +114,8 @@ static paddr_t pcdisplay_mmap(void *, off_t, int); static int pcdisplay_alloc_screen(void *, const struct wsscreen_descr *, void **, int *, int *, long *); static void pcdisplay_free_screen(void *, void *); -static int pcdisplay_show_screen __P((void *, void *, int, - void (*) (void *, int, int), void *)); +static int pcdisplay_show_screen(void *, void *, int, + void (*) (void *, int, int), void *); const struct wsdisplay_accessops pcdisplay_accessops = { pcdisplay_ioctl, diff --git a/sys/dev/isa/pcppi.c b/sys/dev/isa/pcppi.c index 3997193ad91..85c9ed4cdbb 100644 --- a/sys/dev/isa/pcppi.c +++ b/sys/dev/isa/pcppi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcppi.c,v 1.4 2002/03/14 01:26:56 millert Exp $ */ +/* $OpenBSD: pcppi.c,v 1.5 2002/03/14 03:16:05 millert Exp $ */ /* $NetBSD: pcppi.c,v 1.1 1998/04/15 20:26:18 drochner Exp $ */ /* @@ -81,7 +81,7 @@ struct cfdriver pcppi_cd = { NULL, "pcppi", DV_DULL }; -static void pcppi_bell_stop(void*); +static void pcppi_bell_stop(void *); #define PCPPIPRI (PZERO - 1) diff --git a/sys/dev/isa/sb.c b/sys/dev/isa/sb.c index 481bb1905bd..cf282d137ac 100644 --- a/sys/dev/isa/sb.c +++ b/sys/dev/isa/sb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sb.c,v 1.21 2002/03/14 01:26:56 millert Exp $ */ +/* $OpenBSD: sb.c,v 1.22 2002/03/14 03:16:05 millert Exp $ */ /* $NetBSD: sb.c,v 1.57 1998/01/12 09:43:46 thorpej Exp $ */ /* @@ -65,9 +65,8 @@ struct cfdriver sb_cd = { }; #if NMIDI > 0 -int sb_mpu401_open __P((void *, int, - void (*iintr)(void *, int), - void (*ointr)(void *), void *arg)); +int sb_mpu401_open(void *, int, void (*iintr)(void *, int), + void (*ointr)(void *), void *arg); void sb_mpu401_close(void *); int sb_mpu401_output(void *, int); void sb_mpu401_getinfo(void *, struct midi_info *); diff --git a/sys/dev/isa/sbdspvar.h b/sys/dev/isa/sbdspvar.h index 66693dd6ba5..2b53267f2ac 100644 --- a/sys/dev/isa/sbdspvar.h +++ b/sys/dev/isa/sbdspvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sbdspvar.h,v 1.15 2002/03/14 01:26:56 millert Exp $ */ +/* $OpenBSD: sbdspvar.h,v 1.16 2002/03/14 03:16:05 millert Exp $ */ /* $NetBSD: sbdspvar.h,v 1.37 1998/08/10 00:20:39 mycroft Exp $ */ /* @@ -143,15 +143,15 @@ struct sbdsp_softc { u_long sc_interrupts; /* number of interrupts taken */ - int (*sc_intr8)(void*); /* dma completion intr handler */ + int (*sc_intr8)(void *); /* dma completion intr handler */ void *sc_arg8; /* arg for sc_intr8() */ - int (*sc_intr16)(void*); /* dma completion intr handler */ + int (*sc_intr16)(void *); /* dma completion intr handler */ void *sc_arg16; /* arg for sc_intr16() */ - void (*sc_intrp)(void*); /* PCM output intr handler */ + void (*sc_intrp)(void *); /* PCM output intr handler */ void *sc_argp; /* arg for sc_intrp() */ - void (*sc_intrr)(void*); /* PCM input intr handler */ + void (*sc_intrr)(void *); /* PCM input intr handler */ void *sc_argr; /* arg for sc_intrr() */ - void (*sc_intrm)(void*, int);/* midi input intr handler */ + void (*sc_intrm)(void *, int);/* midi input intr handler */ void *sc_argm; /* arg for sc_intrm() */ u_int sc_mixer_model; @@ -212,10 +212,10 @@ int sbdsp_get_avail_out_ports(void *); int sbdsp_speaker_ctl(void *, int); int sbdsp_commit(void *); -int sbdsp_trigger_output __P((void *, void *, void *, int, void (*)(void *), - void *, struct audio_params *)); -int sbdsp_trigger_input __P((void *, void *, void *, int, void (*)(void *), - void *, struct audio_params *)); +int sbdsp_trigger_output(void *, void *, void *, int, void (*)(void *), + void *, struct audio_params *); +int sbdsp_trigger_input(void *, void *, void *, int, void (*)(void *), + void *, struct audio_params *); int sbdsp_haltdma(void *); @@ -248,9 +248,9 @@ paddr_t sb_mappage(void *, void *, off_t, int); int sbdsp_get_props(void *); -int sbdsp_midi_open __P((void *, int, +int sbdsp_midi_open(void *, int, void (*iintr)(void *, int), - void (*ointr)(void *), void *arg)); + void (*ointr)(void *), void *arg); void sbdsp_midi_close(void *); int sbdsp_midi_output(void *, int); void sbdsp_midi_getinfo(void *, struct midi_info *); diff --git a/sys/dev/isa/tcic2_isa.c b/sys/dev/isa/tcic2_isa.c index d6706b5f1b9..da8e26434eb 100644 --- a/sys/dev/isa/tcic2_isa.c +++ b/sys/dev/isa/tcic2_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcic2_isa.c,v 1.4 2002/03/14 01:26:56 millert Exp $ */ +/* $OpenBSD: tcic2_isa.c,v 1.5 2002/03/14 03:16:05 millert Exp $ */ /* $NetBSD: tcic2_isa.c,v 1.2 1999/04/08 16:14:29 bad Exp $ */ #undef TCICISADEBUG @@ -111,8 +111,8 @@ int tcic_isa_debug = 1; int tcic_isa_probe(struct device *, void *, void *); void tcic_isa_attach(struct device *, struct device *, void *); -void *tcic_isa_chip_intr_establish __P((pcmcia_chipset_handle_t, - struct pcmcia_function *, int, int (*) (void *), void *, char *)); +void *tcic_isa_chip_intr_establish(pcmcia_chipset_handle_t, + struct pcmcia_function *, int, int (*) (void *), void *, char *); void tcic_isa_chip_intr_disestablish(pcmcia_chipset_handle_t, void *); struct cfattach tcic_isa_ca = { diff --git a/sys/dev/isa/wdc_isa.c b/sys/dev/isa/wdc_isa.c index fce6ec30fd8..c9cc5dbf20f 100644 --- a/sys/dev/isa/wdc_isa.c +++ b/sys/dev/isa/wdc_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc_isa.c,v 1.8 2002/03/14 01:26:56 millert Exp $ */ +/* $OpenBSD: wdc_isa.c,v 1.9 2002/03/14 03:16:05 millert Exp $ */ /* $NetBSD: wdc_isa.c,v 1.15 1999/05/19 14:41:25 bouyer Exp $ */ /*- @@ -90,9 +90,9 @@ struct cfattach wdc_isa_ca = { #if NISADMA > 0 static void wdc_isa_dma_setup(struct wdc_isa_softc *); -static int wdc_isa_dma_init(void*, int, int, void *, size_t, int); -static void wdc_isa_dma_start(void*, int, int); -static int wdc_isa_dma_finish(void*, int, int); +static int wdc_isa_dma_init(void *, int, int, void *, size_t, int); +static void wdc_isa_dma_start(void *, int, int); +static int wdc_isa_dma_finish(void *, int, int); #endif /* NISADMA > 0 */ int diff --git a/sys/dev/isa/ym.c b/sys/dev/isa/ym.c index fb90979d07f..5a25fc7136b 100644 --- a/sys/dev/isa/ym.c +++ b/sys/dev/isa/ym.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ym.c,v 1.10 2002/03/14 01:26:57 millert Exp $ */ +/* $OpenBSD: ym.c,v 1.11 2002/03/14 03:16:05 millert Exp $ */ /* @@ -111,8 +111,8 @@ static __inline int ym_read(struct ym_softc *, int); static __inline void ym_write(struct ym_softc *, int, int); #if NMIDI > 0 -int ym_mpu401_open __P((void *, int, void (*iintr)(void *, int), - void (*ointr)(void *), void *arg)); +int ym_mpu401_open(void *, int, void (*iintr)(void *, int), + void (*ointr)(void *), void *arg); void ym_mpu401_close(void *); int ym_mpu401_output(void *, int); void ym_mpu401_getinfo(void *, struct midi_info *); diff --git a/sys/dev/midi_if.h b/sys/dev/midi_if.h index 26d2bafeb12..f527ec587bf 100644 --- a/sys/dev/midi_if.h +++ b/sys/dev/midi_if.h @@ -1,4 +1,4 @@ -/* $OpenBSD: midi_if.h,v 1.3 2002/03/14 01:26:52 millert Exp $ */ +/* $OpenBSD: midi_if.h,v 1.4 2002/03/14 03:16:03 millert Exp $ */ /* $NetBSD: midi_if.h,v 1.3 1998/11/25 22:17:07 augustss Exp $ */ /* @@ -50,10 +50,10 @@ struct midi_info { struct midi_softc; struct midi_hw_if { - int (*open)__P((void *, int, /* open hardware */ - void (*)(void *, int), /* input callback */ - void (*)(void *), /* output callback */ - void *)); + int (*open)(void *, int, /* open hardware */ + void (*)(void *, int), /* input callback */ + void (*)(void *), /* output callback */ + void *); void (*close)(void *); /* close hardware */ int (*output)(void *, int); /* output a byte */ void (*getinfo)(void *, struct midi_info *); diff --git a/sys/dev/midisyn.c b/sys/dev/midisyn.c index e59687a4039..c7fc39935b3 100644 --- a/sys/dev/midisyn.c +++ b/sys/dev/midisyn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: midisyn.c,v 1.2 2002/03/14 01:26:52 millert Exp $ */ +/* $OpenBSD: midisyn.c,v 1.3 2002/03/14 03:16:03 millert Exp $ */ /* $NetBSD: midisyn.c,v 1.5 1998/11/25 22:17:07 augustss Exp $ */ /* @@ -72,9 +72,9 @@ int midisyn_allocvoice(midisyn *, u_int32_t, u_int32_t); u_int32_t midisyn_note_to_freq(int); u_int32_t midisyn_finetune(u_int32_t, int, int, int); -int midisyn_open __P((void *, int, - void (*iintr)(void *, int), - void (*ointr)(void *), void *arg)); +int midisyn_open(void *, int, + void (*iintr)(void *, int), + void (*ointr)(void *), void *arg); void midisyn_close(void *); int midisyn_output(void *, int); void midisyn_getinfo(void *, struct midi_info *); diff --git a/sys/dev/ofw/openfirm.h b/sys/dev/ofw/openfirm.h index 733c4bc68d1..33e257b7133 100644 --- a/sys/dev/ofw/openfirm.h +++ b/sys/dev/ofw/openfirm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: openfirm.h,v 1.6 2002/03/14 01:26:58 millert Exp $ */ +/* $OpenBSD: openfirm.h,v 1.7 2002/03/14 03:16:06 millert Exp $ */ /* $NetBSD: openfirm.h,v 1.1 1996/09/30 16:35:10 ws Exp $ */ /* @@ -64,7 +64,7 @@ void OF_enter(void); void OF_exit(void) __attribute__((__noreturn__)); int OF_interpret(char *cmd, int nreturns, ...); #if 0 -void (*OF_set_callback __P((void (*newfunc)(void *)))) (); +void (*OF_set_callback(void (*newfunc)(void *))) (); #endif /* diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c index 6751b8cb754..f3c183d663c 100644 --- a/sys/dev/pci/auich.c +++ b/sys/dev/pci/auich.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auich.c,v 1.23 2002/03/14 01:26:58 millert Exp $ */ +/* $OpenBSD: auich.c,v 1.24 2002/03/14 03:16:06 millert Exp $ */ /* * Copyright (c) 2000,2001 Michael Shalayeff @@ -226,10 +226,10 @@ void auich_freem(void *, void *, int); size_t auich_round_buffersize(void *, int, size_t); paddr_t auich_mappage(void *, void *, off_t, int); int auich_get_props(void *); -int auich_trigger_output __P((void *, void *, void *, int, void (*)(void *), - void *, struct audio_params *)); -int auich_trigger_input __P((void *, void *, void *, int, void (*)(void *), - void *, struct audio_params *)); +int auich_trigger_output(void *, void *, void *, int, void (*)(void *), + void *, struct audio_params *); +int auich_trigger_input(void *, void *, void *, int, void (*)(void *), + void *, struct audio_params *); void auich_powerhook(int, void *); @@ -347,7 +347,7 @@ auich_attach(parent, self, aux) printf(": %s %s\n", intrstr, sc->sc_audev.name); /* allocate dma lists */ -#define a(a) (void*)(((u_long)(a) + sizeof(*(a)) - 1) & ~(sizeof(*(a))-1)) +#define a(a) (void *)(((u_long)(a) + sizeof(*(a)) - 1) & ~(sizeof(*(a))-1)) sc->dmalist_pcmo = sc->dmap_pcmo = a(sc->dmasto_pcmo); sc->dmalist_pcmi = sc->dmap_pcmi = a(sc->dmasto_pcmi); sc->dmalist_mici = sc->dmap_mici = a(sc->dmasto_mici); diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c index 24b33ed4d9b..7d2d8007ab3 100644 --- a/sys/dev/pci/autri.c +++ b/sys/dev/pci/autri.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autri.c,v 1.6 2002/03/14 01:26:58 millert Exp $ */ +/* $OpenBSD: autri.c,v 1.7 2002/03/14 03:16:06 millert Exp $ */ /* * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro. @@ -123,20 +123,19 @@ struct cfattach autri_ca = { int autri_open(void *, int); void autri_close(void *); int autri_query_encoding(void *, struct audio_encoding *); -int autri_set_params(void *, int, int, struct audio_params *, struct audio_params *); +int autri_set_params(void *, int, int, struct audio_params *, + struct audio_params *); int autri_round_blocksize(void *, int); -int autri_trigger_output - __P((void *, void *, void *, int, void (*)(void *), void *, - struct audio_params *)); -int autri_trigger_input - __P((void *, void *, void *, int, void (*)(void *), void *, - struct audio_params *)); +int autri_trigger_output(void *, void *, void *, int, void (*)(void *), + void *, struct audio_params *); +int autri_trigger_input(void *, void *, void *, int, void (*)(void *), + void *, struct audio_params *); int autri_halt_output(void *); int autri_halt_input(void *); int autri_getdev(void *, struct audio_device *); int autri_mixer_set_port(void *, mixer_ctrl_t *); int autri_mixer_get_port(void *, mixer_ctrl_t *); -void* autri_malloc(void *, int, size_t, int, int); +void *autri_malloc(void *, int, size_t, int, int); void autri_free(void *, void *, int); size_t autri_round_buffersize(void *, int, size_t); paddr_t autri_mappage(void *, void *, off_t, int); diff --git a/sys/dev/pci/bktr/bktr_card.c b/sys/dev/pci/bktr/bktr_card.c index 39c16c36d4f..60e91b06ebe 100644 --- a/sys/dev/pci/bktr/bktr_card.c +++ b/sys/dev/pci/bktr/bktr_card.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_card.c,v 1.2 2001/09/20 17:02:31 mpech Exp $ */ +/* $OpenBSD: bktr_card.c,v 1.3 2002/03/14 03:16:06 millert Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.16 2000/10/31 13:09:56 roger Exp $ */ /* @@ -413,7 +413,7 @@ readEEProm( bktr_ptr_t bktr, int offset, int count, u_char *data ) * XXX FIXME: use offset & count args */ int -signCard( bktr_ptr_t bktr, int offset, int count, u_char* sig ) +signCard( bktr_ptr_t bktr, int offset, int count, u_char *sig ) { int x; diff --git a/sys/dev/pci/bktr/bktr_card.h b/sys/dev/pci/bktr/bktr_card.h index 5d948440c7d..5de5fd54161 100644 --- a/sys/dev/pci/bktr/bktr_card.h +++ b/sys/dev/pci/bktr/bktr_card.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_card.h,v 1.1 2001/03/28 03:27:09 fgsch Exp $ */ +/* $OpenBSD: bktr_card.h,v 1.2 2002/03/14 03:16:06 millert Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_card.h,v 1.4 2000/06/26 09:41:31 roger Exp $ */ /* @@ -80,7 +80,7 @@ #define Bt848_MAX_CARD 17 -int signCard( bktr_ptr_t bktr, int offset, int count, u_char* sig ); +int signCard( bktr_ptr_t bktr, int offset, int count, u_char *sig ); void probeCard( bktr_ptr_t bktr, int verbose, int unit); int writeEEProm( bktr_ptr_t bktr, int offset, int count, u_char *data ); diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c index 5bf2a2e1a09..b88e10792d5 100644 --- a/sys/dev/pci/bktr/bktr_core.c +++ b/sys/dev/pci/bktr/bktr_core.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_core.c,v 1.3 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: bktr_core.c,v 1.4 2002/03/14 03:16:06 millert Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp $ */ /* @@ -640,7 +640,7 @@ static void vbidecode(bktr_ptr_t bktr) { /* Copy the VBI data into the next free slot in the buffer. */ /* 'dest' is the point in vbibuffer where we want to insert new data */ dest = (unsigned char *)bktr->vbibuffer + bktr->vbiinsert; - memcpy(dest, (unsigned char*)bktr->vbidata, VBI_DATA_SIZE); + memcpy(dest, (unsigned char *)bktr->vbidata, VBI_DATA_SIZE); /* Write the VBI sequence number to the end of the vbi data */ /* This is used by the AleVT teletext program */ @@ -1366,7 +1366,7 @@ video_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro break; case BT848SFMT: /* set input format */ - temp = *(unsigned long*)arg & BT848_IFORM_FORMAT; + temp = *(unsigned long *)arg & BT848_IFORM_FORMAT; temp_iform = INB(bktr, BKTR_IFORM); temp_iform &= ~BT848_IFORM_FORMAT; temp_iform &= ~BT848_IFORM_XTSEL; @@ -1995,17 +1995,17 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro return tuner_getchnlset((struct bktr_chnlset *)arg); case BT848_SAUDIO: /* set audio channel */ - if ( set_audio( bktr, *(int*)arg ) < 0 ) + if ( set_audio( bktr, *(int *)arg ) < 0 ) return( EIO ); break; /* hue is a 2's compliment number, -90' to +89.3' in 0.7' steps */ case BT848_SHUE: /* set hue */ - OUTB(bktr, BKTR_HUE, (u_char)(*(int*)arg & 0xff)); + OUTB(bktr, BKTR_HUE, (u_char)(*(int *)arg & 0xff)); break; case BT848_GHUE: /* get hue */ - *(int*)arg = (signed char)(INB(bktr, BKTR_HUE) & 0xff); + *(int *)arg = (signed char)(INB(bktr, BKTR_HUE) & 0xff); break; /* brightness is a 2's compliment #, -50 to +%49.6% in 0.39% steps */ @@ -2019,7 +2019,7 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro /* */ case BT848_SCSAT: /* set chroma saturation */ - tmp_int = *(int*)arg; + tmp_int = *(int *)arg; temp = INB(bktr, BKTR_E_CONTROL); temp1 = INB(bktr, BKTR_O_CONTROL); @@ -2046,12 +2046,12 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro tmp_int = (int)(INB(bktr, BKTR_SAT_V_LO) & 0xff); if ( INB(bktr, BKTR_E_CONTROL) & BT848_E_CONTROL_SAT_V_MSB ) tmp_int |= BIT_EIGHT_HIGH; - *(int*)arg = tmp_int; + *(int *)arg = tmp_int; break; /* */ case BT848_SVSAT: /* set chroma V saturation */ - tmp_int = *(int*)arg; + tmp_int = *(int *)arg; temp = INB(bktr, BKTR_E_CONTROL); temp1 = INB(bktr, BKTR_O_CONTROL); @@ -2073,12 +2073,12 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro tmp_int = (int)INB(bktr, BKTR_SAT_V_LO) & 0xff; if ( INB(bktr, BKTR_E_CONTROL) & BT848_E_CONTROL_SAT_V_MSB ) tmp_int |= BIT_EIGHT_HIGH; - *(int*)arg = tmp_int; + *(int *)arg = tmp_int; break; /* */ case BT848_SUSAT: /* set chroma U saturation */ - tmp_int = *(int*)arg; + tmp_int = *(int *)arg; temp = INB(bktr, BKTR_E_CONTROL); temp1 = INB(bktr, BKTR_O_CONTROL); @@ -2100,7 +2100,7 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro tmp_int = (int)INB(bktr, BKTR_SAT_U_LO) & 0xff; if ( INB(bktr, BKTR_E_CONTROL) & BT848_E_CONTROL_SAT_U_MSB ) tmp_int |= BIT_EIGHT_HIGH; - *(int*)arg = tmp_int; + *(int *)arg = tmp_int; break; /* lr 970528 luma notch etc - 3 high bits of e_control/o_control */ @@ -2120,7 +2120,7 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro /* */ case BT848_SCONT: /* set contrast */ - tmp_int = *(int*)arg; + tmp_int = *(int *)arg; temp = INB(bktr, BKTR_E_CONTROL); temp1 = INB(bktr, BKTR_O_CONTROL); @@ -2142,7 +2142,7 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro tmp_int = (int)INB(bktr, BKTR_CONTRAST_LO) & 0xff; if ( INB(bktr, BKTR_E_CONTROL) & BT848_E_CONTROL_CON_MSB ) tmp_int |= BIT_EIGHT_HIGH; - *(int*)arg = tmp_int; + *(int *)arg = tmp_int; break; /* FIXME: SCBARS and CCBARS require a valid int * */ @@ -2161,11 +2161,11 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro temp = bktr->audio_mux_select; if ( bktr->audio_mute_state == TRUE ) temp |= AUDIO_MUTE; - *(int*)arg = temp; + *(int *)arg = temp; break; case BT848_SBTSC: /* set audio channel */ - if ( set_BTSC( bktr, *(int*)arg ) < 0 ) + if ( set_BTSC( bktr, *(int *)arg ) < 0 ) return( EIO ); break; @@ -2196,19 +2196,19 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro /* Ioctl's for direct gpio access */ #ifdef BKTR_GPIO_ACCESS case BT848_GPIO_GET_EN: - *(int*)arg = INL(bktr, BKTR_GPIO_OUT_EN); + *(int *)arg = INL(bktr, BKTR_GPIO_OUT_EN); break; case BT848_GPIO_SET_EN: - OUTL(bktr, BKTR_GPIO_OUT_EN, *(int*)arg); + OUTL(bktr, BKTR_GPIO_OUT_EN, *(int *)arg); break; case BT848_GPIO_GET_DATA: - *(int*)arg = INL(bktr, BKTR_GPIO_DATA); + *(int *)arg = INL(bktr, BKTR_GPIO_DATA); break; case BT848_GPIO_SET_DATA: - OUTL(bktr, BKTR_GPIO_DATA, *(int*)arg); + OUTL(bktr, BKTR_GPIO_DATA, *(int *)arg); break; #endif /* BKTR_GPIO_ACCESS */ @@ -2456,7 +2456,7 @@ common_ioctl( bktr_ptr_t bktr, ioctl_cmd_t cmd, caddr_t arg ) temp = status_sum; status_sum = 0; ENABLE_INTR(s); - *(u_int*)arg = temp; + *(u_int *)arg = temp; break; } #endif /* STATUS_SUM */ diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c index 9526baaec89..5903b62fa17 100644 --- a/sys/dev/pci/bktr/bktr_os.c +++ b/sys/dev/pci/bktr/bktr_os.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_os.c,v 1.9 2002/03/14 01:27:00 millert Exp $ */ +/* $OpenBSD: bktr_os.c,v 1.10 2002/03/14 03:16:07 millert Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp $ */ /* @@ -821,7 +821,7 @@ int bktr_poll( dev_t dev, int events, struct proc *p) static bktr_reg_t brooktree[ NBKTR ]; -static const char* bktr_probe( pcici_t tag, pcidi_t type ); +static const char *bktr_probe( pcici_t tag, pcidi_t type ); static void bktr_attach( pcici_t tag, int unit ); static void bktr_intr(void *arg) { common_bktr_intr(arg); } @@ -872,7 +872,7 @@ SYSINIT(bktrdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,bktr_drvinit,NULL) /* * the boot time probe routine. */ -static const char* +static const char * bktr_probe( pcici_t tag, pcidi_t type ) { unsigned int rev = pci_conf_read( tag, PCIR_REVID) & 0x000000ff; @@ -960,7 +960,7 @@ bktr_attach( pcici_t tag, int unit ) /* * setup the interrupt handling routine */ - pci_map_int(tag, bktr_intr, (void*) bktr, &tty_imask); + pci_map_int(tag, bktr_intr, (void *) bktr, &tty_imask); /* Update the Device Control Register */ diff --git a/sys/dev/pci/bktr/bktr_reg.h b/sys/dev/pci/bktr/bktr_reg.h index 645952dbf01..bc1ad4dd476 100644 --- a/sys/dev/pci/bktr/bktr_reg.h +++ b/sys/dev/pci/bktr/bktr_reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_reg.h,v 1.4 2001/05/16 07:15:42 fgsch Exp $ */ +/* $OpenBSD: bktr_reg.h,v 1.5 2002/03/14 03:16:07 millert Exp $ */ /* * $FreeBSD: src/sys/dev/bktr/bktr_reg.h,v 1.42 2000/10/31 13:09:56 roger Exp $ * @@ -414,7 +414,7 @@ struct TVTUNER { /* description of the PHYSICAL tuner */ struct TUNER { - char* name; + char *name; u_char type; u_char pllControl[4]; u_char bandLimits[ 2 ]; @@ -429,7 +429,7 @@ struct TUNER { #define EEPROMBLOCKSIZE 32 struct CARDTYPE { unsigned int card_id; /* card id (from #define's) */ - char* name; + char *name; const struct TUNER* tuner; /* Tuner details */ u_char tuner_pllAddr; /* Tuner i2c address */ u_char dbx; /* Has DBX chip? */ @@ -483,12 +483,12 @@ struct bktr_i2c_softc { #define OUTW(bktr,offset,value) bus_space_write_2((bktr)->memt,(bktr)->memh,(offset),(value)) #define OUTL(bktr,offset,value) bus_space_write_4((bktr)->memt,(bktr)->memh,(offset),(value)) #else -#define INB(bktr,offset) *(volatile unsigned char*) ((int)((bktr)->memh)+(offset)) -#define INW(bktr,offset) *(volatile unsigned short*)((int)((bktr)->memh)+(offset)) -#define INL(bktr,offset) *(volatile unsigned int*) ((int)((bktr)->memh)+(offset)) -#define OUTB(bktr,offset,value) *(volatile unsigned char*) ((int)((bktr)->memh)+(offset)) = (value) -#define OUTW(bktr,offset,value) *(volatile unsigned short*)((int)((bktr)->memh)+(offset)) = (value) -#define OUTL(bktr,offset,value) *(volatile unsigned int*) ((int)((bktr)->memh)+(offset)) = (value) +#define INB(bktr,offset) *(volatile unsigned char *)((int)((bktr)->memh)+(offset)) +#define INW(bktr,offset) *(volatile unsigned short *)((int)((bktr)->memh)+(offset)) +#define INL(bktr,offset) *(volatile unsigned int *)((int)((bktr)->memh)+(offset)) +#define OUTB(bktr,offset,value) *(volatile unsigned char *)((int)((bktr)->memh)+(offset)) = (value) +#define OUTW(bktr,offset,value) *(volatile unsigned short *)((int)((bktr)->memh)+(offset)) = (value) +#define OUTL(bktr,offset,value) *(volatile unsigned int *)((int)((bktr)->memh)+(offset)) = (value) #endif diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c index 8e9626bfef0..2c99279b111 100644 --- a/sys/dev/pci/cmpci.c +++ b/sys/dev/pci/cmpci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmpci.c,v 1.7 2002/03/14 01:26:58 millert Exp $ */ +/* $OpenBSD: cmpci.c,v 1.8 2002/03/14 03:16:06 millert Exp $ */ /* * Copyright (c) 2000 Takuya SHIOZAKI @@ -142,12 +142,12 @@ void cmpci_free(void *, void *, int); size_t cmpci_round_buffersize(void *, int, size_t); paddr_t cmpci_mappage(void *, void *, off_t, int); int cmpci_get_props(void *); -int cmpci_trigger_output __P((void *, void *, void *, int, - void (*)(void *), void *, - struct audio_params *)); -int cmpci_trigger_input __P((void *, void *, void *, int, - void (*)(void *), void *, - struct audio_params *)); +int cmpci_trigger_output(void *, void *, void *, int, + void (*)(void *), void *, + struct audio_params *); +int cmpci_trigger_input(void *, void *, void *, int, + void (*)(void *), void *, + struct audio_params *); struct audio_hw_if cmpci_hw_if = { cmpci_open, /* open */ diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c index 821f6e669c2..1f1cd7da894 100644 --- a/sys/dev/pci/cs4280.c +++ b/sys/dev/pci/cs4280.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4280.c,v 1.14 2002/03/14 01:26:58 millert Exp $ */ +/* $OpenBSD: cs4280.c,v 1.15 2002/03/14 03:16:06 millert Exp $ */ /* $NetBSD: cs4280.c,v 1.5 2000/06/26 04:56:23 simonb Exp $ */ /* @@ -216,10 +216,10 @@ void cs4280_free(void *, void *, int); size_t cs4280_round_buffersize(void *, int, size_t); paddr_t cs4280_mappage(void *, void *, off_t, int); int cs4280_get_props(void *); -int cs4280_trigger_output __P((void *, void *, void *, int, void (*)(void *), - void *, struct audio_params *)); -int cs4280_trigger_input __P((void *, void *, void *, int, void (*)(void *), - void *, struct audio_params *)); +int cs4280_trigger_output(void *, void *, void *, int, void (*)(void *), + void *, struct audio_params *); +int cs4280_trigger_input(void *, void *, void *, int, void (*)(void *), + void *, struct audio_params *); void cs4280_set_dac_rate(struct cs4280_softc *, int ); @@ -237,10 +237,10 @@ void cs4280_power(int, void *); void cs4280_clear_fifos(struct cs4280_softc *); #if NMIDI > 0 -void cs4280_midi_close(void*); +void cs4280_midi_close(void *); void cs4280_midi_getinfo(void *, struct midi_info *); -int cs4280_midi_open __P((void *, int, void (*)(void *, int), - void (*)(void *), void *)); +int cs4280_midi_open(void *, int, void (*)(void *, int), + void (*)(void *), void *); int cs4280_midi_output(void *, int); #endif diff --git a/sys/dev/pci/cs4281.c b/sys/dev/pci/cs4281.c index 1ba179a80f8..ef4626f7188 100644 --- a/sys/dev/pci/cs4281.c +++ b/sys/dev/pci/cs4281.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4281.c,v 1.11 2002/03/14 01:26:58 millert Exp $ */ +/* $OpenBSD: cs4281.c,v 1.12 2002/03/14 03:16:06 millert Exp $ */ /* $Tera: cs4281.c,v 1.18 2000/12/27 14:24:45 tacha Exp $ */ /* @@ -167,13 +167,10 @@ int cs4281_set_params(void *, int, int, struct audio_params *, int cs4281_halt_output(void *); int cs4281_halt_input(void *); int cs4281_getdev(void *, struct audio_device *); -int cs4281_trigger_output __P((void *, void *, void *, int, - void (*)(void *), void *, - struct audio_params *)); -int cs4281_trigger_input __P((void *, void *, void *, int, - void (*)(void *), void *, - struct audio_params *)); - +int cs4281_trigger_output(void *, void *, void *, int, void (*)(void *), + void *, struct audio_params *); +int cs4281_trigger_input(void *, void *, void *, int, void (*)(void *), + void *, struct audio_params *); u_int8_t cs4281_sr2regval(int); void cs4281_set_dac_rate(struct cs4281_softc *, int); void cs4281_set_adc_rate(struct cs4281_softc *, int); @@ -246,8 +243,8 @@ struct audio_hw_if cs4281_hw_if = { /* Midi Interface */ void cs4281_midi_close(void *); void cs4281_midi_getinfo(void *, struct midi_info *); -int cs4281_midi_open __P((void *, int, void (*)(void *, int), - void (*)(void *), void *)); +int cs4281_midi_open(void *, int, void (*)(void *, int), + void (*)(void *), void *); int cs4281_midi_output(void *, int); struct midi_hw_if cs4281_midi_hw_if = { diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c index e50518e5f8d..9d2318e6509 100644 --- a/sys/dev/pci/emuxki.c +++ b/sys/dev/pci/emuxki.c @@ -1,4 +1,4 @@ -/* $OpenBSD: emuxki.c,v 1.9 2002/03/14 01:26:58 millert Exp $ */ +/* $OpenBSD: emuxki.c,v 1.10 2002/03/14 03:16:06 millert Exp $ */ /* $NetBSD: emuxki.c,v 1.1 2001/10/17 18:39:41 jdolecek Exp $ */ /*- @@ -124,8 +124,7 @@ void emuxki_voice_recsrc_release(struct emuxki_softc *sc, emuxki_recsrc_t source u_int32_t emuxki_voice_curaddr(struct emuxki_voice *); int emuxki_set_vparms(struct emuxki_voice *voice, struct audio_params *p); int emuxki_voice_set_srate(struct emuxki_voice *voice, u_int32_t srate); -void emuxki_voice_start - __P((struct emuxki_voice *, void (*) (void *), void *)); +void emuxki_voice_start(struct emuxki_voice *, void (*) (void *), void *); void emuxki_voice_halt(struct emuxki_voice *); int emuxki_voice_channel_create(struct emuxki_voice *voice); void emuxki_voice_channel_destroy(struct emuxki_voice *voice); @@ -173,12 +172,10 @@ int emuxki_set_params(void *, int, int, size_t emuxki_round_buffersize(void *, int, size_t); -int emuxki_trigger_output __P((void *, void *, void *, int, - void (*)(void *), void *, - struct audio_params *)); -int emuxki_trigger_input __P((void *, void *, void *, int, - void (*) (void *), void *, - struct audio_params *)); +int emuxki_trigger_output(void *, void *, void *, int, void (*)(void *), + void *, struct audio_params *); +int emuxki_trigger_input(void *, void *, void *, int, void (*) (void *), + void *, struct audio_params *); int emuxki_halt_output(void *); int emuxki_halt_input(void *); diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c index 4bc778c2390..ba4c0ba275d 100644 --- a/sys/dev/pci/eso.c +++ b/sys/dev/pci/eso.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eso.c,v 1.16 2002/03/14 01:26:58 millert Exp $ */ +/* $OpenBSD: eso.c,v 1.17 2002/03/14 03:16:06 millert Exp $ */ /* $NetBSD: eso.c,v 1.3 1999/08/02 17:37:43 augustss Exp $ */ /* @@ -136,10 +136,10 @@ HIDE void eso_freem(void *, void *, int); HIDE size_t eso_round_buffersize(void *, int, size_t); HIDE paddr_t eso_mappage(void *, void *, off_t, int); HIDE int eso_get_props(void *); -HIDE int eso_trigger_output __P((void *, void *, void *, int, - void (*)(void *), void *, struct audio_params *)); -HIDE int eso_trigger_input __P((void *, void *, void *, int, - void (*)(void *), void *, struct audio_params *)); +HIDE int eso_trigger_output(void *, void *, void *, int, + void (*)(void *), void *, struct audio_params *); +HIDE int eso_trigger_input(void *, void *, void *, int, + void (*)(void *), void *, struct audio_params *); HIDE struct audio_hw_if eso_hw_if = { eso_open, diff --git a/sys/dev/pci/fms.c b/sys/dev/pci/fms.c index ede1b5da81e..ee56e5227da 100644 --- a/sys/dev/pci/fms.c +++ b/sys/dev/pci/fms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fms.c,v 1.7 2002/03/14 01:26:58 millert Exp $ */ +/* $OpenBSD: fms.c,v 1.8 2002/03/14 03:16:06 millert Exp $ */ /* $NetBSD: fms.c,v 1.5.4.1 2000/06/30 16:27:50 simonb Exp $ */ /*- @@ -97,10 +97,10 @@ void fms_free(void *, void *, int); size_t fms_round_buffersize(void *, int, size_t); paddr_t fms_mappage(void *, void *, off_t, int); int fms_get_props(void *); -int fms_trigger_output __P((void *, void *, void *, int, void (*)(void *), - void *, struct audio_params *)); -int fms_trigger_input __P((void *, void *, void *, int, void (*)(void *), - void *, struct audio_params *)); +int fms_trigger_output(void *, void *, void *, int, void (*)(void *), + void *, struct audio_params *); +int fms_trigger_input(void *, void *, void *, int, void (*)(void *), + void *, struct audio_params *); struct cfdriver fms_cd = { NULL, "fms", DV_DULL diff --git a/sys/dev/pci/i82365_pcivar.h b/sys/dev/pci/i82365_pcivar.h index 0052b3f2a53..b02fafc660b 100644 --- a/sys/dev/pci/i82365_pcivar.h +++ b/sys/dev/pci/i82365_pcivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i82365_pcivar.h,v 1.4 2002/03/14 01:26:58 millert Exp $ */ +/* $OpenBSD: i82365_pcivar.h,v 1.5 2002/03/14 03:16:06 millert Exp $ */ /* $NetBSD: i82365_pcivar.h,v 1.2 2000/02/22 16:04:47 thorpej Exp $ */ /* @@ -45,12 +45,11 @@ struct pcic_pci_softc { void *pcic_pci_machdep_intr_est(pci_chipset_tag_t); -void *pcic_pci_machdep_pcic_intr_establish __P((struct pcic_softc *, - int (*)(void *))); +void *pcic_pci_machdep_pcic_intr_establish(struct pcic_softc *, + int (*)(void *)); -void *pcic_pci_machdep_chip_intr_establish __P((pcmcia_chipset_handle_t, - struct pcmcia_function *, - int, int (*)(void *), - void *, char *)); -void pcic_pci_machdep_chip_intr_disestablish(pcmcia_chipset_handle_t, - void *); +void *pcic_pci_machdep_chip_intr_establish(pcmcia_chipset_handle_t, + struct pcmcia_function *, + int, int (*)(void *), + void *, char *); +void pcic_pci_machdep_chip_intr_disestablish(pcmcia_chipset_handle_t, void *); diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c index b7d8c9a1b7c..b3f6649fa21 100644 --- a/sys/dev/pci/if_de.c +++ b/sys/dev/pci/if_de.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_de.c,v 1.52 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: if_de.c,v 1.53 2002/03/14 03:16:06 millert Exp $ */ /* $NetBSD: if_de.c,v 1.45 1997/06/09 00:34:18 thorpej Exp $ */ /*- @@ -5025,7 +5025,7 @@ tulip_pci_shutdown( } #endif -static char* +static char * tulip_pci_probe( pcici_t config_id, pcidi_t device_id) @@ -5561,7 +5561,7 @@ tulip_pci_attach( #endif #if defined(__FreeBSD__) if ((sc->tulip_features & TULIP_HAVE_SLAVEDINTR) == 0) { - if (!pci_map_int (config_id, intr_rtn, (void*) sc, &net_imask)) { + if (!pci_map_int (config_id, intr_rtn, (void *) sc, &net_imask)) { printf(TULIP_PRINTF_FMT ": couldn't map interrupt\n", TULIP_PRINTF_ARGS); return; diff --git a/sys/dev/pci/if_txvar.h b/sys/dev/pci/if_txvar.h index 040569b54f1..500f62fe633 100644 --- a/sys/dev/pci/if_txvar.h +++ b/sys/dev/pci/if_txvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_txvar.h,v 1.11 2001/11/19 19:22:43 deraadt Exp $ */ +/* $OpenBSD: if_txvar.h,v 1.12 2002/03/14 03:16:06 millert Exp $ */ /* $FreeBSD: src/sys/pci/if_txvar.h,v 1.8 2001/02/07 20:11:02 semenu Exp $ */ /*- @@ -373,7 +373,7 @@ struct epic_type { #if defined(__OpenBSD__) #define epic_dev(sc) (*sc) -#define epic_dev_ptr(sc) (void*)(sc) +#define epic_dev_ptr(sc) (void *)(sc) #define epic_mii(sc) (sc->miibus) #define epic_mii_ptr(sc) (&sc->miibus) diff --git a/sys/dev/pci/ises.c b/sys/dev/pci/ises.c index f57772514b3..23eb3a3022b 100644 --- a/sys/dev/pci/ises.c +++ b/sys/dev/pci/ises.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ises.c,v 1.19 2002/03/14 01:26:59 millert Exp $ */ +/* $OpenBSD: ises.c,v 1.20 2002/03/14 03:16:06 millert Exp $ */ /* * Copyright (c) 2000, 2001 Håkan Olsson (ho@crt.se) @@ -68,9 +68,8 @@ void ises_initstate(void *); void ises_hrng_init(struct ises_softc *); void ises_hrng(void *); void ises_process_oqueue(struct ises_softc *); -int ises_queue_cmd __P((struct ises_softc *, u_int32_t, u_int32_t *, - u_int32_t (*)(struct ises_softc *, - struct ises_cmd *))); +int ises_queue_cmd(struct ises_softc *, u_int32_t, u_int32_t *, + u_int32_t (*)(struct ises_softc *, struct ises_cmd *)); u_int32_t ises_get_fwversion(struct ises_softc *); int ises_assert_cmd_mode(struct ises_softc *); diff --git a/sys/dev/pci/maestro.c b/sys/dev/pci/maestro.c index 21b6eba422a..ab9f122690e 100644 --- a/sys/dev/pci/maestro.c +++ b/sys/dev/pci/maestro.c @@ -1,4 +1,4 @@ -/* $OpenBSD: maestro.c,v 1.14 2002/03/14 01:26:59 millert Exp $ */ +/* $OpenBSD: maestro.c,v 1.15 2002/03/14 03:16:06 millert Exp $ */ /* $FreeBSD: /c/ncvs/src/sys/dev/sound/pci/maestro.c,v 1.3 2000/11/21 12:22:11 julian Exp $ */ /* * FreeBSD's ESS Agogo/Maestro driver @@ -182,10 +182,10 @@ void maestro_free(void *, void *, int); size_t maestro_round_buffersize(void *, int, size_t); paddr_t maestro_mappage(void *, void *, off_t, int); int maestro_get_props(void *); -int maestro_trigger_output __P((void *, void *, void *, int, void (*)(void *), - void *, struct audio_params *)); -int maestro_trigger_input __P((void *, void *, void *, int, void (*)(void *), - void *, struct audio_params *)); +int maestro_trigger_output(void *, void *, void *, int, void (*)(void *), + void *, struct audio_params *); +int maestro_trigger_input(void *, void *, void *, int, void (*)(void *), + void *, struct audio_params *); int maestro_attach_codec(void *, struct ac97_codec_if *); int maestro_read_codec(void *, u_int8_t, u_int16_t *); diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c index 2aa38f908f3..8cd4bbd8d42 100644 --- a/sys/dev/pci/ncr.c +++ b/sys/dev/pci/ncr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr.c,v 1.62 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: ncr.c,v 1.63 2002/03/14 03:16:06 millert Exp $ */ /* $NetBSD: ncr.c,v 1.63 1997/09/23 02:39:15 perry Exp $ */ /************************************************************************** @@ -1416,7 +1416,7 @@ static void ncr_int_ma (ncb_p np, u_char dstat); static void ncr_int_sir (ncb_p np); static void ncr_int_sto (ncb_p np); #ifdef __OpenBSD__ -static u_long ncr_lookup (char* id); +static u_long ncr_lookup (char *id); #endif static void ncr_min_phys (struct buf *bp); static void ncr_negotiate (struct ncb* np, struct tcb* tp); @@ -1448,7 +1448,7 @@ static int ncr_probe (struct device *, struct cfdata *, void *); #endif static void ncr_attach (struct device *, struct device *, void *); #else /* !__OpenBSD__ */ -static char* ncr_probe (pcici_t tag, pcidi_t type); +static char *ncr_probe (pcici_t tag, pcidi_t type); static void ncr_attach (pcici_t tag, int unit); #endif /* __OpenBSD__ */ @@ -1466,7 +1466,7 @@ static void ncr_attach (pcici_t tag, int unit); #if 0 static char ident[] = - "\n$OpenBSD: ncr.c,v 1.62 2001/11/06 19:53:19 miod Exp $\n"; + "\n$OpenBSD: ncr.c,v 1.63 2002/03/14 03:16:06 millert Exp $\n"; #endif static const u_long ncr_version = NCR_VERSION * 11 @@ -3559,7 +3559,7 @@ ncr_probe(parent, match, aux) #else /* !__OpenBSD__ */ -static char* ncr_probe (pcici_t tag, pcidi_t type) +static char *ncr_probe (pcici_t tag, pcidi_t type) { u_char rev = PCI_REVISION(pa->pa_class); int i; @@ -4491,7 +4491,7 @@ static int32_t ncr_start (struct scsi_xfer * xp) if (tp->quirks & QUIRK_UPDATE) { #ifdef __OpenBSD__ - tp->quirks = ncr_lookup ((char*) &tp->inqdata[0]); + tp->quirks = ncr_lookup ((char *) &tp->inqdata[0]); #else int q = xp->sc_link->quirks; tp->quirks = QUIRK_NOMSG; @@ -5069,7 +5069,7 @@ void ncr_complete (ncb_p np, ccb_p cp) xp->error = XS_SENSE; if (DEBUG_FLAGS & (DEBUG_RESULT|DEBUG_TINY)) { - u_char * p = (u_char*) & xp->sense; + u_char * p = (u_char *) & xp->sense; int i; printf ("\n%s: sense data:", ncr_name (np)); for (i=0; i<14; i++) printf (" %x", *p++); @@ -5122,7 +5122,7 @@ void ncr_complete (ncb_p np, ccb_p cp) int i; PRINT_ADDR(xp); printf (" CMD:"); - p = (u_char*) &xp->cmd->opcode; + p = (u_char *) &xp->cmd->opcode; for (i=0; i<xp->cmdlen; i++) printf (" %x", *p++); if (cp->host_status==HS_COMPLETE) { @@ -5132,7 +5132,7 @@ void ncr_complete (ncb_p np, ccb_p cp) break; case S_CHECK_COND: printf (" SENSE:"); - p = (u_char*) &xp->sense; + p = (u_char *) &xp->sense; for (i=0; i<xp->req_sense_length; i++) printf (" %x", *p++); break; @@ -6099,7 +6099,7 @@ void ncr_exception (ncb_p np) gettime(&np->regtime); #endif for (i=0; i<sizeof(np->regdump); i++) - ((char*)&np->regdump)[i] = INB_OFF(i); + ((char *)&np->regdump)[i] = INB_OFF(i); np->regdump.nc_dstat = dstat; np->regdump.nc_sist = sist; }; @@ -6442,7 +6442,7 @@ static void ncr_int_ma (ncb_p np, u_char dstat) oadr = READSCRIPT_OFF(vdsp_base, vdsp_off + 1*4); if (cmd & 0x10) { /* Table indirect */ - tblp = (u_int32_t *) ((char*) &cp->phys + oadr); + tblp = (u_int32_t *) ((char *) &cp->phys + oadr); olen = SCR_BO(tblp[0]); oadr = SCR_BO(tblp[1]); } else { diff --git a/sys/dev/pci/ncrstat.c b/sys/dev/pci/ncrstat.c index 7f1d7c7a8a7..ac64d5132ae 100644 --- a/sys/dev/pci/ncrstat.c +++ b/sys/dev/pci/ncrstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncrstat.c,v 1.3 1997/02/23 06:06:25 millert Exp $ */ +/* $OpenBSD: ncrstat.c,v 1.4 2002/03/14 03:16:06 millert Exp $ */ /* $NetBSD: ncrstat.c,v 1.7 1996/03/17 00:55:36 thorpej Exp $ */ /************************************************************************** @@ -66,14 +66,12 @@ #if defined(__NetBSD__) || defined(__OpenBSD__) || (__FreeBSD__ >= 2) kvm_t *kvm; #define KVM_NLIST(n) (kvm_nlist(kvm, (n)) >= 0) -#define KVM_READ(o, p, l) (kvm_read(kvm, (o), (void*)(p), (l)) == (l)) +#define KVM_READ(o, p, l) (kvm_read(kvm, (o), (void *)(p), (l)) == (l)) #else #define KVM_NLIST(n) (kvm_nlist((n)) >= 0) -#define KVM_READ(o, p, l) (kvm_read((void*)(o), (p), (l)) == (l)) +#define KVM_READ(o, p, l) (kvm_read((void *)(o), (p), (l)) == (l)) #endif -extern void exit(); -extern char* strerror (int num); /*=========================================================== ** @@ -314,7 +312,7 @@ void set_lun_mask(struct tcb * tp) if (tp->lp[l]) lun_mask |= (1<<l); } -void printc (u_char*p, int l) +void printc (u_char *p, int l) { for (;l>0;l--) { char c=*p++; @@ -421,7 +419,7 @@ do_info(void) if (verbose<1) continue; for (i=0; i<8; i++) { - char* (class[10])={ + char *(class[10])={ "disk","tape","printer","processor", "worm", "cdrom", "scanner", "optical disk", "media changer", "communication device"}; @@ -625,7 +623,7 @@ do_profile(void) */ static int kernelwritefile; -static char* kernelwritefilename = _PATH_KMEM; +static char *kernelwritefilename = _PATH_KMEM; void openkernelwritefile(void) { @@ -743,7 +741,7 @@ void do_set (char * arg) }; if (!strncmp(arg, "wide=", 5)) { - u_char t = strtoul (arg+5, (char**)0, 0); + u_char t = strtoul (arg+5, (char **)0, 0); if (t<=1) { user.data = t; user.cmd = UC_SETWIDE; @@ -751,7 +749,7 @@ void do_set (char * arg) }; if (!strncmp(arg, "tags=", 5)) { - u_char t = strtoul (arg+5, (char**)0, 0); + u_char t = strtoul (arg+5, (char **)0, 0); if (t<=SCSI_NCR_MAX_TAGS) { user.data = t; user.cmd = UC_SETTAGS; @@ -759,7 +757,7 @@ void do_set (char * arg) }; if (!strncmp(arg, "flags=", 6)) { - u_char t = strtoul (arg+6, (char**)0, 0); + u_char t = strtoul (arg+6, (char **)0, 0); if (t<=0xff) { user.data = t; user.cmd = UC_SETFLAG; @@ -767,7 +765,7 @@ void do_set (char * arg) }; if (!strncmp(arg, "debug=", 6)) { - user.data = strtoul (arg+6, (char**)0, 0); + user.data = strtoul (arg+6, (char **)0, 0); user.cmd = UC_SETDEBUG; }; @@ -979,7 +977,7 @@ void dump_table (const char * str, struct scr_tblmove * p, int l) }; } -void dump_link (const char* name, struct link * link) +void dump_link (const char *name, struct link * link) { printf ("%s: cmd=%08x pa=%08x %s\n", name, link->l_cmd, link->l_paddr, sn(link->l_paddr)); @@ -994,7 +992,7 @@ void dump_link (const char* name, struct link * link) **================================================================ */ -void dump_tstamp (const char* name, struct tstamp * p) +void dump_tstamp (const char *name, struct tstamp * p) #define P(id,fld)\ if (p->fld.tv_sec) \ printf ("%s: "id" at %s.%06d",\ @@ -1014,7 +1012,7 @@ void dump_tstamp (const char* name, struct tstamp * p) -void dump_profile (const char* name, struct profile * p) +void dump_profile (const char *name, struct profile * p) { printf ("%s: %10d transfers.\n" ,name,p->num_trans); printf ("%s: %10d bytes transferred.\n",name,p->num_bytes); @@ -1040,11 +1038,11 @@ void dump_profile (const char* name, struct profile * p) static void dump_reg(struct ncr_reg * rp) { - u_char *reg = (u_char*) rp; + u_char *reg = (u_char *) rp; #define l(i) (reg[i]+(reg[i+1]<<8ul)+(reg[i+2]<<16ul)+(reg[i+3]<<24ul)) int ad; - char*(phasename[8])={"DATA-OUT","DATA-IN","COMMAND","STATUS", + char *(phasename[8])={"DATA-OUT","DATA-IN","COMMAND","STATUS", "ILG-OUT","ILG-IN","MESSAGE-OUT","MESSAGE-IN"}; for (ad=0x00;ad<0x80;ad++) { switch (ad % 16) { diff --git a/sys/dev/pci/neo.c b/sys/dev/pci/neo.c index 7028678630a..91eb3d5064a 100644 --- a/sys/dev/pci/neo.c +++ b/sys/dev/pci/neo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: neo.c,v 1.11 2002/03/14 01:26:59 millert Exp $ */ +/* $OpenBSD: neo.c,v 1.12 2002/03/14 03:16:06 millert Exp $ */ /* * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk> @@ -183,10 +183,10 @@ void neo_close(void *); int neo_query_encoding(void *, struct audio_encoding *); int neo_set_params(void *, int, int, struct audio_params *, struct audio_params *); int neo_round_blocksize(void *, int); -int neo_trigger_output __P((void *, void *, void *, int, void (*)(void *), - void *, struct audio_params *)); -int neo_trigger_input __P((void *, void *, void *, int, void (*)(void *), - void *, struct audio_params *)); +int neo_trigger_output(void *, void *, void *, int, void (*)(void *), + void *, struct audio_params *); +int neo_trigger_input(void *, void *, void *, int, void (*)(void *), + void *, struct audio_params *); int neo_halt_output(void *); int neo_halt_input(void *); int neo_getdev(void *, struct audio_device *); @@ -922,7 +922,7 @@ neo_trigger_output(addr, start, end, blksize, intr, arg, param) if (param->channels == 2) ssz <<= 1; - sc->pbufsize = ((char*)end - (char *)start); + sc->pbufsize = ((char *)end - (char *)start); sc->pblksize = blksize; sc->pwmark = blksize; @@ -958,7 +958,7 @@ neo_trigger_input(addr, start, end, blksize, intr, arg, param) if (param->channels == 2) ssz <<= 1; - sc->rbufsize = ((char*)end - (char *)start); + sc->rbufsize = ((char *)end - (char *)start); sc->rblksize = blksize; sc->rwmark = blksize; diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c index b00de73180b..c49199c58ab 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccbb.c,v 1.29 2002/03/14 01:26:59 millert Exp $ */ +/* $OpenBSD: pccbb.c,v 1.30 2002/03/14 03:16:06 millert Exp $ */ /* $NetBSD: pccbb.c,v 1.42 2000/06/16 23:41:35 cgd Exp $ */ /* @@ -122,12 +122,12 @@ int pccbb_io_close(cardbus_chipset_tag_t, int); int pccbb_mem_open(cardbus_chipset_tag_t, int, u_int32_t, u_int32_t); int pccbb_mem_close(cardbus_chipset_tag_t, int); #endif /* !rbus */ -void *pccbb_intr_establish __P((struct pccbb_softc *, int irq, int level, - int (*ih) (void *), void *sc)); +void *pccbb_intr_establish(struct pccbb_softc *, int irq, int level, + int (*ih) (void *), void *sc); void pccbb_intr_disestablish(struct pccbb_softc *, void *ih); -void *pccbb_cb_intr_establish __P((cardbus_chipset_tag_t, int irq, int level, - int (*ih) (void *), void *sc)); +void *pccbb_cb_intr_establish(cardbus_chipset_tag_t, int irq, int level, + int (*ih) (void *), void *sc); void pccbb_cb_intr_disestablish(cardbus_chipset_tag_t ct, void *ih); cardbustag_t pccbb_make_tag(cardbus_chipset_tag_t, int, int, int); @@ -151,8 +151,8 @@ void pccbb_pcmcia_io_free(pcmcia_chipset_handle_t, int pccbb_pcmcia_io_map(pcmcia_chipset_handle_t, int, bus_addr_t, bus_size_t, struct pcmcia_io_handle *, int *); void pccbb_pcmcia_io_unmap(pcmcia_chipset_handle_t, int); -void *pccbb_pcmcia_intr_establish __P((pcmcia_chipset_handle_t, - struct pcmcia_function *, int, int (*)(void *), void *, char *)); +void *pccbb_pcmcia_intr_establish(pcmcia_chipset_handle_t, + struct pcmcia_function *, int, int (*)(void *), void *, char *); void pccbb_pcmcia_intr_disestablish(pcmcia_chipset_handle_t, void *); void pccbb_pcmcia_socket_enable(pcmcia_chipset_handle_t); diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index 74ef9444af7..44992997aee 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide.c,v 1.80 2002/03/14 01:26:59 millert Exp $ */ +/* $OpenBSD: pciide.c,v 1.81 2002/03/14 03:16:06 millert Exp $ */ /* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */ /* @@ -244,9 +244,9 @@ int acard_pci_intr(void *); void pciide_channel_dma_setup(struct pciide_channel *); int pciide_dma_table_setup(struct pciide_softc*, int, int); -int pciide_dma_init(void*, int, int, void *, size_t, int); -void pciide_dma_start(void*, int, int); -int pciide_dma_finish(void*, int, int); +int pciide_dma_init(void *, int, int, void *, size_t, int); +void pciide_dma_start(void *, int, int); +int pciide_dma_finish(void *, int, int); void pciide_irqack(struct channel_softc *); void pciide_print_modes(struct pciide_channel *); void pciide_print_channels(int, pcireg_t);; @@ -501,15 +501,15 @@ struct cfdriver pciide_cd = { int pciide_chipen(struct pciide_softc *, struct pci_attach_args *); int pciide_mapregs_compat( struct pci_attach_args *, struct pciide_channel *, int, bus_size_t *, bus_size_t*); -int pciide_mapregs_native __P((struct pci_attach_args *, +int pciide_mapregs_native(struct pci_attach_args *, struct pciide_channel *, bus_size_t *, bus_size_t *, - int (*pci_intr)(void *))); + int (*pci_intr)(void *)); void pciide_mapreg_dma(struct pciide_softc *, struct pci_attach_args *); int pciide_chansetup(struct pciide_softc *, int, pcireg_t); -void pciide_mapchan __P((struct pci_attach_args *, +void pciide_mapchan(struct pci_attach_args *, struct pciide_channel *, pcireg_t, bus_size_t *, bus_size_t *, - int (*pci_intr)(void *))); + int (*pci_intr)(void *)); int pciide_chan_candisable(struct pciide_channel *); void pciide_map_compat_intr( struct pci_attach_args *, struct pciide_channel *, int, int); diff --git a/sys/dev/pci/pciidevar.h b/sys/dev/pci/pciidevar.h index 4afc1188cae..4c1bdd225aa 100644 --- a/sys/dev/pci/pciidevar.h +++ b/sys/dev/pci/pciidevar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pciidevar.h,v 1.5 2002/03/14 01:26:59 millert Exp $ */ +/* $OpenBSD: pciidevar.h,v 1.6 2002/03/14 03:16:06 millert Exp $ */ /* $NetBSD: pciidevar.h,v 1.6 2001/01/12 16:04:00 bouyer Exp $ */ /* @@ -44,7 +44,7 @@ struct device; */ /* Attach compat interrupt handler, returning handle or NULL if failed. */ -void *pciide_machdep_compat_intr_establish __P((struct device *, - struct pci_attach_args *, int, int (*)(void *), void *)); +void *pciide_machdep_compat_intr_establish(struct device *, + struct pci_attach_args *, int, int (*)(void *), void *); void pciide_machdep_compat_intr_disestablish(pci_chipset_tag_t pc, void *); diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index 3759041e5dc..c9419191ede 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcivar.h,v 1.23 2002/03/14 01:26:59 millert Exp $ */ +/* $OpenBSD: pcivar.h,v 1.24 2002/03/14 03:16:06 millert Exp $ */ /* $NetBSD: pcivar.h,v 1.23 1997/06/06 23:48:05 thorpej Exp $ */ /* @@ -186,9 +186,9 @@ int pci_get_capability(pci_chipset_tag_t, pcitag_t, int, * Helper functions for autoconfiguration. */ void pci_devinfo(pcireg_t, pcireg_t, int, char *); -void set_pci_isa_bridge_callback __P((void (*)(void *), void *)); -const struct pci_quirkdata * - pci_lookup_quirkdata(pci_vendor_id_t, pci_product_id_t); +void set_pci_isa_bridge_callback(void (*)(void *), void *); +const struct pci_quirkdata *pci_lookup_quirkdata(pci_vendor_id_t, + pci_product_id_t); /* * Misc. diff --git a/sys/dev/pci/sv.c b/sys/dev/pci/sv.c index 94be98d11a6..2931916fba7 100644 --- a/sys/dev/pci/sv.c +++ b/sys/dev/pci/sv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sv.c,v 1.12 2002/03/14 01:27:00 millert Exp $ */ +/* $OpenBSD: sv.c,v 1.13 2002/03/14 03:16:06 millert Exp $ */ /* * Copyright (c) 1998 Constantine Paul Sapuntzakis @@ -149,8 +149,8 @@ int sv_set_params(void *, int, int, struct audio_params *, struct audio_params * int sv_round_blocksize(void *, int); int sv_dma_init_output(void *, void *, int); int sv_dma_init_input(void *, void *, int); -int sv_dma_output __P((void *, void *, int, void (*)(void *), void*)); -int sv_dma_input __P((void *, void *, int, void (*)(void *), void*)); +int sv_dma_output(void *, void *, int, void (*)(void *), void *); +int sv_dma_input(void *, void *, int, void (*)(void *), void *); int sv_halt_in_dma(void *); int sv_halt_out_dma(void *); int sv_getdev(void *, struct audio_device *); diff --git a/sys/dev/pci/tga.c b/sys/dev/pci/tga.c index 977aa824287..d47937eb5b7 100644 --- a/sys/dev/pci/tga.c +++ b/sys/dev/pci/tga.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tga.c,v 1.11 2002/03/14 01:27:00 millert Exp $ */ +/* $OpenBSD: tga.c,v 1.12 2002/03/14 03:16:06 millert Exp $ */ /* $NetBSD: tga.c,v 1.31 2001/02/11 19:34:58 nathanw Exp $ */ /* @@ -90,8 +90,8 @@ static void tga_copycols(void *, int, int, int, int); static int tga_alloc_screen(void *, const struct wsscreen_descr *, void **, int *, int *, long *); static void tga_free_screen(void *, void *); -static int tga_show_screen __P((void *, void *, int, - void (*) (void *, int, int), void *)); +static int tga_show_screen(void *, void *, int, + void (*) (void *, int, int), void *); static int tga_rop(struct rasops_info *, int, int, int, int, int, struct rasops_info *, int, int); static int tga_rop_vtov(struct rasops_info *, int, int, int, int, @@ -105,7 +105,7 @@ void tga2_init(struct tga_devconfig *, int); void tga_config_interrupts(struct device *); /* RAMDAC interface functions */ -int tga_sched_update __P((void *, void (*)(void *))); +int tga_sched_update(void *, void (*)(void *)); void tga_ramdac_wr(void *, u_int, u_int8_t); u_int8_t tga_ramdac_rd(void *, u_int); void tga_bt463_wr(void *, u_int, u_int8_t); diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c index 973bd7b461c..9506cf1b772 100644 --- a/sys/dev/pci/yds.c +++ b/sys/dev/pci/yds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: yds.c,v 1.14 2002/03/14 01:27:00 millert Exp $ */ +/* $OpenBSD: yds.c,v 1.15 2002/03/14 03:16:06 millert Exp $ */ /* $NetBSD: yds.c,v 1.5 2001/05/21 23:55:04 minoura Exp $ */ /* @@ -162,10 +162,10 @@ int yds_query_encoding(void *, struct audio_encoding *); int yds_set_params(void *, int, int, struct audio_params *, struct audio_params *); int yds_round_blocksize(void *, int); -int yds_trigger_output __P((void *, void *, void *, int, void (*)(void *), - void *, struct audio_params *)); -int yds_trigger_input __P((void *, void *, void *, int, void (*)(void *), - void *, struct audio_params *)); +int yds_trigger_output(void *, void *, void *, int, void (*)(void *), + void *, struct audio_params *); +int yds_trigger_input(void *, void *, void *, int, void (*)(void *), + void *, struct audio_params *); int yds_halt_output(void *); int yds_halt_input(void *); int yds_getdev(void *, struct audio_device *); @@ -301,10 +301,10 @@ yds_dump_play_slot(sc, bank) p = (u_int32_t *)sc->pbankp[i]; - dma = yds_find_dma(sc,(void*)p); + dma = yds_find_dma(sc,(void *)p); printf(" pbankp[%d] : %p(%p)\n", - i, p, (void*)vtophys((vaddr_t)p)); + i, p, (void *)vtophys((vaddr_t)p)); for (j = 0; j < sizeof(struct play_slot_ctrl_bank) / sizeof(u_int32_t); j++) { printf(" 0x%02x: 0x%08x\n", @@ -449,7 +449,7 @@ yds_allocate_slots(sc) da = DMAADDR(p); DPRINTF(("mp:%p, DMA addr:%p\n", - mp, (void*) sc->sc_ctrldata.map->dm_segs[0].ds_addr)); + mp, (void *) sc->sc_ctrldata.map->dm_segs[0].ds_addr)); bzero(mp, memsize); diff --git a/sys/dev/pckbc/pckbdvar.h b/sys/dev/pckbc/pckbdvar.h index f8d28b78d64..bcb8f9534b5 100644 --- a/sys/dev/pckbc/pckbdvar.h +++ b/sys/dev/pckbc/pckbdvar.h @@ -1,6 +1,6 @@ -/* $OpenBSD: pckbdvar.h,v 1.2 2002/03/14 01:27:00 millert Exp $ */ +/* $OpenBSD: pckbdvar.h,v 1.3 2002/03/14 03:16:07 millert Exp $ */ /* $NetBSD: pckbdvar.h,v 1.3 2000/03/10 06:10:35 thorpej Exp $ */ int pckbd_cnattach(pckbc_tag_t, int); -void pckbd_hookup_bell __P((void (*fn)(void *, u_int, u_int, u_int, int), - void *)); +void pckbd_hookup_bell(void (*fn)(void *, u_int, u_int, u_int, int), + void *); diff --git a/sys/dev/pcmcia/pcmciachip.h b/sys/dev/pcmcia/pcmciachip.h index 8d2f7e59758..47882bd6515 100644 --- a/sys/dev/pcmcia/pcmciachip.h +++ b/sys/dev/pcmcia/pcmciachip.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcmciachip.h,v 1.5 2002/03/14 01:27:01 millert Exp $ */ +/* $OpenBSD: pcmciachip.h,v 1.6 2002/03/14 03:16:07 millert Exp $ */ /* $NetBSD: pcmciachip.h,v 1.5 2000/01/13 08:58:51 joda Exp $ */ /* @@ -82,8 +82,8 @@ struct pcmcia_chip_functions { void (*io_unmap)(pcmcia_chipset_handle_t, int); /* interrupt glue */ - void *(*intr_establish) __P((pcmcia_chipset_handle_t, - struct pcmcia_function *, int, int (*)(void *), void *, char *)); + void *(*intr_establish)(pcmcia_chipset_handle_t, + struct pcmcia_function *, int, int (*)(void *), void *, char *); void (*intr_disestablish)(pcmcia_chipset_handle_t, void *); /* card enable/disable */ diff --git a/sys/dev/pcmcia/pcmciavar.h b/sys/dev/pcmcia/pcmciavar.h index 2fb33111c21..8f1fb59acf0 100644 --- a/sys/dev/pcmcia/pcmciavar.h +++ b/sys/dev/pcmcia/pcmciavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcmciavar.h,v 1.15 2002/03/14 01:27:01 millert Exp $ */ +/* $OpenBSD: pcmciavar.h,v 1.16 2002/03/14 03:16:07 millert Exp $ */ /* $NetBSD: pcmciavar.h,v 1.5 1998/07/19 17:28:17 christos Exp $ */ /* @@ -202,8 +202,8 @@ struct pcmcia_tuple { void pcmcia_read_cis(struct pcmcia_softc *); void pcmcia_check_cis_quirks(struct pcmcia_softc *); void pcmcia_print_cis(struct pcmcia_softc *); -int pcmcia_scan_cis __P((struct device * dev, - int (*) (struct pcmcia_tuple *, void *), void *)); +int pcmcia_scan_cis(struct device * dev, + int (*) (struct pcmcia_tuple *, void *), void *); #define pcmcia_cis_read_1(tuple, idx0) \ (bus_space_read_1((tuple)->memt, (tuple)->memh, (tuple)->mult*(idx0))) @@ -272,6 +272,6 @@ int pcmcia_io_map(struct pcmcia_function *, int, bus_addr_t, #define pcmcia_mem_unmap(pf, window) \ (pcmcia_chip_mem_unmap((pf)->sc->pct, (pf)->sc->pch, (window))) -void *pcmcia_intr_establish __P((struct pcmcia_function *, int, - int (*) (void *), void *, char *)); +void *pcmcia_intr_establish(struct pcmcia_function *, int, + int (*) (void *), void *, char *); void pcmcia_intr_disestablish(struct pcmcia_function *, void *); diff --git a/sys/dev/raidframe/rf_engine.c b/sys/dev/raidframe/rf_engine.c index c3e3f77acee..af2306894bf 100644 --- a/sys/dev/raidframe/rf_engine.c +++ b/sys/dev/raidframe/rf_engine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rf_engine.c,v 1.10 2002/03/08 09:25:57 tdeval Exp $ */ +/* $OpenBSD: rf_engine.c,v 1.11 2002/03/14 03:16:07 millert Exp $ */ /* $NetBSD: rf_engine.c,v 1.10 2000/08/20 16:51:03 thorpej Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. @@ -151,11 +151,11 @@ rf_ConfigureEngine( } if (rf_hook_cookies == NULL) { rf_hook_cookies = - malloc(numraid * sizeof(void*), + malloc(numraid * sizeof(void *), M_RAIDFRAME, M_NOWAIT); if (rf_hook_cookies == NULL) return (ENOMEM); - bzero(rf_hook_cookies, numraid * sizeof(void*)); + bzero(rf_hook_cookies, numraid * sizeof(void *)); } #ifdef RAID_AUTOCONFIG if (initproc == NULL) { @@ -795,7 +795,7 @@ DAGExecutionThread(RF_ThreadArg_t arg) raidPtr = (RF_Raid_t *) arg; while (!(&raidPtr->engine_tg)->created) - (void) tsleep((void*)&(&raidPtr->engine_tg)->created, PWAIT, + (void) tsleep((void *)&(&raidPtr->engine_tg)->created, PWAIT, "raidinit", 0); if (rf_engineDebug) { @@ -808,7 +808,7 @@ DAGExecutionThread(RF_ThreadArg_t arg) RF_THREADGROUP_RUNNING(&raidPtr->engine_tg); rf_hook_cookies[raidPtr->raidid] = - shutdownhook_establish(rf_shutdown_hook, (void*)raidPtr); + shutdownhook_establish(rf_shutdown_hook, (void *)raidPtr); DO_LOCK(raidPtr); while (!raidPtr->shutdown_engine) { diff --git a/sys/dev/raidframe/rf_openbsdkintf.c b/sys/dev/raidframe/rf_openbsdkintf.c index 73db0810d60..36d5f4125e1 100644 --- a/sys/dev/raidframe/rf_openbsdkintf.c +++ b/sys/dev/raidframe/rf_openbsdkintf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rf_openbsdkintf.c,v 1.15 2002/03/14 01:27:01 millert Exp $ */ +/* $OpenBSD: rf_openbsdkintf.c,v 1.16 2002/03/14 03:16:07 millert Exp $ */ /* $NetBSD: rf_netbsdkintf.c,v 1.109 2001/07/27 03:30:07 oster Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -173,9 +173,9 @@ static RF_SparetWait_t *rf_sparet_resp_queue; /* prototypes */ void rf_KernelWakeupFunc(struct buf *); -void rf_InitBP __P((struct buf *, struct vnode *, unsigned, dev_t, +void rf_InitBP(struct buf *, struct vnode *, unsigned, dev_t, RF_SectorNum_t, RF_SectorCount_t, caddr_t, void (*)(struct buf *), - void *, int, struct proc *)); + void *, int, struct proc *); void raidinit(RF_Raid_t *); void raidattach(int); diff --git a/sys/dev/rcons/raster.h b/sys/dev/rcons/raster.h index c8e4f54f92b..29f247875ba 100644 --- a/sys/dev/rcons/raster.h +++ b/sys/dev/rcons/raster.h @@ -1,4 +1,4 @@ -/* $OpenBSD: raster.h,v 1.3 1997/11/07 08:07:38 niklas Exp $ */ +/* $OpenBSD: raster.h,v 1.4 2002/03/14 03:16:07 millert Exp $ */ /* $NetBSD: raster.h,v 1.3 1995/11/24 23:50:51 cgd Exp $ */ /*- @@ -95,9 +95,9 @@ struct raster { /* Colormap struct. */ struct raster_colormap { int length; - u_char* red; - u_char* grn; - u_char* blu; + u_char *red; + u_char *grn; + u_char *blu; }; /* Font character struct. */ @@ -210,13 +210,13 @@ extern int raster_replsrc ARGS(( struct raster* dst, int dx, int dy, int w, int /* Raster text routines */ -extern struct raster_font* raster_fontopen ARGS(( char* fontname )); +extern struct raster_font* raster_fontopen ARGS(( char *fontname )); /* Opens a font. Returns (struct raster_font*) 0 on failure. */ -extern int raster_text ARGS(( struct raster* r, int x, int y, int rop, struct raster_font* rf, unsigned char* text )); +extern int raster_text ARGS(( struct raster* r, int x, int y, int rop, struct raster_font* rf, unsigned char *text )); /* Draws text. Returns 0 on success, -1 on failure. */ -extern int raster_textn ARGS(( struct raster* r, int x, int y, int rop, struct raster_font* rf, unsigned char* text, int len )); +extern int raster_textn ARGS(( struct raster* r, int x, int y, int rop, struct raster_font* rf, unsigned char *text, int len )); /* Draws n characters of text. Returns 0 on success, -1 on failure. */ extern void raster_fontclose ARGS(( struct raster_font* rf )); @@ -225,7 +225,7 @@ extern void raster_fontclose ARGS(( struct raster_font* rf )); /* Frame buffer routines. */ -extern struct raster* raster_open ARGS(( char* fbname )); +extern struct raster* raster_open ARGS(( char *fbname )); /* Opens a frame buffer as a raster. Returns (struct raster*) 0 on failure. */ extern struct raster* raster_coloropen ARGS(( void )); diff --git a/sys/dev/rcons/raster_op.c b/sys/dev/rcons/raster_op.c index 17a7eaaf2e5..937dc776ed3 100644 --- a/sys/dev/rcons/raster_op.c +++ b/sys/dev/rcons/raster_op.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raster_op.c,v 1.4 2002/03/14 01:27:02 millert Exp $ */ +/* $OpenBSD: raster_op.c,v 1.5 2002/03/14 03:16:07 millert Exp $ */ /* $NetBSD: raster_op.c,v 1.4 1996/03/14 19:02:30 christos Exp $ */ /*- @@ -623,7 +623,7 @@ raster_op_noclip( dst, dx, dy, w, h, rop, src, sx, sy ) src->linelongs == dst->linelongs && src->linelongs == w >> 5 ) { bcopy( - (char*) srclin1, (char*) dstlin1, + (char *) srclin1, (char *) dstlin1, h * src->linelongs * sizeof(u_int32_t) ); return 0; } @@ -732,7 +732,7 @@ raster_op_noclip( dst, dx, dy, w, h, rop, src, sx, sy ) if ( op == RAS_SRC && src->width == w && dst->width == w && src->linelongs == dst->linelongs && src->linelongs == w >> 2 ) { - bcopy( (char*) srclin1, (char*) dstlin1, + bcopy( (char *) srclin1, (char *) dstlin1, h * src->linelongs * sizeof(u_int32_t) ); return 0; } @@ -782,7 +782,7 @@ raster_op_nosrc_noclip( dst, dx, dy, w, h, rop ) /* Special-case full-width clears. */ if ( op == RAS_CLEAR && dst->width == w && dst->linelongs == w >> 5 ) { - bzero( (char*) dstlin1, h * dst->linelongs * sizeof(u_int32_t) ); + bzero( (char *) dstlin1, h * dst->linelongs * sizeof(u_int32_t) ); return 0; } #endif /*BCOPY_FASTER*/ @@ -877,7 +877,7 @@ raster_op_nosrc_noclip( dst, dx, dy, w, h, rop ) /* Special-case full-width clears. */ if ( op == RAS_CLEAR && dst->width == w && dst->linelongs == w >> 2 ) { - bzero( (char*) dstlin1, h * dst->linelongs * sizeof(u_int32_t) ); + bzero( (char *) dstlin1, h * dst->linelongs * sizeof(u_int32_t) ); return 0; } #endif /*BCOPY_FASTER*/ diff --git a/sys/dev/rcons/raster_text.c b/sys/dev/rcons/raster_text.c index 5b0188c1296..23133ce12a3 100644 --- a/sys/dev/rcons/raster_text.c +++ b/sys/dev/rcons/raster_text.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raster_text.c,v 1.3 1997/11/07 08:07:39 niklas Exp $ */ +/* $OpenBSD: raster_text.c,v 1.4 2002/03/14 03:16:07 millert Exp $ */ /* $NetBSD: raster_text.c,v 1.3 1995/11/24 23:50:56 cgd Exp $ */ /*- @@ -69,7 +69,7 @@ raster_text( r, x, y, rop, rf, text ) int x, y; int rop; struct raster_font* rf; - unsigned char* text; + unsigned char *text; { return raster_textn( r, x, y, rop, rf, text, strlen( text ) ); } @@ -81,12 +81,12 @@ raster_textn( r, x, y, rop, rf, text, n ) int x, y; int rop; struct raster_font* rf; - unsigned char* text; + unsigned char *text; int n; { int clip; int x1, y1; - struct raster_char* c; + struct raster_char *c; struct raster* charrast; int i; register unsigned char ch; diff --git a/sys/dev/sbus/cgsix.c b/sys/dev/sbus/cgsix.c index 70128ff6f99..56d00a01e27 100644 --- a/sys/dev/sbus/cgsix.c +++ b/sys/dev/sbus/cgsix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgsix.c,v 1.16 2002/03/14 01:27:02 millert Exp $ */ +/* $OpenBSD: cgsix.c,v 1.17 2002/03/14 03:16:07 millert Exp $ */ /* * Copyright (c) 2001 Jason L. Wright (jason@thought.net) @@ -223,8 +223,8 @@ int cgsix_ioctl(void *, u_long, caddr_t, int, struct proc *); int cgsix_alloc_screen(void *, const struct wsscreen_descr *, void **, int *, int *, long *); void cgsix_free_screen(void *, void *); -int cgsix_show_screen __P((void *, void *, int, - void (*cb)(void *, int, int), void *)); +int cgsix_show_screen(void *, void *, int, void (*cb)(void *, int, int), + void *); paddr_t cgsix_mmap(void *, off_t, int); int cgsix_is_console(int); int cg6_bt_getcmap(union bt_cmap *, struct wsdisplay_cmap *); diff --git a/sys/dev/sbus/cgthree.c b/sys/dev/sbus/cgthree.c index 9cefaa6a0c0..e6bc5ef72c3 100644 --- a/sys/dev/sbus/cgthree.c +++ b/sys/dev/sbus/cgthree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgthree.c,v 1.12 2002/03/14 01:27:02 millert Exp $ */ +/* $OpenBSD: cgthree.c,v 1.13 2002/03/14 03:16:07 millert Exp $ */ /* * Copyright (c) 2001 Jason L. Wright (jason@thought.net) @@ -160,8 +160,8 @@ int cgthree_ioctl(void *, u_long, caddr_t, int, struct proc *); int cgthree_alloc_screen(void *, const struct wsscreen_descr *, void **, int *, int *, long *); void cgthree_free_screen(void *, void *); -int cgthree_show_screen __P((void *, void *, int, - void (*cb)(void *, int, int), void *)); +int cgthree_show_screen(void *, void *, int, void (*cb)(void *, int, int), + void *); paddr_t cgthree_mmap(void *, off_t, int); int cgthree_is_console(int); void cgthree_loadcmap(struct cgthree_softc *, u_int, u_int); diff --git a/sys/dev/sbus/cs4231.c b/sys/dev/sbus/cs4231.c index 92f8ccb7b95..080a287fa07 100644 --- a/sys/dev/sbus/cs4231.c +++ b/sys/dev/sbus/cs4231.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4231.c,v 1.10 2002/03/14 01:27:02 millert Exp $ */ +/* $OpenBSD: cs4231.c,v 1.11 2002/03/14 03:16:07 millert Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -146,10 +146,10 @@ void * cs4231_alloc(void *, int, size_t, int, int); void cs4231_free(void *, void *, int); size_t cs4231_round_buffersize(void *, int, size_t); int cs4231_get_props(void *); -int cs4231_trigger_output __P((void *, void *, void *, int, - void (*intr)(void *), void *arg, struct audio_params *)); -int cs4231_trigger_input __P((void *, void *, void *, int, - void (*intr)(void *), void *arg, struct audio_params *)); +int cs4231_trigger_output(void *, void *, void *, int, + void (*intr)(void *), void *arg, struct audio_params *); +int cs4231_trigger_input(void *, void *, void *, int, + void (*intr)(void *), void *arg, struct audio_params *); struct audio_hw_if cs4231_sa_hw_if = { cs4231_open, diff --git a/sys/dev/sbus/cs4231var.h b/sys/dev/sbus/cs4231var.h index af365190b2f..98f66be8f7b 100644 --- a/sys/dev/sbus/cs4231var.h +++ b/sys/dev/sbus/cs4231var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4231var.h,v 1.2 2001/10/01 04:10:49 jason Exp $ */ +/* $OpenBSD: cs4231var.h,v 1.3 2002/03/14 03:16:07 millert Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -64,9 +64,9 @@ struct cs4231_softc { int sc_open; /* already open? */ int sc_locked; /* locked? */ - void (*sc_rintr)(void*); /* input completion intr handler */ + 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_pintr)(void *); /* output completion intr handler */ void * sc_parg; /* arg for sc_pintr() */ char sc_mute[9]; /* which devs are muted */ diff --git a/sys/dev/sbus/dma_sbus.c b/sys/dev/sbus/dma_sbus.c index 59c54491843..1f6420f80c7 100644 --- a/sys/dev/sbus/dma_sbus.c +++ b/sys/dev/sbus/dma_sbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dma_sbus.c,v 1.6 2002/03/14 01:27:02 millert Exp $ */ +/* $OpenBSD: dma_sbus.c,v 1.7 2002/03/14 03:16:07 millert Exp $ */ /* $NetBSD: dma_sbus.c,v 1.5 2000/07/09 20:57:42 pk Exp $ */ /*- @@ -99,13 +99,13 @@ void dmaattach_sbus(struct device *, struct device *, void *); int dmaprint_sbus(void *, const char *); -void *dmabus_intr_establish __P(( +void *dmabus_intr_establish( bus_space_tag_t, int, /*bus interrupt priority*/ int, /*`device class' level*/ int, /*flags*/ int (*)(void *), /*handler*/ - void *)); /*handler arg*/ + void *); /*handler arg*/ static bus_space_tag_t dma_alloc_bustag(struct dma_softc *sc); diff --git a/sys/dev/sbus/esp_sbus.c b/sys/dev/sbus/esp_sbus.c index 816bd91ec7f..0a8e4f1aaa8 100644 --- a/sys/dev/sbus/esp_sbus.c +++ b/sys/dev/sbus/esp_sbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esp_sbus.c,v 1.6 2002/03/14 01:27:02 millert Exp $ */ +/* $OpenBSD: esp_sbus.c,v 1.7 2002/03/14 03:16:07 millert Exp $ */ /* $NetBSD: esp_sbus.c,v 1.14 2001/04/25 17:53:37 bouyer Exp $ */ /*- @@ -725,7 +725,7 @@ esp_dma_isactive(sc) #include <machine/db_machdep.h> #include <ddb/db_output.h> -void db_esp(db_expr_t, int, db_expr_t, char*); +void db_esp(db_expr_t, int, db_expr_t, char *); void db_esp(addr, have_addr, count, modif) diff --git a/sys/dev/sbus/qec.c b/sys/dev/sbus/qec.c index 9ffe5d0c1b5..969f430b166 100644 --- a/sys/dev/sbus/qec.c +++ b/sys/dev/sbus/qec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qec.c,v 1.3 2002/03/14 01:27:02 millert Exp $ */ +/* $OpenBSD: qec.c,v 1.4 2002/03/14 03:16:08 millert Exp $ */ /* $NetBSD: qec.c,v 1.12 2000/12/04 20:12:55 fvdl Exp $ */ /*- @@ -66,13 +66,13 @@ static int qec_bus_map( int, /*flags*/ vaddr_t, /*preferred virtual address */ bus_space_handle_t *); -static void *qec_intr_establish __P(( +static void *qec_intr_establish( bus_space_tag_t, int, /*bus interrupt priority*/ int, /*`device class' interrupt level*/ int, /*flags*/ int (*)(void *), /*handler*/ - void *)); /*arg*/ + void *); /*arg*/ struct cfattach qec_ca = { sizeof(struct qec_softc), qecmatch, qecattach diff --git a/sys/dev/tc/ioasicvar.h b/sys/dev/tc/ioasicvar.h index db25f864d7d..fe00a3fe465 100644 --- a/sys/dev/tc/ioasicvar.h +++ b/sys/dev/tc/ioasicvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ioasicvar.h,v 1.4 2002/03/14 01:27:03 millert Exp $ */ +/* $OpenBSD: ioasicvar.h,v 1.5 2002/03/14 03:16:08 millert Exp $ */ /* $NetBSD: ioasicvar.h,v 1.2 1996/03/17 21:37:45 jonathan Exp $ */ /* @@ -61,8 +61,8 @@ extern tc_addr_t ioasic_base; /* * Interrupt establishment/disestablishment functions */ -void ioasic_intr_establish __P((struct device *, void *, tc_intrlevel_t, - int (*)(void *), void *)); +void ioasic_intr_establish(struct device *, void *, tc_intrlevel_t, + int (*)(void *), void *); void ioasic_intr_disestablish(struct device *, void *); diff --git a/sys/dev/tc/tc.c b/sys/dev/tc/tc.c index 382d80119d1..63a132da7a3 100644 --- a/sys/dev/tc/tc.c +++ b/sys/dev/tc/tc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tc.c,v 1.10 2002/03/14 01:27:03 millert Exp $ */ +/* $OpenBSD: tc.c,v 1.11 2002/03/14 03:16:08 millert Exp $ */ /* $NetBSD: tc.c,v 1.20 1996/10/22 21:37:29 cgd Exp $ */ /* @@ -45,8 +45,8 @@ struct tc_softc { int sc_nslots; struct tc_slotdesc *sc_slots; - void (*sc_intr_establish) __P((struct device *, void *, - tc_intrlevel_t, int (*)(void *), void *)); + void (*sc_intr_establish)(struct device *, void *, + tc_intrlevel_t, int (*)(void *), void *); void (*sc_intr_disestablish)(struct device *, void *); }; diff --git a/sys/dev/tc/tcvar.h b/sys/dev/tc/tcvar.h index 7f2dd661a5f..9725a823a6d 100644 --- a/sys/dev/tc/tcvar.h +++ b/sys/dev/tc/tcvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tcvar.h,v 1.8 2002/03/14 01:27:03 millert Exp $ */ +/* $OpenBSD: tcvar.h,v 1.9 2002/03/14 03:16:08 millert Exp $ */ /* $NetBSD: tcvar.h,v 1.7 1996/10/22 21:37:31 cgd Exp $ */ /* @@ -89,8 +89,8 @@ struct tcbus_attach_args { /* TC bus resource management; XXX will move elsewhere eventually. */ - void (*tba_intr_establish) __P((struct device *, void *, - tc_intrlevel_t, int (*)(void *), void *)); + void (*tba_intr_establish)(struct device *, void *, + tc_intrlevel_t, int (*)(void *), void *); void (*tba_intr_disestablish)(struct device *, void *); }; @@ -134,8 +134,8 @@ struct tc_builtin { /* * Interrupt establishment functions. */ -void tc_intr_establish __P((struct device *, void *, tc_intrlevel_t, - int (*)(void *), void *)); +void tc_intr_establish(struct device *, void *, tc_intrlevel_t, + int (*)(void *), void *); void tc_intr_disestablish(struct device *, void *); /* diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c index fb87afe6eea..958d3fc79a3 100644 --- a/sys/dev/usb/if_aue.c +++ b/sys/dev/usb/if_aue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_aue.c,v 1.18 2002/01/03 22:23:43 deraadt Exp $ */ +/* $OpenBSD: if_aue.c,v 1.19 2002/03/14 03:16:08 millert Exp $ */ /* $NetBSD: if_aue.c,v 1.67 2001/10/10 02:14:16 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -1103,7 +1103,7 @@ aue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) usbd_get_xfer_status(xfer, NULL, NULL, &total_len, NULL); - memcpy(mtod(c->aue_mbuf, char*), c->aue_buf, total_len); + memcpy(mtod(c->aue_mbuf, char *), c->aue_buf, total_len); if (total_len <= 4 + ETHER_CRC_LEN) { ifp->if_ierrors++; diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c index 8103669dcf3..25c9dd2ba21 100644 --- a/sys/dev/usb/if_kue.c +++ b/sys/dev/usb/if_kue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_kue.c,v 1.15 2001/12/17 02:18:18 deraadt Exp $ */ +/* $OpenBSD: if_kue.c,v 1.16 2002/03/14 03:16:08 millert Exp $ */ /* $NetBSD: if_kue.c,v 1.43 2001/10/08 03:37:53 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -767,7 +767,7 @@ kue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) m = c->kue_mbuf; /* copy data to mbuf */ - memcpy(mtod(m, char*), c->kue_buf, total_len); + memcpy(mtod(m, char *), c->kue_buf, total_len); /* No errors; receive the packet. */ total_len = UGETW(mtod(m, u_int8_t *)); diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index f2d19236faf..c9d38044caa 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci.c,v 1.24 2001/10/31 04:24:44 nate Exp $ */ +/* $OpenBSD: ohci.c,v 1.25 2002/03/14 03:16:08 millert Exp $ */ /* $NetBSD: ohci.c,v 1.104 2001/09/28 23:57:21 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */ @@ -592,7 +592,7 @@ ohci_alloc_sitd(ohci_softc_t *sc) return (NULL); for(i = 0; i < OHCI_SITD_CHUNK; i++) { offs = i * OHCI_SITD_SIZE; - sitd = (ohci_soft_itd_t *)((char*)KERNADDR(&dma)+offs); + sitd = (ohci_soft_itd_t *)((char *)KERNADDR(&dma)+offs); sitd->physaddr = DMAADDR(&dma) + offs; sitd->nextitd = sc->sc_freeitds; sc->sc_freeitds = sitd; diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index 1a53b35fc77..17e1d1bf45f 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass.c,v 1.13 2002/03/14 01:27:03 millert Exp $ */ +/* $OpenBSD: umass.c,v 1.14 2002/03/14 03:16:08 millert Exp $ */ /* $NetBSD: umass.c,v 1.49 2001/01/21 18:56:38 augustss Exp $ */ /*- * Copyright (c) 1999 MAEKAWA Masahide <bishop@rr.iij4u.or.jp>, @@ -1476,7 +1476,7 @@ umass_bbb_transfer(struct umass_softc *sc, int lun, void *cmd, int cmdlen, static int dCBWtag = 42; /* unique for CBW of transfer */ DPRINTF(UDMASS_BBB,("%s: umass_bbb_transfer cmd=0x%02x\n", - USBDEVNAME(sc->sc_dev), *(u_char*)cmd)); + USBDEVNAME(sc->sc_dev), *(u_char *)cmd)); KASSERT(sc->proto & PROTO_BBB, ("sc->proto == 0x%02x wrong for umass_bbb_transfer\n", @@ -1963,7 +1963,7 @@ umass_cbi_transfer(struct umass_softc *sc, int lun, transfer_cb_f cb, void *priv) { DPRINTF(UDMASS_CBI,("%s: umass_cbi_transfer cmd=0x%02x, len=%d\n", - USBDEVNAME(sc->sc_dev), *(u_char*)cmd, datalen)); + USBDEVNAME(sc->sc_dev), *(u_char *)cmd, datalen)); KASSERT(sc->proto & (PROTO_CBI|PROTO_CBI_I), ("sc->proto == 0x%02x wrong for umass_cbi_transfer\n", diff --git a/sys/dev/wscons/wscons_callbacks.h b/sys/dev/wscons/wscons_callbacks.h index 6554863dc69..916291eea47 100644 --- a/sys/dev/wscons/wscons_callbacks.h +++ b/sys/dev/wscons/wscons_callbacks.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wscons_callbacks.h,v 1.4 2002/03/14 01:27:03 millert Exp $ */ +/* $OpenBSD: wscons_callbacks.h,v 1.5 2002/03/14 03:16:08 millert Exp $ */ /* $NetBSD: wscons_callbacks.h,v 1.12 2000/03/06 21:37:16 thorpej Exp $ */ /* @@ -48,9 +48,9 @@ enum wsdisplay_resetops { void wsdisplay_reset(struct device *, enum wsdisplay_resetops); void wsdisplay_kbdholdscreen(struct device *v, int); -void wsdisplay_set_cons_kbd __P((int (*get)(dev_t), - void (*poll)(dev_t, int), - void (*bell)(dev_t, u_int, u_int, u_int))); +void wsdisplay_set_cons_kbd(int (*get)(dev_t), + void (*poll)(dev_t, int), + void (*bell)(dev_t, u_int, u_int, u_int)); void wsdisplay_unset_cons_kbd(void); struct wsdisplay_param; int wsdisplay_param(struct device*, u_long, struct wsdisplay_param*); diff --git a/sys/dev/wscons/wsdisplay_compat_usl.c b/sys/dev/wscons/wsdisplay_compat_usl.c index b3aab30cb2d..1064e319e6c 100644 --- a/sys/dev/wscons/wsdisplay_compat_usl.c +++ b/sys/dev/wscons/wsdisplay_compat_usl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsdisplay_compat_usl.c,v 1.10 2002/03/14 01:27:03 millert Exp $ */ +/* $OpenBSD: wsdisplay_compat_usl.c,v 1.11 2002/03/14 03:16:08 millert Exp $ */ /* $NetBSD: wsdisplay_compat_usl.c,v 1.12 2000/03/23 07:01:47 thorpej Exp $ */ /* @@ -76,10 +76,10 @@ void usl_sync_done(struct usl_syncdata *); int usl_sync_check(struct usl_syncdata *); struct usl_syncdata *usl_sync_get(struct wsscreen *); -int usl_detachproc __P((void *, int, void (*)(void *, int, int), void *)); +int usl_detachproc(void *, int, void (*)(void *, int, int), void *); int usl_detachack(struct usl_syncdata *, int); void usl_detachtimeout(void *); -int usl_attachproc __P((void *, int, void (*)(void *, int, int), void *)); +int usl_attachproc(void *, int, void (*)(void *, int, int), void *); int usl_attachack(struct usl_syncdata *, int); void usl_attachtimeout(void *); diff --git a/sys/dev/wscons/wsdisplayvar.h b/sys/dev/wscons/wsdisplayvar.h index de89c6e1535..149cd7c1963 100644 --- a/sys/dev/wscons/wsdisplayvar.h +++ b/sys/dev/wscons/wsdisplayvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsdisplayvar.h,v 1.11 2002/03/14 01:27:03 millert Exp $ */ +/* $OpenBSD: wsdisplayvar.h,v 1.12 2002/03/14 03:16:08 millert Exp $ */ /* $NetBSD: wsdisplayvar.h,v 1.14.4.1 2000/06/30 16:27:53 simonb Exp $ */ /* @@ -110,8 +110,8 @@ struct wsdisplay_accessops { int (*alloc_screen)(void *, const struct wsscreen_descr *, void **, int *, int *, long *); void (*free_screen)(void *, void *); - int (*show_screen) __P((void *, void *, int, - void (*) (void *, int, int), void *)); + int (*show_screen)(void *, void *, int, + void (*) (void *, int, int), void *); int (*load_font)(void *, void *, struct wsdisplay_font *); void (*scrollback)(void *, void *, int); u_int16_t (*getchar)(void *, int, int); @@ -150,8 +150,8 @@ struct wsemuldisplaydev_attach_args { #define WSEMULDISPLAYDEVCF_CONSOLE_UNK -1 struct wscons_syncops { - int (*detach) __P((void *, int, void (*)(void *, int, int), void *)); - int (*attach) __P((void *, int, void (*)(void *, int, int), void *)); + int (*detach)(void *, int, void (*)(void *, int, int), void *); + int (*attach)(void *, int, void (*)(void *, int, int), void *); int (*check)(void *); void (*destroy)(void *); }; diff --git a/sys/dev/wsfont/wsfont.h b/sys/dev/wsfont/wsfont.h index c38221cf785..2770e201410 100644 --- a/sys/dev/wsfont/wsfont.h +++ b/sys/dev/wsfont/wsfont.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsfont.h,v 1.2 2002/03/14 01:27:03 millert Exp $ */ +/* $OpenBSD: wsfont.h,v 1.3 2002/03/14 03:16:08 millert Exp $ */ /* $NetBSD: wsfont.h,v 1.12 2000/06/13 13:37:07 ad Exp $ */ /*- @@ -77,7 +77,7 @@ void wsfont_init(void); int wsfont_find(char *, int, int, int); int wsfont_add(struct wsdisplay_font *, int); int wsfont_remove(int); -void wsfont_enum __P((void (*)(char *, int, int, int))); +void wsfont_enum(void (*)(char *, int, int, int)); int wsfont_lock(int, struct wsdisplay_font **, int, int); int wsfont_unlock(int); int wsfont_getflg(int, int *, int *); diff --git a/sys/gnu/arch/i386/fpemul/get_address.c b/sys/gnu/arch/i386/fpemul/get_address.c index 3232e685c68..2ec2d3bf80a 100644 --- a/sys/gnu/arch/i386/fpemul/get_address.c +++ b/sys/gnu/arch/i386/fpemul/get_address.c @@ -1,4 +1,4 @@ -/* $OpenBSD: get_address.c,v 1.1 1996/08/27 10:32:51 downsj Exp $ */ +/* $OpenBSD: get_address.c,v 1.2 2002/03/14 03:16:09 millert Exp $ */ /* * get_address.c * @@ -81,7 +81,7 @@ static int reg_offset[] = { tEAX, tECX, tEDX, tEBX, tESP, tEBP, tESI, tEDI}; -#define REG_(x) (*(((int*)FPU_info) + reg_offset[(x)])) +#define REG_(x) (*(((int *)FPU_info) + reg_offset[(x)])) void *FPU_data_address; diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c index 1e0e3cf55a7..ca478a1aefd 100644 --- a/sys/isofs/cd9660/cd9660_vfsops.c +++ b/sys/isofs/cd9660/cd9660_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_vfsops.c,v 1.30 2002/03/14 01:27:03 millert Exp $ */ +/* $OpenBSD: cd9660_vfsops.c,v 1.31 2002/03/14 03:16:09 millert Exp $ */ /* $NetBSD: cd9660_vfsops.c,v 1.26 1997/06/13 15:38:58 pk Exp $ */ /*- @@ -87,9 +87,9 @@ struct vfsops cd9660_vfsops = { */ static int iso_mountfs(struct vnode *devvp, struct mount *mp, - struct proc *p, struct iso_args *argp); -int iso_disklabelspoof __P((dev_t dev, void (*strat)(struct buf *), - struct disklabel *lp)); + struct proc *p, struct iso_args *argp); +int iso_disklabelspoof(dev_t dev, void (*strat)(struct buf *), + struct disklabel *lp); int cd9660_mountroot() diff --git a/sys/kern/kgdb_stub.c b/sys/kern/kgdb_stub.c index 89ff65afc61..60be586a451 100644 --- a/sys/kern/kgdb_stub.c +++ b/sys/kern/kgdb_stub.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kgdb_stub.c,v 1.3 2002/03/14 01:27:04 millert Exp $ */ +/* $OpenBSD: kgdb_stub.c,v 1.4 2002/03/14 03:16:09 millert Exp $ */ /* $NetBSD: kgdb_stub.c,v 1.6 1998/08/30 20:30:57 scottr Exp $ */ /* @@ -336,7 +336,7 @@ kgdb_trap(type, regs) /* Detect and recover from unexpected traps. */ if (kgdb_recover != 0) { printf("kgdb: caught trap 0x%x at %p\n", - type, (void*)PC_REGS(regs)); + type, (void *)PC_REGS(regs)); kgdb_send("E0E"); /* 14==EFAULT */ longjmp(kgdb_recover); } diff --git a/sys/kern/subr_userconf.c b/sys/kern/subr_userconf.c index f26ebb89b01..6d8ee6d3872 100644 --- a/sys/kern/subr_userconf.c +++ b/sys/kern/subr_userconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_userconf.c,v 1.27 2002/03/14 01:27:04 millert Exp $ */ +/* $OpenBSD: subr_userconf.c,v 1.28 2002/03/14 03:16:09 millert Exp $ */ /* * Copyright (c) 1996-2001 Mats O Jansson <moj@stacken.kth.se> @@ -67,7 +67,7 @@ char userconf_histbuf[40]; void userconf_init(void); int userconf_more(void); -void userconf_modify(char *, int*); +void userconf_modify(char *, int *); void userconf_hist_cmd(char); void userconf_hist_int(int); void userconf_hist_eoc(void); diff --git a/sys/lib/libsa/alloc.c b/sys/lib/libsa/alloc.c index 0d90622c914..34fcf0aba79 100644 --- a/sys/lib/libsa/alloc.c +++ b/sys/lib/libsa/alloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: alloc.c,v 1.5 1997/08/01 21:57:09 pefo Exp $ */ +/* $OpenBSD: alloc.c,v 1.6 2002/03/14 03:16:09 millert Exp $ */ /* $NetBSD: alloc.c,v 1.6 1997/02/04 18:36:33 thorpej Exp $ */ /* @@ -116,7 +116,7 @@ struct fl { } *freelist = (struct fl *)0; #ifdef HEAP_START -static char *top = (char*)HEAP_START; +static char *top = (char *)HEAP_START; #else extern char end[]; static char *top = end; @@ -174,7 +174,7 @@ alloc(size) size = ALIGN(sizeof (struct fl *)); top += ALIGN(sizeof(unsigned)) + ALIGN(size); #ifdef HEAP_LIMIT - if (top > (char*)HEAP_LIMIT) + if (top > (char *)HEAP_LIMIT) panic("heap full (0x%lx+%u)", help, size); #endif *(unsigned *)help = ALIGN(size); @@ -191,7 +191,7 @@ alloc(size) found: #endif /* remove from freelist */ - help = (char*)*f; + help = (char *)*f; *f = (*f)->next; #ifdef ALLOC_TRACE printf("=%p (origsize %u)\n", help + ALIGN(sizeof(unsigned)), @@ -206,7 +206,7 @@ free(ptr, size) unsigned size; /* only for consistence check */ { register struct fl *f = - (struct fl *)((char*)ptr - ALIGN(sizeof(unsigned))); + (struct fl *)((char *)ptr - ALIGN(sizeof(unsigned))); #ifdef ALLOC_TRACE printf("free(%p, %u) (origsize %u)\n", ptr, size, f->size); #endif diff --git a/sys/lib/libsa/arp.c b/sys/lib/libsa/arp.c index 7196a50ea8a..aaad7fa7366 100644 --- a/sys/lib/libsa/arp.c +++ b/sys/lib/libsa/arp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: arp.c,v 1.8 2002/03/14 01:27:07 millert Exp $ */ +/* $OpenBSD: arp.c,v 1.9 2002/03/14 03:16:09 millert Exp $ */ /* $NetBSD: arp.c,v 1.15 1996/10/13 02:28:58 christos Exp $ */ /* @@ -107,7 +107,7 @@ arpwhohas(d, addr) printf("arpwhohas: send request for %s\n", inet_ntoa(addr)); #endif - bzero((char*)&wbuf.data, sizeof(wbuf.data)); + bzero((char *)&wbuf.data, sizeof(wbuf.data)); ah = &wbuf.data.arp; ah->arp_hrd = htons(ARPHRD_ETHER); ah->arp_pro = htons(ETHERTYPE_IP); diff --git a/sys/lib/libsa/bootparam.c b/sys/lib/libsa/bootparam.c index 10f7844ffc8..46691b4b832 100644 --- a/sys/lib/libsa/bootparam.c +++ b/sys/lib/libsa/bootparam.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bootparam.c,v 1.9 2002/03/14 01:27:07 millert Exp $ */ +/* $OpenBSD: bootparam.c,v 1.10 2002/03/14 03:16:09 millert Exp $ */ /* $NetBSD: bootparam.c,v 1.10 1996/10/14 21:16:55 thorpej Exp $ */ /* @@ -146,7 +146,7 @@ bp_whoami(sockfd) args->vers = htonl(BOOTPARAM_VERS); args->proc = htonl(BOOTPARAM_WHOAMI); args->arglen = htonl(sizeof(struct xdr_inaddr)); - send_tail = (char*) &args->xina; + send_tail = (char *)&args->xina; /* * append encapsulated data (client IP address) @@ -160,7 +160,7 @@ bp_whoami(sockfd) /* rpc_call will set d->destport */ len = rpc_call(d, PMAPPROG, PMAPVERS, PMAPPROC_CALLIT, - args, send_tail - (char*)args, + args, send_tail - (char *)args, repl, sizeof(*repl)); if (len < 8) { printf("bootparamd: 'whoami' call failed\n"); @@ -194,7 +194,7 @@ bp_whoami(sockfd) printf("bp_whoami: short reply, %d < %d\n", len, x); return (-1); } - recv_head = (char*) repl->capsule; + recv_head = (char *)repl->capsule; /* client name */ hostnamelen = MAXHOSTNAMELEN-1; @@ -254,8 +254,8 @@ bp_getfile(sockfd, key, serv_addr, pathname) return (-1); } - send_tail = (char*) sdata.d; - recv_head = (char*) rdata.d; + send_tail = (char *)sdata.d; + recv_head = (char *)rdata.d; /* * Build request message. @@ -280,14 +280,14 @@ bp_getfile(sockfd, key, serv_addr, pathname) rlen = rpc_call(d, BOOTPARAM_PROG, BOOTPARAM_VERS, BOOTPARAM_GETFILE, - sdata.d, send_tail - (char*)sdata.d, + sdata.d, send_tail - (char *)sdata.d, rdata.d, sizeof(rdata.d)); if (rlen < 4) { RPC_PRINTF(("bp_getfile: short reply\n")); errno = EBADRPC; return (-1); } - recv_head = (char*) rdata.d; + recv_head = (char *)rdata.d; /* * Parse result message. diff --git a/sys/lib/libsa/cread.c b/sys/lib/libsa/cread.c index 90bee49cfd3..8d197552580 100644 --- a/sys/lib/libsa/cread.c +++ b/sys/lib/libsa/cread.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cread.c,v 1.8 1999/02/14 20:07:46 mickey Exp $ */ +/* $OpenBSD: cread.c,v 1.9 2002/03/14 03:16:10 millert Exp $ */ /* $NetBSD: cread.c,v 1.2 1997/02/04 18:38:20 thorpej Exp $ */ /* @@ -210,7 +210,7 @@ open(fname, mode) #endif goto errout; - s->stream.next_in = s->inbuf = (unsigned char*)alloc(Z_BUFSIZE); + s->stream.next_in = s->inbuf = (unsigned char *)alloc(Z_BUFSIZE); if(!s->inbuf) { inflateEnd(&(s->stream)); goto errout; diff --git a/sys/lib/libsa/net.h b/sys/lib/libsa/net.h index f93b96a8417..33f1847875d 100644 --- a/sys/lib/libsa/net.h +++ b/sys/lib/libsa/net.h @@ -1,4 +1,4 @@ -/* $OpenBSD: net.h,v 1.4 2002/03/14 01:27:07 millert Exp $ */ +/* $OpenBSD: net.h,v 1.5 2002/03/14 03:16:10 millert Exp $ */ /* $NetBSD: net.h,v 1.10 1995/10/20 00:46:30 cgd Exp $ */ /* @@ -98,17 +98,16 @@ int rarp_getipaddress(int); /* Link functions: */ ssize_t sendether(struct iodesc *d, void *pkt, size_t len, - u_char *dea, int etype); + u_char *dea, int etype); ssize_t readether(struct iodesc *d, void *pkt, size_t len, - time_t tleft, u_int16_t *etype); + time_t tleft, u_int16_t *etype); ssize_t sendudp(struct iodesc *, void *, size_t); ssize_t readudp(struct iodesc *, void *, size_t, time_t); -ssize_t sendrecv __P((struct iodesc *, - ssize_t (*)(struct iodesc *, void *, size_t), - void *, size_t, - ssize_t (*)(struct iodesc *, void *, size_t, time_t), - void *, size_t)); +ssize_t sendrecv(struct iodesc *, + ssize_t (*)(struct iodesc *, void *, size_t), void *, size_t, + ssize_t (*)(struct iodesc *, void *, size_t, time_t), + void *, size_t); /* Utilities: */ char *ether_sprintf(u_char *); diff --git a/sys/lib/libsa/printf.c b/sys/lib/libsa/printf.c index ce9a6a6070d..4dfe0ea69de 100644 --- a/sys/lib/libsa/printf.c +++ b/sys/lib/libsa/printf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: printf.c,v 1.15 2002/03/14 01:27:07 millert Exp $ */ +/* $OpenBSD: printf.c,v 1.16 2002/03/14 03:16:10 millert Exp $ */ /* $NetBSD: printf.c,v 1.10 1996/11/30 04:19:21 gwr Exp $ */ /*- @@ -69,8 +69,8 @@ #include "stand.h" -static void kprintn __P((void (*)(int), u_long, int)); -static void kdoprnt __P((void (*)(int), const char *, va_list)); +static void kprintn(void (*)(int), u_long, int); +static void kdoprnt(void (*)(int), const char *, va_list); #ifndef STRIPPED static void sputchar(int); diff --git a/sys/lib/libsa/rarp.c b/sys/lib/libsa/rarp.c index 7113d2cb183..e022239e958 100644 --- a/sys/lib/libsa/rarp.c +++ b/sys/lib/libsa/rarp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rarp.c,v 1.7 2002/03/14 01:27:07 millert Exp $ */ +/* $OpenBSD: rarp.c,v 1.8 2002/03/14 03:16:10 millert Exp $ */ /* $NetBSD: rarp.c,v 1.13 1996/10/13 02:29:05 christos Exp $ */ /* @@ -91,7 +91,7 @@ rarp_getipaddress(sock) printf("rarp: d=%x\n", (u_int)d); #endif - bzero((char*)&wbuf.data, sizeof(wbuf.data)); + bzero((char *)&wbuf.data, sizeof(wbuf.data)); ap = &wbuf.data.arp; ap->arp_hrd = htons(ARPHRD_ETHER); ap->arp_pro = htons(ETHERTYPE_IP); diff --git a/sys/lib/libsa/stand.h b/sys/lib/libsa/stand.h index bcef6c26974..e455a713206 100644 --- a/sys/lib/libsa/stand.h +++ b/sys/lib/libsa/stand.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stand.h,v 1.37 2002/03/14 01:27:07 millert Exp $ */ +/* $OpenBSD: stand.h,v 1.38 2002/03/14 03:16:10 millert Exp $ */ /* $NetBSD: stand.h,v 1.18 1996/11/30 04:35:51 gwr Exp $ */ /*- @@ -153,7 +153,7 @@ __dead void _rtt(void) __attribute__((noreturn)); #define bcmp(s1,s2,n) (memcmp((s2),(s1),(n))) #define bcopy(s1,s2,n) ((void)memcpy((s2),(s1),(n))) void *memcpy(void *, const void *, size_t); -int memcmp(const void *, const void*, size_t); +int memcmp(const void *, const void *, size_t); char *strncpy(char *, const char *, size_t); char *strcpy(char *, const char *); int strncmp(const char *, const char *, size_t); diff --git a/sys/miscfs/tcfs/tcfs_keytab.h b/sys/miscfs/tcfs/tcfs_keytab.h index 2d24da9f76b..39026b2edc5 100644 --- a/sys/miscfs/tcfs/tcfs_keytab.h +++ b/sys/miscfs/tcfs/tcfs_keytab.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tcfs_keytab.h,v 1.6 2002/03/14 01:27:08 millert Exp $ */ +/* $OpenBSD: tcfs_keytab.h,v 1.7 2002/03/14 03:16:10 millert Exp $ */ /* * Copyright 2000 The TCFS Project at http://tcfs.dia.unisa.it/ * All rights reserved. @@ -94,7 +94,7 @@ typedef struct _kt { #define NIL ((tcfs_keytab_node*)0) #ifdef _HAVE_HASH_ -int _tcfs_keytab_hash __P(unsigned int)); +int _tcfs_keytab_hash(unsigned int); #define tcfs_keytab_hash(x) _tcfs_keytab_hash((unsigned int)(x)) #else #define tcfs_keytab_hash(u) ((u)%KEYTABSIZE) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 24967d48e31..9d6cbb0821d 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bpf.c,v 1.31 2002/03/14 01:27:09 millert Exp $ */ +/* $OpenBSD: bpf.c,v 1.32 2002/03/14 03:16:10 millert Exp $ */ /* $NetBSD: bpf.c,v 1.33 1997/02/21 23:59:35 thorpej Exp $ */ /* @@ -89,8 +89,8 @@ void bpf_detachd(struct bpf_d *); int bpf_setif(struct bpf_d *, struct ifreq *); int bpfselect(dev_t, int, struct proc *); static __inline void bpf_wakeup(struct bpf_d *); -void bpf_catchpacket __P((struct bpf_d *, u_char *, size_t, size_t, - void (*)(const void *, void *, size_t))); +void bpf_catchpacket(struct bpf_d *, u_char *, size_t, size_t, + void (*)(const void *, void *, size_t)); void bpf_reset_d(struct bpf_d *); int diff --git a/sys/net/if_strip.c b/sys/net/if_strip.c index e9c1a0c5085..70d432b3b54 100644 --- a/sys/net/if_strip.c +++ b/sys/net/if_strip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_strip.c,v 1.17 2002/03/14 01:27:09 millert Exp $ */ +/* $OpenBSD: if_strip.c,v 1.18 2002/03/14 03:16:10 millert Exp $ */ /* $NetBSD: if_strip.c,v 1.2.4.3 1996/08/03 00:58:32 jtc Exp $ */ /* from: NetBSD: if_sl.c,v 1.38 1996/02/13 22:00:23 christos Exp $ */ @@ -259,10 +259,10 @@ struct st_header { * different STRIP implementations: *BSD, Linux, etc. * */ -static u_char* UnStuffData(u_char *src, u_char *end, u_char +static u_char *UnStuffData(u_char *src, u_char *end, u_char *dest, u_long dest_length); -static u_char* StuffData(u_char *src, u_long length, u_char *dest, +static u_char *StuffData(u_char *src, u_long length, u_char *dest, u_char **code_ptr_ptr); static void RecvErr(char *msg, struct st_softc *sc); @@ -1718,7 +1718,7 @@ typedef enum #define StuffData_FinishBlock(X) \ (*code_ptr = (X) ^ Stuff_Magic, code = Stuff_NoCode) -static u_char* +static u_char * StuffData(u_char *src, u_long length, u_char *dest, u_char **code_ptr_ptr) { u_char *end = src + length; @@ -1846,7 +1846,7 @@ StuffData(u_char *src, u_long length, u_char *dest, u_char **code_ptr_ptr) * allow a follow-on call to resume correctly). */ -static u_char* +static u_char * UnStuffData(u_char *src, u_char *end, u_char *dst, u_long dst_length) { u_char *dst_end = dst + dst_length; diff --git a/sys/net/ppp_defs.h b/sys/net/ppp_defs.h index 36d19e6d94d..1f2d1afaa57 100644 --- a/sys/net/ppp_defs.h +++ b/sys/net/ppp_defs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ppp_defs.h,v 1.11 2001/06/09 06:16:39 angelos Exp $ */ +/* $OpenBSD: ppp_defs.h,v 1.12 2002/03/14 03:16:10 millert Exp $ */ /* $NetBSD: ppp_defs.h,v 1.1 1995/07/04 06:28:26 paulus Exp $ */ /* @@ -159,11 +159,4 @@ struct ppp_idle { time_t recv_idle; /* time since last NP packet received */ }; -#ifndef __P -#ifdef __STDC__ -#define __P(x) x -#else -#define __P(x) () -#endif -#endif #endif /* _PPP_DEFS_H_ */ diff --git a/sys/net/radix.h b/sys/net/radix.h index e2835f7dcc9..0aa628df683 100644 --- a/sys/net/radix.h +++ b/sys/net/radix.h @@ -1,4 +1,4 @@ -/* $OpenBSD: radix.h,v 1.6 2002/03/14 01:27:10 millert Exp $ */ +/* $OpenBSD: radix.h,v 1.7 2002/03/14 03:16:10 millert Exp $ */ /* $NetBSD: radix.h,v 1.8 1996/02/13 22:00:37 christos Exp $ */ /* @@ -121,8 +121,8 @@ struct radix_node_head { struct radix_node *(*rnh_lookup) /* locate based on sockaddr */(void *v, void *mask, struct radix_node_head *head); struct radix_node *(*rnh_matchpkt) /* locate based on packet hdr */(void *v, struct radix_node_head *head); int (*rnh_walktree) /* traverse tree */ - __P((struct radix_node_head *, - int (*)(struct radix_node *, void *), void *)); + (struct radix_node_head *, + int (*)(struct radix_node *, void *), void *); struct radix_node rnh_nodes[3]; /* empty tree for common case */ }; @@ -145,8 +145,8 @@ struct radix_node_head { void rn_init(void); int rn_inithead(void **, int); int rn_refines(void *, void *); -int rn_walktree __P((struct radix_node_head *, - int (*)(struct radix_node *, void *), void *)); +int rn_walktree(struct radix_node_head *, + int (*)(struct radix_node *, void *), void *); struct radix_node *rn_addmask(void *, int, int), *rn_addroute(void *, void *, struct radix_node_head *, diff --git a/sys/net/route.h b/sys/net/route.h index 2efa1615755..5a414b5c73e 100644 --- a/sys/net/route.h +++ b/sys/net/route.h @@ -1,4 +1,4 @@ -/* $OpenBSD: route.h,v 1.13 2002/03/14 01:27:10 millert Exp $ */ +/* $OpenBSD: route.h,v 1.14 2002/03/14 03:16:10 millert Exp $ */ /* $NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $ */ /* @@ -301,9 +301,9 @@ void rt_newaddrmsg(int, struct ifaddr *, int, struct rtentry *); int rt_setgate(struct rtentry *, struct sockaddr *, struct sockaddr *); void rt_setmetrics(u_long, struct rt_metrics *, struct rt_metrics *); -int rt_timer_add __P((struct rtentry *, +int rt_timer_add(struct rtentry *, void(*)(struct rtentry *, struct rttimer *), - struct rttimer_queue *)); + struct rttimer_queue *); void rt_timer_init(void); struct rttimer_queue * rt_timer_queue_create(u_int); diff --git a/sys/netccitt/pk_extern.h b/sys/netccitt/pk_extern.h index d4325057482..e5b9f135b70 100644 --- a/sys/netccitt/pk_extern.h +++ b/sys/netccitt/pk_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pk_extern.h,v 1.4 2002/03/14 01:27:10 millert Exp $ */ +/* $OpenBSD: pk_extern.h,v 1.5 2002/03/14 03:16:11 millert Exp $ */ /* $NetBSD: pk_extern.h,v 1.1 1996/02/13 22:05:17 christos Exp $ */ /* @@ -85,7 +85,7 @@ void pk_restart(struct pkcb *, int); void pk_freelcd(struct pklcd *); int pk_bind(struct pklcd *, struct mbuf *); int pk_listen(struct pklcd *); -int pk_protolisten __P((int, int, int (*)(struct mbuf *, void *))); +int pk_protolisten(int, int, int (*)(struct mbuf *, void *)); void pk_assoc(struct pkcb *, struct pklcd *, struct sockaddr_x25 *); int pk_connect(struct pklcd *, struct sockaddr_x25 *); void pk_callcomplete(struct pkcb *); diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h index 3c6c9b57af2..1d0ab28c77b 100644 --- a/sys/netinet/icmp6.h +++ b/sys/netinet/icmp6.h @@ -1,4 +1,4 @@ -/* $OpenBSD: icmp6.h,v 1.20 2002/03/14 01:27:11 millert Exp $ */ +/* $OpenBSD: icmp6.h,v 1.21 2002/03/14 03:16:11 millert Exp $ */ /* $KAME: icmp6.h,v 1.39 2001/02/06 03:48:06 itojun Exp $ */ /* @@ -615,7 +615,7 @@ int icmp6_sysctl(int *, u_int, void *, size_t *, void *, size_t); struct ip6ctlparam; void icmp6_mtudisc_update(struct ip6ctlparam *, int); -void icmp6_mtudisc_callback_register __P((void (*)(struct in6_addr *))); +void icmp6_mtudisc_callback_register(void (*)(struct in6_addr *)); /* XXX: is this the right place for these macros? */ #define icmp6_ifstat_inc(ifp, tag) \ diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 80443240382..5057db4e630 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ether.c,v 1.38 2002/03/14 01:27:11 millert Exp $ */ +/* $OpenBSD: if_ether.c,v 1.39 2002/03/14 03:16:11 millert Exp $ */ /* $NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $ */ /* @@ -894,7 +894,7 @@ db_print_sa(sa) return; } - p = (u_char*)sa; + p = (u_char *)sa; len = sa->sa_len; db_printf("["); while (len > 0) { diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index e8047f6b8e9..ba21c03eb72 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in_pcb.h,v 1.39 2002/03/14 01:27:11 millert Exp $ */ +/* $OpenBSD: in_pcb.h,v 1.40 2002/03/14 03:16:11 millert Exp $ */ /* $NetBSD: in_pcb.h,v 1.14 1996/02/13 23:42:00 christos Exp $ */ /* @@ -257,10 +257,10 @@ void in_pcbinit(struct inpcbtable *, int); struct inpcb * in_pcblookup(struct inpcbtable *, void *, u_int, void *, u_int, int); -void in_pcbnotify __P((struct inpcbtable *, struct sockaddr *, - u_int, struct in_addr, u_int, int, void (*)(struct inpcb *, int))); -void in_pcbnotifyall __P((struct inpcbtable *, struct sockaddr *, - int, void (*)(struct inpcb *, int))); +void in_pcbnotify(struct inpcbtable *, struct sockaddr *, + u_int, struct in_addr, u_int, int, void (*)(struct inpcb *, int)); +void in_pcbnotifyall(struct inpcbtable *, struct sockaddr *, + int, void (*)(struct inpcb *, int)); void in_pcbrehash(struct inpcb *); void in_rtchange(struct inpcb *, int); void in_setpeeraddr(struct inpcb *, struct mbuf *); @@ -272,9 +272,9 @@ struct rtentry * in_pcbrtentry(struct inpcb *); /* INET6 stuff */ -int in6_pcbnotify __P((struct inpcbtable *, struct sockaddr *, +int in6_pcbnotify(struct inpcbtable *, struct sockaddr *, u_int, struct sockaddr *, u_int, int, void *, - void (*)(struct inpcb *, int))); + void (*)(struct inpcb *, int)); struct in6_addr *in6_selectsrc(struct sockaddr_in6 *, struct ip6_pktopts *, struct ip6_moptions *, diff --git a/sys/netinet/ip_gre.c b/sys/netinet/ip_gre.c index 023f1ed30c3..9e559d76df7 100644 --- a/sys/netinet/ip_gre.c +++ b/sys/netinet/ip_gre.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_gre.c,v 1.13 2002/03/14 01:27:11 millert Exp $ */ +/* $OpenBSD: ip_gre.c,v 1.14 2002/03/14 03:16:11 millert Exp $ */ /* $NetBSD: ip_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */ /* @@ -301,7 +301,7 @@ gre_mobile_input(m, va_alist) mip->mi.ip_dst.s_addr = mip->mh.odst; mip->mi.ip_p = (ntohs(mip->mh.proto) >> 8); - if (gre_in_cksum((u_short*) &mip->mh,msiz) != 0) { + if (gre_in_cksum((u_short *) &mip->mh,msiz) != 0) { m_freem(m); return; } diff --git a/sys/netinet6/pim6_var.h b/sys/netinet6/pim6_var.h index da25a48bf23..73156e5f125 100644 --- a/sys/netinet6/pim6_var.h +++ b/sys/netinet6/pim6_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pim6_var.h,v 1.4 2002/03/14 01:27:12 millert Exp $ */ +/* $OpenBSD: pim6_var.h,v 1.5 2002/03/14 03:16:11 millert Exp $ */ /* $KAME: pim6_var.h,v 1.8 2000/06/06 08:07:43 jinmei Exp $ */ /* @@ -54,7 +54,7 @@ struct pim6stat { #if (defined(KERNEL)) || (defined(_KERNEL)) extern struct pim6stat pim6stat; -int pim6_input(struct mbuf **, int*, int); +int pim6_input(struct mbuf **, int *, int); #endif /* KERNEL */ /* diff --git a/sys/netipx/ipx_pcb.h b/sys/netipx/ipx_pcb.h index ce776daad00..d9c9b8056d1 100644 --- a/sys/netipx/ipx_pcb.h +++ b/sys/netipx/ipx_pcb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ipx_pcb.h,v 1.4 2002/03/14 01:27:12 millert Exp $ */ +/* $OpenBSD: ipx_pcb.h,v 1.5 2002/03/14 03:16:12 millert Exp $ */ /*- * @@ -97,10 +97,9 @@ int ipx_pcbbind(struct ipxpcb *ipxp, struct mbuf *nam); int ipx_pcbconnect(struct ipxpcb *ipxp, struct mbuf *nam); void ipx_pcbdetach(struct ipxpcb *ipxp); void ipx_pcbdisconnect(struct ipxpcb *ipxp); -struct ipxpcb * - ipx_pcblookup(struct ipx_addr *faddr, int lport, int wildp); -void ipx_pcbnotify __P((struct ipx_addr *dst, int errno, - void (*notify)(struct ipxpcb *), long param)); +struct ipxpcb *ipx_pcblookup(struct ipx_addr *faddr, int lport, int wildp); +void ipx_pcbnotify(struct ipx_addr *dst, int errno, + void (*notify)(struct ipxpcb *), long param); void ipx_setpeeraddr(struct ipxpcb *ipxp, struct mbuf *nam); void ipx_setsockaddr(struct ipxpcb *ipxp, struct mbuf *nam); #endif diff --git a/sys/netiso/iso_pcb.h b/sys/netiso/iso_pcb.h index 7377bd98135..37c176f3a1b 100644 --- a/sys/netiso/iso_pcb.h +++ b/sys/netiso/iso_pcb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: iso_pcb.h,v 1.3 2002/03/14 01:27:12 millert Exp $ */ +/* $OpenBSD: iso_pcb.h,v 1.4 2002/03/14 03:16:12 millert Exp $ */ /* $NetBSD: iso_pcb.h,v 1.7 1996/02/13 22:10:18 christos Exp $ */ /*- @@ -122,8 +122,8 @@ int iso_pcbbind(void *, struct mbuf *); int iso_pcbconnect(void *, struct mbuf *); void iso_pcbdisconnect(void *); void iso_pcbdetach(void *); -void iso_pcbnotify __P((struct isopcb *, struct sockaddr_iso *, int, - void (*) (struct isopcb *))); +void iso_pcbnotify(struct isopcb *, struct sockaddr_iso *, int, + void (*) (struct isopcb *)); struct isopcb *iso_pcblookup(struct isopcb *, int, caddr_t, struct sockaddr_iso *); #endif diff --git a/sys/netiso/tp_var.h b/sys/netiso/tp_var.h index 7db7d854597..1b59b19a119 100644 --- a/sys/netiso/tp_var.h +++ b/sys/netiso/tp_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tp_var.h,v 1.2 2002/03/14 01:27:12 millert Exp $ */ +/* $OpenBSD: tp_var.h,v 1.3 2002/03/14 03:16:12 millert Exp $ */ /* $NetBSD: tp_var.h,v 1.1 1996/02/13 22:12:29 christos Exp $ */ /* @@ -59,10 +59,10 @@ int tp_driver(struct tp_pcb *, struct tp_event *); /* tp_emit.c */ int tp_emit(int, struct tp_pcb *, SeqNum, u_int, struct mbuf *); -int tp_error_emit __P((int, u_long, struct sockaddr_iso *, - struct sockaddr_iso *, struct mbuf *, int, - struct tp_pcb *, caddr_t, - int (*) (struct mbuf *, ...))); +int tp_error_emit(int, u_long, struct sockaddr_iso *, + struct sockaddr_iso *, struct mbuf *, int, + struct tp_pcb *, caddr_t, + int (*) (struct mbuf *, ...)); /* tp_inet.c */ void in_getsufx(void *, u_short *, caddr_t, int); diff --git a/sys/netns/ns_var.h b/sys/netns/ns_var.h index 23e3f333871..22eb0856d5b 100644 --- a/sys/netns/ns_var.h +++ b/sys/netns/ns_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ns_var.h,v 1.7 2002/03/14 01:27:13 millert Exp $ */ +/* $OpenBSD: ns_var.h,v 1.8 2002/03/14 03:16:12 millert Exp $ */ #ifdef _KERNEL struct socket; @@ -64,7 +64,7 @@ void ns_pcbdisconnect(struct nspcb *); void ns_pcbdetach(struct nspcb *); void ns_setsockaddr(struct nspcb *, struct mbuf *); void ns_setpeeraddr(struct nspcb *, struct mbuf *); -void ns_pcbnotify __P((struct ns_addr *, int, void (*)(struct nspcb *), long)); +void ns_pcbnotify(struct ns_addr *, int, void (*)(struct nspcb *), long); void ns_rtchange(struct nspcb *); struct nspcb *ns_pcblookup(struct ns_addr *, u_short, int); diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 92600593bc5..c767d494c84 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.c,v 1.59 2002/03/14 01:27:13 millert Exp $ */ +/* $OpenBSD: cd.c,v 1.60 2002/03/14 03:16:12 millert Exp $ */ /* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */ /* @@ -1010,7 +1010,7 @@ cdioctl(dev, cmd, addr, flag, p) } case CDIOREADMSADDR: { struct cd_toc *toc; - int sessno = *(int*)addr; + int sessno = *(int *)addr; struct cd_toc_entry *cte; if (sessno != 0) { @@ -1043,7 +1043,7 @@ cdioctl(dev, cmd, addr, flag, p) else toc->header.len = ntohs(toc->header.len); - *(int*)addr = (toc->header.len >= 10 && cte->track > 1) ? + *(int *)addr = (toc->header.len >= 10 && cte->track > 1) ? cte->addr.lba : 0; FREE(toc, M_DEVBUF); break; diff --git a/sys/scsi/ss.c b/sys/scsi/ss.c index c84d9e260cf..2acff32f95a 100644 --- a/sys/scsi/ss.c +++ b/sys/scsi/ss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ss.c,v 1.44 2002/03/14 01:27:13 millert Exp $ */ +/* $OpenBSD: ss.c,v 1.45 2002/03/14 03:16:12 millert Exp $ */ /* $NetBSD: ss.c,v 1.10 1996/05/05 19:52:55 christos Exp $ */ /* @@ -853,7 +853,7 @@ ss_set_window(ss, sio) if (ss->quirkdata->vendor_unique_sw != NULL) return ((*ss->quirkdata->vendor_unique_sw)(ss, sio, - &window_cmd, (void*)&wd)); + &window_cmd, (void *)&wd)); else /* send the command to the scanner */ return (scsi_scsi_cmd(sc_link, diff --git a/sys/stand/boot/bootarg.c b/sys/stand/boot/bootarg.c index 1e102c17bf8..dd3f96ee081 100644 --- a/sys/stand/boot/bootarg.c +++ b/sys/stand/boot/bootarg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bootarg.c,v 1.6 1999/05/20 12:56:40 aaron Exp $ */ +/* $OpenBSD: bootarg.c,v 1.7 2002/03/14 03:16:12 millert Exp $ */ /* * Copyright (c) 1997,1998 Michael Shalayeff @@ -74,7 +74,7 @@ makebootargs(v, lenp) *lenp = l; /* copy them out */ for (p = bootarg_list, q = v; - p != NULL && ((q + p->ba_size) - (u_char*)v) < l; + p != NULL && ((q + p->ba_size) - (u_char *)v) < l; q += p->ba_size, p = p->ba_next) { #ifdef DEBUG printf("%d,%d ", p->ba_type, p->ba_size); diff --git a/sys/sys/buf.h b/sys/sys/buf.h index 2abb4b7edd6..5fd2143f21d 100644 --- a/sys/sys/buf.h +++ b/sys/sys/buf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: buf.h,v 1.38 2002/03/14 01:27:13 millert Exp $ */ +/* $OpenBSD: buf.h,v 1.39 2002/03/14 03:16:12 millert Exp $ */ /* $NetBSD: buf.h,v 1.25 1997/04/09 21:12:17 mycroft Exp $ */ /* @@ -218,8 +218,8 @@ struct buf *geteblk(int); struct buf *incore(struct vnode *, daddr_t); void minphys(struct buf *bp); -int physio __P((void (*strategy)(struct buf *), struct buf *bp, dev_t dev, - int flags, void (*minphys)(struct buf *), struct uio *uio)); +int physio(void (*strategy)(struct buf *), struct buf *bp, dev_t dev, + int flags, void (*minphys)(struct buf *), struct uio *uio); void brelvp(struct buf *); void reassignbuf(struct buf *); void bgetvp(struct vnode *, struct buf *); diff --git a/sys/sys/device.h b/sys/sys/device.h index dd924f2dc21..78618aad39b 100644 --- a/sys/sys/device.h +++ b/sys/sys/device.h @@ -1,4 +1,4 @@ -/* $OpenBSD: device.h,v 1.21 2002/03/14 01:27:14 millert Exp $ */ +/* $OpenBSD: device.h,v 1.22 2002/03/14 03:16:12 millert Exp $ */ /* $NetBSD: device.h,v 1.15 1996/04/09 20:55:24 cgd Exp $ */ /* @@ -206,7 +206,7 @@ int config_deactivate(struct device *); int config_activate_children(struct device *, enum devact); struct device *config_make_softc(struct device *parent, struct cfdata *cf); -void config_defer __P((struct device *, void (*)(struct device *))); +void config_defer(struct device *, void (*)(struct device *)); void evcnt_attach(struct device *, const char *, struct evcnt *); struct device *device_lookup(struct cfdriver *, int unit); diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h index df6f8b34897..3a16b6aa81e 100644 --- a/sys/sys/disklabel.h +++ b/sys/sys/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.21 2002/03/14 01:27:14 millert Exp $ */ +/* $OpenBSD: disklabel.h,v 1.22 2002/03/14 03:16:12 millert Exp $ */ /* $NetBSD: disklabel.h,v 1.41 1996/05/10 23:07:37 mark Exp $ */ /* @@ -358,15 +358,15 @@ void disksort(struct buf *, struct buf *); u_int dkcksum(struct disklabel *); int setdisklabel(struct disklabel *, struct disklabel *, u_long, struct cpu_disklabel *); -char *readdisklabel __P((dev_t, void (*)(struct buf *), struct disklabel *, - struct cpu_disklabel *, int)); -int writedisklabel __P((dev_t, void (*)(struct buf *), struct disklabel *, - struct cpu_disklabel *)); +char *readdisklabel(dev_t, void (*)(struct buf *), struct disklabel *, + struct cpu_disklabel *, int); +int writedisklabel(dev_t, void (*)(struct buf *), struct disklabel *, + struct cpu_disklabel *); int bounds_check_with_label(struct buf *, struct disklabel *, struct cpu_disklabel *, int); #ifdef CD9660 -int iso_disklabelspoof __P((dev_t dev, void (*strat)(struct buf *), - struct disklabel *lp)); +int iso_disklabelspoof(dev_t dev, void (*strat)(struct buf *), + struct disklabel *lp); #endif #endif #endif /* _LOCORE */ diff --git a/sys/sys/exec.h b/sys/sys/exec.h index c859c5db6dc..365bb2c9ad4 100644 --- a/sys/sys/exec.h +++ b/sys/sys/exec.h @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.h,v 1.13 2002/03/14 01:27:14 millert Exp $ */ +/* $OpenBSD: exec.h,v 1.14 2002/03/14 03:16:12 millert Exp $ */ /* $NetBSD: exec.h,v 1.59 1996/02/09 18:25:09 christos Exp $ */ /*- @@ -190,10 +190,10 @@ int check_exec(struct proc *, struct exec_package *); int exec_setup_stack(struct proc *, struct exec_package *); #ifdef DEBUG -void new_vmcmd __P((struct exec_vmcmd_set *evsp, +void new_vmcmd(struct exec_vmcmd_set *evsp, int (*proc)(struct proc *p, struct exec_vmcmd *), u_long len, u_long addr, struct vnode *vp, u_long offset, - u_int prot)); + u_int prot); #define NEW_VMCMD(evsp,proc,len,addr,vp,offset,prot) \ new_vmcmd(evsp,proc,len,addr,vp,offset,prot); #else /* DEBUG */ diff --git a/sys/sys/kgdb.h b/sys/sys/kgdb.h index d77d840c97f..80f32873611 100644 --- a/sys/sys/kgdb.h +++ b/sys/sys/kgdb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kgdb.h,v 1.2 2002/03/14 01:27:14 millert Exp $ */ +/* $OpenBSD: kgdb.h,v 1.3 2002/03/14 03:16:12 millert Exp $ */ /* $NetBSD: kgdb.h,v 1.5 1998/09/13 14:46:24 christos Exp $ */ /* @@ -89,7 +89,7 @@ extern int kgdb_dev, kgdb_rate, kgdb_active; extern int kgdb_debug_init, kgdb_debug_panic; extern label_t *kgdb_recover; -void kgdb_attach __P((int (*)(void *), void (*)(void *, int), void *ioarg)); +void kgdb_attach(int (*)(void *), void (*)(void *, int), void *ioarg); void kgdb_connect(int); void kgdb_panic(void); int kgdb_trap(int, db_regs_t *); diff --git a/sys/sys/kthread.h b/sys/sys/kthread.h index a753960c975..d83ba47700a 100644 --- a/sys/sys/kthread.h +++ b/sys/sys/kthread.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kthread.h,v 1.2 2002/03/14 01:27:14 millert Exp $ */ +/* $OpenBSD: kthread.h,v 1.3 2002/03/14 03:16:12 millert Exp $ */ /* $NetBSD: kthread.h,v 1.2 1998/11/14 00:08:49 thorpej Exp $ */ /*- @@ -48,10 +48,10 @@ #ifdef _KERNEL #include <sys/proc.h> /* struct proc, tsleep(), wakeup() */ -int kthread_create __P((void (*)(void *), void *, struct proc **, - const char *, ...)) +int kthread_create(void (*)(void *), void *, struct proc **, + const char *, ...) __attribute__((__format__(__printf__,4,5))); -void kthread_create_deferred __P((void (*)(void *), void *)); +void kthread_create_deferred(void (*)(void *), void *); void kthread_run_deferred_queue(void); void kthread_exit(int) __attribute__((__noreturn__)); #endif /* _KERNEL */ diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index 2ebc9675129..1091cdc2378 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mbuf.h,v 1.58 2002/03/14 01:27:14 millert Exp $ */ +/* $OpenBSD: mbuf.h,v 1.59 2002/03/14 03:16:12 millert Exp $ */ /* $NetBSD: mbuf.h,v 1.19 1996/02/09 18:25:14 christos Exp $ */ /* @@ -560,11 +560,11 @@ void m_freem(struct mbuf *); void m_reclaim(void *, int); void m_copydata(struct mbuf *, int, int, caddr_t); void m_cat(struct mbuf *, struct mbuf *); -struct mbuf *m_devget __P((char *, int, int, struct ifnet *, - void (*)(const void *, void *, size_t))); +struct mbuf *m_devget(char *, int, int, struct ifnet *, + void (*)(const void *, void *, size_t)); void m_zero(struct mbuf *); -int m_apply __P((struct mbuf *, int, int, - int (*)(caddr_t, caddr_t, unsigned int), caddr_t)); +int m_apply(struct mbuf *, int, int, + int (*)(caddr_t, caddr_t, unsigned int), caddr_t); /* Packet tag routines */ struct m_tag *m_tag_get(int, int, int); diff --git a/sys/sys/midiio.h b/sys/sys/midiio.h index 3afe9342923..9bba9458a2d 100644 --- a/sys/sys/midiio.h +++ b/sys/sys/midiio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: midiio.h,v 1.1 1999/01/02 00:02:56 niklas Exp $ */ +/* $OpenBSD: midiio.h,v 1.2 2002/03/14 03:16:12 millert Exp $ */ /* $NetBSD: midiio.h,v 1.7 1998/11/25 22:17:07 augustss Exp $ */ /*- @@ -194,7 +194,7 @@ struct synth_info { #define SEQ_MK_CHN_COMMON(e, unit, cmd, chan, p1, p2, w14) (\ (e)->arr[0] = SEQ_CHN_COMMON, (e)->arr[1] = (unit), (e)->arr[2] = (cmd),\ (e)->arr[3] = (chan), (e)->arr[4] = (p1), (e)->arr[5] = (p2),\ - *(short*)&(e)->arr[6] = (w14)) + *(short *)&(e)->arr[6] = (w14)) #if _QUAD_LOWWORD == 1 /* big endian */ diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 5445ee816ba..4b3f4a2eb5d 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.h,v 1.57 2002/03/14 01:27:14 millert Exp $ */ +/* $OpenBSD: proc.h,v 1.58 2002/03/14 03:16:12 millert Exp $ */ /* $NetBSD: proc.h,v 1.44 1996/04/22 01:23:21 christos Exp $ */ /*- @@ -383,8 +383,8 @@ void wakeup(void *chan); void reaper(void); void exit1(struct proc *, int); void exit2(struct proc *); -int fork1 __P((struct proc *, int, int, void *, size_t, void (*)(void *), - void *, register_t *)); +int fork1(struct proc *, int, int, void *, size_t, void (*)(void *), + void *, register_t *); void rqinit(void); int groupmember(gid_t, struct ucred *); void cpu_switch(struct proc *); diff --git a/sys/sys/signal.h b/sys/sys/signal.h index de26a6b37bc..1d7099139ee 100644 --- a/sys/sys/signal.h +++ b/sys/sys/signal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: signal.h,v 1.11 2002/03/14 01:27:14 millert Exp $ */ +/* $OpenBSD: signal.h,v 1.12 2002/03/14 03:16:12 millert Exp $ */ /* $NetBSD: signal.h,v 1.21 1996/02/09 18:25:32 christos Exp $ */ /* @@ -201,6 +201,6 @@ struct sigstack { * defined by <sys/signal.h>. */ __BEGIN_DECLS -void (*signal __P((int, void (*)(int))))(int); +void (*signal(int, void (*)(int)))(int); __END_DECLS #endif /* !_SYS_SIGNAL_H_ */ diff --git a/sys/sys/systm.h b/sys/sys/systm.h index a54d30923c6..07f322d0882 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: systm.h,v 1.47 2002/03/14 01:27:14 millert Exp $ */ +/* $OpenBSD: systm.h,v 1.48 2002/03/14 03:16:12 millert Exp $ */ /* $NetBSD: systm.h,v 1.50 1996/06/09 04:55:09 briggs Exp $ */ /*- @@ -252,8 +252,7 @@ TAILQ_HEAD(hook_desc_head, hook_desc); extern struct hook_desc_head shutdownhook_list, startuphook_list; -void *hook_establish __P((struct hook_desc_head *, int, void (*)(void *), - void *)); +void *hook_establish(struct hook_desc_head *, int, void (*)(void *), void *); void hook_disestablish(struct hook_desc_head *, void *); void dohooks(struct hook_desc_head *); @@ -272,7 +271,7 @@ void dohooks(struct hook_desc_head *); /* * Power management hooks. */ -void *powerhook_establish __P((void (*)(int, void *), void *)); +void *powerhook_establish(void (*)(int, void *), void *); void powerhook_disestablish(void *); void dopowerhooks(int); #define PWR_RESUME 0 diff --git a/sys/sys/un.h b/sys/sys/un.h index 372856eb231..b88241f50ef 100644 --- a/sys/sys/un.h +++ b/sys/sys/un.h @@ -1,4 +1,4 @@ -/* $OpenBSD: un.h,v 1.5 2002/03/14 01:27:14 millert Exp $ */ +/* $OpenBSD: un.h,v 1.6 2002/03/14 03:16:12 millert Exp $ */ /* $NetBSD: un.h,v 1.11 1996/02/04 02:12:47 christos Exp $ */ /* @@ -62,7 +62,7 @@ void unp_disconnect(struct unpcb *unp); void unp_drop(struct unpcb *unp, int errno); void unp_gc(void); void unp_mark(struct file *fp); -void unp_scan __P((struct mbuf *m0, void (*op)(struct file *), int)); +void unp_scan(struct mbuf *m0, void (*op)(struct file *), int); void unp_shutdown(struct unpcb *unp); int unp_externalize(struct mbuf *); int unp_internalize(struct mbuf *, struct proc *); diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index ac5e083e8f5..36e8a7bf16a 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vnode.h,v 1.48 2002/03/14 01:27:14 millert Exp $ */ +/* $OpenBSD: vnode.h,v 1.49 2002/03/14 03:16:12 millert Exp $ */ /* $NetBSD: vnode.h,v 1.38 1996/02/29 20:59:05 cgd Exp $ */ /* @@ -342,7 +342,7 @@ struct simplelock mntvnode_slock; #define VOPARG_OFFSETOF(s_type,field) \ VOPARG_OFFSET(s_type*,field) #define VOPARG_OFFSETTO(S_TYPE,S_OFFSET,STRUCT_P) \ - ((S_TYPE)(((char*)(STRUCT_P))+(S_OFFSET))) + ((S_TYPE)(((char *)(STRUCT_P))+(S_OFFSET))) /* @@ -407,8 +407,8 @@ struct vnode; int bdevvp(dev_t dev, struct vnode **vpp); int cdevvp(dev_t dev, struct vnode **vpp); -int getnewvnode __P((enum vtagtype tag, struct mount *mp, - int (**vops)(void *), struct vnode **vpp)); +int getnewvnode(enum vtagtype tag, struct mount *mp, + int (**vops)(void *), struct vnode **vpp); int getvnode(struct filedesc *fdp, int fd, struct file **fpp); void getnewfsid(struct mount *, int); void vattr_null(struct vattr *vap); diff --git a/sys/ufs/ext2fs/ext2fs_alloc.c b/sys/ufs/ext2fs/ext2fs_alloc.c index 05cc4fca44d..9b2cf175a22 100644 --- a/sys/ufs/ext2fs/ext2fs_alloc.c +++ b/sys/ufs/ext2fs/ext2fs_alloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_alloc.c,v 1.8 2002/03/14 01:27:14 millert Exp $ */ +/* $OpenBSD: ext2fs_alloc.c,v 1.9 2002/03/14 03:16:13 millert Exp $ */ /* $NetBSD: ext2fs_alloc.c,v 1.10 2001/07/05 08:38:27 toshii Exp $ */ /* @@ -59,9 +59,8 @@ u_long ext2gennumber; static ufs_daddr_t ext2fs_alloccg(struct inode *, int, ufs_daddr_t, int); static u_long ext2fs_dirpref(struct m_ext2fs *); static void ext2fs_fserr(struct m_ext2fs *, u_int, char *); -static u_long ext2fs_hashalloc __P((struct inode *, int, long, int, - ufs_daddr_t (*)(struct inode *, int, ufs_daddr_t, - int))); +static u_long ext2fs_hashalloc(struct inode *, int, long, int, + ufs_daddr_t (*)(struct inode *, int, ufs_daddr_t, int)); static ufs_daddr_t ext2fs_nodealloccg(struct inode *, int, ufs_daddr_t, int); static ufs_daddr_t ext2fs_mapsearch(struct m_ext2fs *, char *, ufs_daddr_t); diff --git a/sys/ufs/ext2fs/ext2fs_extern.h b/sys/ufs/ext2fs/ext2fs_extern.h index 07515696322..f9b721fafdd 100644 --- a/sys/ufs/ext2fs/ext2fs_extern.h +++ b/sys/ufs/ext2fs/ext2fs_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_extern.h,v 1.14 2002/03/14 01:27:14 millert Exp $ */ +/* $OpenBSD: ext2fs_extern.h,v 1.15 2002/03/14 03:16:13 millert Exp $ */ /* $NetBSD: ext2fs_extern.h,v 1.1 1997/06/11 09:33:55 bouyer Exp $ */ /*- @@ -140,10 +140,10 @@ int ext2fs_rmdir(void *); int ext2fs_symlink(void *); int ext2fs_readlink(void *); int ext2fs_advlock(void *); -int ext2fs_vinit __P((struct mount *, int (**specops)(void *), - int (**fifoops)(void *), struct vnode **)); +int ext2fs_vinit(struct mount *, int (**specops)(void *), + int (**fifoops)(void *), struct vnode **); int ext2fs_makeinode(int, struct vnode *, struct vnode **, - struct componentname *cnp); + struct componentname *cnp); int ext2fs_fsync(void *); int ext2fs_reclaim(void *); diff --git a/sys/ufs/ext2fs/ext2fs_vnops.c b/sys/ufs/ext2fs/ext2fs_vnops.c index 8e9187a32c0..09b96dd1d17 100644 --- a/sys/ufs/ext2fs/ext2fs_vnops.c +++ b/sys/ufs/ext2fs/ext2fs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_vnops.c,v 1.23 2002/03/14 01:27:14 millert Exp $ */ +/* $OpenBSD: ext2fs_vnops.c,v 1.24 2002/03/14 03:16:13 millert Exp $ */ /* $NetBSD: ext2fs_vnops.c,v 1.1 1997/06/11 09:34:09 bouyer Exp $ */ /* @@ -1468,7 +1468,7 @@ struct vnodeopv_entry_desc ext2fs_vnodeop_entries[] = { { &vop_pathconf_desc, ufs_pathconf }, /* pathconf */ { &vop_advlock_desc, ext2fs_advlock }, /* advlock */ { &vop_bwrite_desc, vop_generic_bwrite }, /* bwrite */ - { (struct vnodeop_desc*)NULL, (int(*)(void*))NULL } + { (struct vnodeop_desc*)NULL, (int(*)(void *))NULL } }; struct vnodeopv_desc ext2fs_vnodeop_opv_desc = { &ext2fs_vnodeop_p, ext2fs_vnodeop_entries }; diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 7099e0f10bb..1b89552d9d5 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_alloc.c,v 1.40 2002/03/14 01:27:14 millert Exp $ */ +/* $OpenBSD: ffs_alloc.c,v 1.41 2002/03/14 03:16:13 millert Exp $ */ /* $NetBSD: ffs_alloc.c,v 1.11 1996/05/11 18:27:09 mycroft Exp $ */ /* @@ -65,9 +65,8 @@ static daddr_t ffs_clusteralloc(struct inode *, int, daddr_t, int); static ino_t ffs_dirpref(struct inode *); static daddr_t ffs_fragextend(struct inode *, int, long, int, int); static void ffs_fserr(struct fs *, u_int, char *); -static u_long ffs_hashalloc __P((struct inode *, int, long, int, - daddr_t (*)(struct inode *, int, daddr_t, - int))); +static u_long ffs_hashalloc(struct inode *, int, long, int, + daddr_t (*)(struct inode *, int, daddr_t, int)); static daddr_t ffs_nodealloccg(struct inode *, int, daddr_t, int); static daddr_t ffs_mapsearch(struct fs *, struct cg *, daddr_t, int); diff --git a/sys/ufs/lfs/lfs_extern.h b/sys/ufs/lfs/lfs_extern.h index fd042001dbb..0dabf285092 100644 --- a/sys/ufs/lfs/lfs_extern.h +++ b/sys/ufs/lfs/lfs_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lfs_extern.h,v 1.7 2002/03/14 01:27:15 millert Exp $ */ +/* $OpenBSD: lfs_extern.h,v 1.8 2002/03/14 03:16:13 millert Exp $ */ /* $NetBSD: lfs_extern.h,v 1.5 1996/02/12 15:20:12 christos Exp $ */ /*- @@ -86,7 +86,7 @@ int lfs_segwrite(struct mount *, int); void lfs_writefile(struct lfs *, struct segment *, struct vnode *); int lfs_writeinode(struct lfs *, struct segment *, struct inode *); int lfs_gatherblock(struct segment *, struct buf *, int *); -void lfs_gather __P((struct lfs *, struct segment *, struct vnode *, int (*match )(struct lfs *, struct buf *))); +void lfs_gather(struct lfs *, struct segment *, struct vnode *, int (*match )(struct lfs *, struct buf *)); void lfs_updatemeta(struct segment *); int lfs_initseg(struct lfs *); void lfs_newseg(struct lfs *); diff --git a/sys/ufs/lfs/lfs_segment.c b/sys/ufs/lfs/lfs_segment.c index 3b53e35c5f9..715c3e4408b 100644 --- a/sys/ufs/lfs/lfs_segment.c +++ b/sys/ufs/lfs/lfs_segment.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lfs_segment.c,v 1.10 2002/03/14 01:27:15 millert Exp $ */ +/* $OpenBSD: lfs_segment.c,v 1.11 2002/03/14 03:16:13 millert Exp $ */ /* $NetBSD: lfs_segment.c,v 1.4 1996/02/09 22:28:54 christos Exp $ */ /* @@ -74,8 +74,8 @@ extern int count_lock_queue(void); 1 << (fs)->lfs_fsbtodb) void lfs_callback(struct buf *); -void lfs_gather __P((struct lfs *, struct segment *, - struct vnode *, int (*)(struct lfs *, struct buf *))); +void lfs_gather(struct lfs *, struct segment *, + struct vnode *, int (*)(struct lfs *, struct buf *)); int lfs_gatherblock(struct segment *, struct buf *, int *); void lfs_iset(struct inode *, ufs_daddr_t, time_t); int lfs_match_data(struct lfs *, struct buf *); diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h index 9c2d44130e3..eb3ba5c6c08 100644 --- a/sys/ufs/ufs/ufs_extern.h +++ b/sys/ufs/ufs/ufs_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_extern.h,v 1.17 2002/03/14 01:27:15 millert Exp $ */ +/* $OpenBSD: ufs_extern.h,v 1.18 2002/03/14 03:16:13 millert Exp $ */ /* $NetBSD: ufs_extern.h,v 1.5 1996/02/09 22:36:03 christos Exp $ */ /*- @@ -144,10 +144,10 @@ int ufs_check_export(struct mount *, struct mbuf *, int *, struct ucred **); /* ufs_vnops.c */ -int ufs_vinit __P((struct mount *, int (**)(void *), - int (**)(void *), struct vnode **)); +int ufs_vinit(struct mount *, int (**)(void *), + int (**)(void *), struct vnode **); int ufs_makeinode(int, struct vnode *, struct vnode **, - struct componentname *); + struct componentname *); /* diff --git a/sys/uvm/uvm_ddb.h b/sys/uvm/uvm_ddb.h index c16cb34d265..25bff190167 100644 --- a/sys/uvm/uvm_ddb.h +++ b/sys/uvm/uvm_ddb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_ddb.h,v 1.11 2002/03/14 01:27:18 millert Exp $ */ +/* $OpenBSD: uvm_ddb.h,v 1.12 2002/03/14 03:16:13 millert Exp $ */ /* $NetBSD: uvm_ddb.h,v 1.5 2000/11/25 06:27:59 chs Exp $ */ /* @@ -41,12 +41,12 @@ #ifdef _KERNEL #ifdef DDB -void uvm_map_printit __P((vm_map_t, boolean_t, - int (*)(const char *, ...))); -void uvm_object_printit __P((struct uvm_object *, boolean_t, - int (*)(const char *, ...))); -void uvm_page_printit __P((struct vm_page *, boolean_t, - int (*)(const char *, ...))); +void uvm_map_printit(vm_map_t, boolean_t, + int (*)(const char *, ...)); +void uvm_object_printit(struct uvm_object *, boolean_t, + int (*)(const char *, ...)); +void uvm_page_printit(struct vm_page *, boolean_t, + int (*)(const char *, ...)); void uvmexp_print(int (*)(const char *, ...)); #endif /* DDB */ diff --git a/sys/uvm/uvm_extern.h b/sys/uvm/uvm_extern.h index f2a988991f5..b26d57e2f51 100644 --- a/sys/uvm/uvm_extern.h +++ b/sys/uvm/uvm_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_extern.h,v 1.44 2002/03/14 01:27:18 millert Exp $ */ +/* $OpenBSD: uvm_extern.h,v 1.45 2002/03/14 03:16:13 millert Exp $ */ /* $NetBSD: uvm_extern.h,v 1.57 2001/03/09 01:02:12 chs Exp $ */ /* @@ -455,8 +455,8 @@ void cpu_swapin(struct proc *); #ifndef cpu_swapout void cpu_swapout(struct proc *); #endif -void cpu_fork __P((struct proc *, struct proc *, void *, size_t, - void (*)(void *), void *)); +void cpu_fork(struct proc *, struct proc *, void *, size_t, + void (*)(void *), void *); /* uvm_aobj.c */ struct uvm_object *uao_create(vsize_t, int); @@ -474,8 +474,8 @@ int uvm_fault(vm_map_t, vaddr_t, #if defined(KGDB) void uvm_chgkprot(caddr_t, size_t, int); #endif -void uvm_fork __P((struct proc *, struct proc *, boolean_t, - void *, size_t, void (*)(void *), void *)); +void uvm_fork(struct proc *, struct proc *, boolean_t, + void *, size_t, void (*)(void *), void *); void uvm_exit(struct proc *); void uvm_init_limits(struct proc *); boolean_t uvm_kernacc(caddr_t, size_t, int); diff --git a/sys/uvm/uvm_map.c b/sys/uvm/uvm_map.c index 687f2849df4..db61ba292c0 100644 --- a/sys/uvm/uvm_map.c +++ b/sys/uvm/uvm_map.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_map.c,v 1.44 2002/03/14 01:27:18 millert Exp $ */ +/* $OpenBSD: uvm_map.c,v 1.45 2002/03/14 03:16:13 millert Exp $ */ /* $NetBSD: uvm_map.c,v 1.86 2000/11/27 08:40:03 chs Exp $ */ /* @@ -426,7 +426,7 @@ uvm_mapent_copy(src, dst) vm_map_entry_t dst; { - memcpy(dst, src, ((char *)&src->uvm_map_entry_stop_copy) - ((char*)src)); + memcpy(dst, src, ((char *)&src->uvm_map_entry_stop_copy) - ((char *)src)); } /* diff --git a/sys/xfs/xfs_vnodeops-common.c b/sys/xfs/xfs_vnodeops-common.c index ed102ad1205..92b10c47232 100644 --- a/sys/xfs/xfs_vnodeops-common.c +++ b/sys/xfs/xfs_vnodeops-common.c @@ -49,7 +49,7 @@ #include <xfs/xfs_syscalls.h> #include <xfs/xfs_vnodeops.h> -RCSID("$Id: xfs_vnodeops-common.c,v 1.4 2000/09/11 14:26:54 art Exp $"); +RCSID("$Id: xfs_vnodeops-common.c,v 1.5 2002/03/14 03:16:14 millert Exp $"); int xfs_open_valid(struct vnode *vp, struct ucred *cred, struct proc *p, @@ -319,7 +319,7 @@ xfs_read_common(struct vnode *vp, struct uio *uio, int ioflag, if (uio->uio_iovcnt && uio->uio_iov[0].iov_len > 0) XFSDEB(XDEBVNOPS, ("xfs_read: byte: %d\n", - ((char*)uio->uio_iov[0].iov_base)[0])); + ((char *)uio->uio_iov[0].iov_base)[0])); } XFSDEB(XDEBVNOPS, ("xfs_read offset: %lu resid: %d\n", |