diff options
Diffstat (limited to 'sys/dev/ic')
-rw-r--r-- | sys/dev/ic/bha.c | 4 | ||||
-rw-r--r-- | sys/dev/ic/bt463.c | 4 | ||||
-rw-r--r-- | sys/dev/ic/bt463var.h | 10 | ||||
-rw-r--r-- | sys/dev/ic/bt485.c | 4 | ||||
-rw-r--r-- | sys/dev/ic/bt485var.h | 10 | ||||
-rw-r--r-- | sys/dev/ic/elink3.c | 4 | ||||
-rw-r--r-- | sys/dev/ic/i82596var.h | 4 | ||||
-rw-r--r-- | sys/dev/ic/mpuvar.h | 10 | ||||
-rw-r--r-- | sys/dev/ic/ncr5380sbc.c | 4 | ||||
-rw-r--r-- | sys/dev/ic/ramdac.h | 6 | ||||
-rw-r--r-- | sys/dev/ic/rln.c | 4 | ||||
-rw-r--r-- | sys/dev/ic/rlnvar.h | 4 | ||||
-rw-r--r-- | sys/dev/ic/sti.c | 6 | ||||
-rw-r--r-- | sys/dev/ic/vga.c | 18 | ||||
-rw-r--r-- | sys/dev/ic/vgavar.h | 12 | ||||
-rw-r--r-- | sys/dev/ic/wdcvar.h | 4 |
16 files changed, 54 insertions, 54 deletions
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 */ |