diff options
Diffstat (limited to 'sys/dev')
96 files changed, 433 insertions, 447 deletions
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 *); |