diff options
author | obrien <obrien@FreeBSD.org> | 2002-03-20 18:58:47 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2002-03-20 18:58:47 +0000 |
commit | a11b0bc7ef9aa0716078fb29c8eeb46df0f454bf (patch) | |
tree | aa4a8b1f00274b707255148923fbee6b3b0e8414 /sys/alpha/tc | |
parent | 37ff43589ebd29f29200833b6772e1ea25901790 (diff) | |
download | FreeBSD-src-a11b0bc7ef9aa0716078fb29c8eeb46df0f454bf.zip FreeBSD-src-a11b0bc7ef9aa0716078fb29c8eeb46df0f454bf.tar.gz |
Remove __P(). This was tested on the GENERIC kernel.
Diffstat (limited to 'sys/alpha/tc')
-rw-r--r-- | sys/alpha/tc/am7990.c | 22 | ||||
-rw-r--r-- | sys/alpha/tc/am7990var.h | 64 | ||||
-rw-r--r-- | sys/alpha/tc/ascvar.h | 12 | ||||
-rw-r--r-- | sys/alpha/tc/esp.c | 44 | ||||
-rw-r--r-- | sys/alpha/tc/if_le_dec.c | 6 | ||||
-rw-r--r-- | sys/alpha/tc/if_le_ioasic.c | 20 | ||||
-rw-r--r-- | sys/alpha/tc/if_levar.h | 2 | ||||
-rw-r--r-- | sys/alpha/tc/ioasic.c | 6 | ||||
-rw-r--r-- | sys/alpha/tc/ioasicvar.h | 8 | ||||
-rw-r--r-- | sys/alpha/tc/sticvar.h | 2 | ||||
-rw-r--r-- | sys/alpha/tc/tc.c | 38 | ||||
-rw-r--r-- | sys/alpha/tc/tcds.c | 6 | ||||
-rw-r--r-- | sys/alpha/tc/tcdsreg.h | 16 | ||||
-rw-r--r-- | sys/alpha/tc/tcdsvar.h | 32 | ||||
-rw-r--r-- | sys/alpha/tc/tcvar.h | 14 |
15 files changed, 146 insertions, 146 deletions
diff --git a/sys/alpha/tc/am7990.c b/sys/alpha/tc/am7990.c index 8a40fe2..bbb7c06 100644 --- a/sys/alpha/tc/am7990.c +++ b/sys/alpha/tc/am7990.c @@ -111,27 +111,27 @@ #include <alpha/tc/am7990var.h> #ifdef LEDEBUG -void am7990_recv_print __P((struct am7990_softc *, int)); -void am7990_xmit_print __P((struct am7990_softc *, int)); +void am7990_recv_print(struct am7990_softc *, int); +void am7990_xmit_print(struct am7990_softc *, int); #endif -integrate void am7990_rint __P((struct am7990_softc *)); -integrate void am7990_tint __P((struct am7990_softc *)); +integrate void am7990_rint(struct am7990_softc *); +integrate void am7990_tint(struct am7990_softc *); -integrate int am7990_put __P((struct am7990_softc *, int, struct mbuf *)); -integrate struct mbuf *am7990_get __P((struct am7990_softc *, int, int)); -integrate void am7990_read __P((struct am7990_softc *, int, int)); +integrate int am7990_put(struct am7990_softc *, int, struct mbuf *); +integrate struct mbuf *am7990_get(struct am7990_softc *, int, int); +integrate void am7990_read(struct am7990_softc *, int, int); /* -hide void am7990_shutdown __P((void *)); +hide void am7990_shutdown(void *); */ -int am7990_mediachange __P((struct ifnet *)); -void am7990_mediastatus __P((struct ifnet *, struct ifmediareq *)); +int am7990_mediachange(struct ifnet *); +void am7990_mediastatus(struct ifnet *, struct ifmediareq *); #define ifp (&sc->sc_ethercom.ac_if) -static __inline u_int16_t ether_cmp __P((void *, void *)); +static __inline u_int16_t ether_cmp(void *, void *); char * ether_sprintf(u_char *ap); /* * Compare two Ether/802 addresses for equality, inlined and diff --git a/sys/alpha/tc/am7990var.h b/sys/alpha/tc/am7990var.h index 2560f9f..5f36651 100644 --- a/sys/alpha/tc/am7990var.h +++ b/sys/alpha/tc/am7990var.h @@ -101,15 +101,15 @@ struct am7990_softc { * zero bytes in buffer */ void (*sc_copytodesc) - __P((struct am7990_softc *, void *, int, int)); + (struct am7990_softc *, void *, int, int); void (*sc_copyfromdesc) - __P((struct am7990_softc *, void *, int, int)); + (struct am7990_softc *, void *, int, int); void (*sc_copytobuf) - __P((struct am7990_softc *, void *, int, int)); + (struct am7990_softc *, void *, int, int); void (*sc_copyfrombuf) - __P((struct am7990_softc *, void *, int, int)); + (struct am7990_softc *, void *, int, int); void (*sc_zerobuf) - __P((struct am7990_softc *, int, int)); + (struct am7990_softc *, int, int); /* * Machine-dependent functions: @@ -121,15 +121,15 @@ struct am7990_softc { * media change hook - may be NULL */ u_int16_t (*sc_rdcsr) - __P((struct am7990_softc *, u_int16_t)); + (struct am7990_softc *, u_int16_t); void (*sc_wrcsr) - __P((struct am7990_softc *, u_int16_t, u_int16_t)); - void (*sc_hwreset) __P((struct am7990_softc *)); - void (*sc_hwinit) __P((struct am7990_softc *)); - void (*sc_nocarrier) __P((struct am7990_softc *)); - int (*sc_mediachange) __P((struct am7990_softc *)); - void (*sc_mediastatus) __P((struct am7990_softc *, - struct ifmediareq *)); + (struct am7990_softc *, u_int16_t, u_int16_t); + void (*sc_hwreset)(struct am7990_softc *); + void (*sc_hwinit)(struct am7990_softc *); + void (*sc_nocarrier)(struct am7990_softc *); + int (*sc_mediachange)(struct am7990_softc *); + void (*sc_mediastatus)(struct am7990_softc *, + struct ifmediareq *); /* * Media-supported by this interface. If this is NULL, @@ -176,16 +176,16 @@ struct am7990_softc { #endif }; -void am7990_config __P((struct am7990_softc *)); -void am7990_init __P((struct am7990_softc *)); -int am7990_ioctl __P((struct ifnet *, u_long, caddr_t)); -void am7990_meminit __P((struct am7990_softc *)); -void am7990_reset __P((struct am7990_softc *)); -void am7990_setladrf __P((struct arpcom *, u_int16_t *)); -void am7990_start __P((struct ifnet *)); -void am7990_stop __P((struct am7990_softc *)); -void am7990_watchdog __P((struct ifnet *)); -void am7990_intr __P((void *)); +void am7990_config(struct am7990_softc *); +void am7990_init(struct am7990_softc *); +int am7990_ioctl(struct ifnet *, u_long, caddr_t); +void am7990_meminit(struct am7990_softc *); +void am7990_reset(struct am7990_softc *); +void am7990_setladrf(struct arpcom *, u_int16_t *); +void am7990_start(struct ifnet *); +void am7990_stop(struct am7990_softc *); +void am7990_watchdog(struct ifnet *); +void am7990_intr(void *); /* * The following functions are only useful on certain cpu/bus @@ -193,16 +193,16 @@ void am7990_intr __P((void *)); * maximum efficiency, but machine-independent versions are provided * for drivers that have not yet been optimized. */ -void am7990_copytobuf_contig __P((struct am7990_softc *, void *, int, int)); -void am7990_copyfrombuf_contig __P((struct am7990_softc *, void *, int, int)); -void am7990_zerobuf_contig __P((struct am7990_softc *, int, int)); +void am7990_copytobuf_contig(struct am7990_softc *, void *, int, int); +void am7990_copyfrombuf_contig(struct am7990_softc *, void *, int, int); +void am7990_zerobuf_contig(struct am7990_softc *, int, int); #if 0 /* Example only - see am7990.c */ -void am7990_copytobuf_gap2 __P((struct am7990_softc *, void *, int, int)); -void am7990_copyfrombuf_gap2 __P((struct am7990_softc *, void *, int, int)); -void am7990_zerobuf_gap2 __P((struct am7990_softc *, int, int)); +void am7990_copytobuf_gap2(struct am7990_softc *, void *, int, int); +void am7990_copyfrombuf_gap2(struct am7990_softc *, void *, int, int); +void am7990_zerobuf_gap2(struct am7990_softc *, int, int); -void am7990_copytobuf_gap16 __P((struct am7990_softc *, void *, int, int)); -void am7990_copyfrombuf_gap16 __P((struct am7990_softc *, void *, int, int)); -void am7990_zerobuf_gap16 __P((struct am7990_softc *, int, int)); +void am7990_copytobuf_gap16(struct am7990_softc *, void *, int, int); +void am7990_copyfrombuf_gap16(struct am7990_softc *, void *, int, int); +void am7990_zerobuf_gap16(struct am7990_softc *, int, int); #endif /* Example only */ diff --git a/sys/alpha/tc/ascvar.h b/sys/alpha/tc/ascvar.h index b5619db..e22814d 100644 --- a/sys/alpha/tc/ascvar.h +++ b/sys/alpha/tc/ascvar.h @@ -53,12 +53,12 @@ struct asc_softc { ScsiCmd *cmd[ASC_NCMD]; /* active command indexed by SCSI ID */ State st[ASC_NCMD]; /* state info for each active command */ /* Start dma routine */ - int (*dma_start) __P((struct asc_softc *asc, + int (*dma_start)(struct asc_softc *asc, struct scsi_state *state, - caddr_t cp, int flag, int len, int off)); + caddr_t cp, int flag, int len, int off); /* End dma routine */ - void (*dma_end) __P((struct asc_softc *asc, - struct scsi_state *state, int flag)); + void (*dma_end)(struct asc_softc *asc, + struct scsi_state *state, int flag); u_char *dma_next; int dma_xfer; /* Dma len still to go */ @@ -82,8 +82,8 @@ typedef struct asc_softc *asc_softc_t; #define ASC_SPEED_25_MHZ 250 #define ASC_SPEED_12_5_MHZ 125 -void ascattach __P((struct asc_softc *asc, int bus_speed)); -int asc_intr __P ((void *asc)); +void ascattach(struct asc_softc *asc, int bus_speed); +int asc_intr(void *asc); /* * Dma operations. diff --git a/sys/alpha/tc/esp.c b/sys/alpha/tc/esp.c index d9f7577..2b5b40f 100644 --- a/sys/alpha/tc/esp.c +++ b/sys/alpha/tc/esp.c @@ -70,28 +70,28 @@ int esp_debug = 0; /*ESP_SHOWPHASE|ESP_SHOWMISC|ESP_SHOWTRAC|ESP_SHOWCMDS;*/ -/*static*/ void espattach __P((device_t, device_t, void *)); -/*static*/ int espmatch __P((device_t, void *, void *)); -/*static*/ int espprint __P((void *, char *)); -/*static*/ u_int esp_adapter_info __P((struct esp_softc *)); -/*static*/ void espreadregs __P((struct esp_softc *)); -/*static*/ void espselect __P((struct esp_softc *, - u_char, u_char, u_char *, u_char)); -/*static*/ void esp_scsi_reset __P((struct esp_softc *)); -/*static*/ void esp_reset __P((struct esp_softc *)); -/*static*/ void esp_init __P((struct esp_softc *, int)); -/*static*/ int esp_scsi_cmd __P((struct scsi_xfer *)); -/*static*/ int esp_poll __P((struct esp_softc *, struct ecb *)); -/*static*/ void esp_sched __P((struct esp_softc *)); -/*static*/ void esp_done __P((struct ecb *)); -/*static*/ void esp_msgin __P((struct esp_softc *)); -/*static*/ void esp_msgout __P((struct esp_softc *)); -/*static*/ int espintr __P((struct esp_softc *)); -/*static*/ void esp_timeout __P((void *arg)); -/*static*/ void esp_abort __P((struct esp_softc *, struct ecb *)); -static u_int32_t esp_info __P((int)); -int esp_stp2cpb __P((struct esp_softc *, int)); -int esp_cpb2stp __P((struct esp_softc *, int)); +/*static*/ void espattach (device_t, device_t, void *); +/*static*/ int espmatch (device_t, void *, void *); +/*static*/ int espprint (void *, char *); +/*static*/ u_int esp_adapter_info(struct esp_softc *); +/*static*/ void espreadregs (struct esp_softc *); +/*static*/ void espselect (struct esp_softc *, + u_char, u_char, u_char *, u_char); +/*static*/ void esp_scsi_reset (struct esp_softc *); +/*static*/ void esp_reset (struct esp_softc *); +/*static*/ void esp_init (struct esp_softc *, int); +/*static*/ int esp_scsi_cmd (struct scsi_xfer *); +/*static*/ int esp_poll (struct esp_softc *, struct ecb *); +/*static*/ void esp_sched (struct esp_softc *); +/*static*/ void esp_done (struct ecb *); +/*static*/ void esp_msgin (struct esp_softc *); +/*static*/ void esp_msgout (struct esp_softc *); +/*static*/ int espintr (struct esp_softc *); +/*static*/ void esp_timeout (void *arg); +/*static*/ void esp_abort (struct esp_softc *, struct ecb *); +static u_int32_t esp_info (int); +int esp_stp2cpb(struct esp_softc *, int); +int esp_cpb2stp(struct esp_softc *, int); static void esp_min_phys (struct buf *); static int esp_probe(device_t dev); diff --git a/sys/alpha/tc/if_le_dec.c b/sys/alpha/tc/if_le_dec.c index 5e50f50..8a136e2 100644 --- a/sys/alpha/tc/if_le_dec.c +++ b/sys/alpha/tc/if_le_dec.c @@ -77,12 +77,12 @@ /* access LANCE registers */ -void le_dec_writereg __P((volatile u_short *regptr, u_short val)); +void le_dec_writereg(volatile u_short *regptr, u_short val); #define LERDWR(cntl, src, dst) { (dst) = (src); tc_mb(); } #define LEWREG(src, dst) le_dec_writereg(&(dst), (src)) -hide void le_dec_wrcsr __P((struct am7990_softc *, u_int16_t, u_int16_t)); -hide u_int16_t le_dec_rdcsr __P((struct am7990_softc *, u_int16_t)); +hide void le_dec_wrcsr(struct am7990_softc *, u_int16_t, u_int16_t); +hide u_int16_t le_dec_rdcsr(struct am7990_softc *, u_int16_t); char *ether_sprintf(char *); void dec_le_common_attach(sc, eap) diff --git a/sys/alpha/tc/if_le_ioasic.c b/sys/alpha/tc/if_le_ioasic.c index 31116a3..0e7ed07 100644 --- a/sys/alpha/tc/if_le_ioasic.c +++ b/sys/alpha/tc/if_le_ioasic.c @@ -83,16 +83,16 @@ static driver_t le_ioasic_driver = { static devclass_t le_ioasic_devclass; -hide void le_ioasic_copytobuf_gap2 __P((struct am7990_softc *, void *, - int, int)); -hide void le_ioasic_copyfrombuf_gap2 __P((struct am7990_softc *, void *, - int, int)); - -hide void le_ioasic_copytobuf_gap16 __P((struct am7990_softc *, void *, - int, int)); -hide void le_ioasic_copyfrombuf_gap16 __P((struct am7990_softc *, void *, - int, int)); -hide void le_ioasic_zerobuf_gap16 __P((struct am7990_softc *, int, int)); +hide void le_ioasic_copytobuf_gap2(struct am7990_softc *, void *, + int, int); +hide void le_ioasic_copyfrombuf_gap2(struct am7990_softc *, void *, + int, int); + +hide void le_ioasic_copytobuf_gap16(struct am7990_softc *, void *, + int, int); +hide void le_ioasic_copyfrombuf_gap16(struct am7990_softc *, void *, + int, int); +hide void le_ioasic_zerobuf_gap16(struct am7990_softc *, int, int); static int diff --git a/sys/alpha/tc/if_levar.h b/sys/alpha/tc/if_levar.h index 9353ab2..cbcb96f 100644 --- a/sys/alpha/tc/if_levar.h +++ b/sys/alpha/tc/if_levar.h @@ -66,4 +66,4 @@ struct le_softc { struct lereg1 *sc_r1; /* LANCE registers */ }; -void dec_le_common_attach __P((struct am7990_softc *, u_char *)); +void dec_le_common_attach(struct am7990_softc *, u_char *); diff --git a/sys/alpha/tc/ioasic.c b/sys/alpha/tc/ioasic.c index 2cfe603..ee960f2 100644 --- a/sys/alpha/tc/ioasic.c +++ b/sys/alpha/tc/ioasic.c @@ -101,7 +101,7 @@ static int ioasic_attach(device_t dev); static driver_intr_t ioasic_intrnull; static int ioasic_print_child(device_t bus, device_t dev); static void ioasic_lance_dma_setup(void *v); -int ioasic_intr __P((void *)); +int ioasic_intr(void *); caddr_t le_iomem = 0; @@ -145,7 +145,7 @@ struct ioasic_dev ioasic_devs[] = { }; int ioasic_ndevs = sizeof(ioasic_devs) / sizeof(ioasic_devs[0]); struct ioasicintr { - void (*iai_func) __P((void *)); + void (*iai_func)(void *); void *iai_arg; } ioasicintrs[IOASIC_NCOOKIES]; @@ -283,7 +283,7 @@ ioasic_intr_establish(ioa, cookie, level, func, arg) device_t ioa; void *cookie, *arg; tc_intrlevel_t level; - void (*func) __P((void *)); + void (*func)(void *); { u_long dev, i; diff --git a/sys/alpha/tc/ioasicvar.h b/sys/alpha/tc/ioasicvar.h index 9ae2097..f1d5a6c 100644 --- a/sys/alpha/tc/ioasicvar.h +++ b/sys/alpha/tc/ioasicvar.h @@ -49,11 +49,11 @@ struct ioasic_dev { }; -char *ioasic_lance_ether_address __P((void)); +char *ioasic_lance_ether_address(void); /* * Interrupt establishment/disestablishment functions */ -void ioasic_intr_establish __P((device_t, void *, tc_intrlevel_t, - void (*)(void *), void *)); -void ioasic_intr_disestablish __P((device_t, void *)); +void ioasic_intr_establish(device_t, void *, tc_intrlevel_t, + void (*)(void *), void *); +void ioasic_intr_disestablish(device_t, void *); diff --git a/sys/alpha/tc/sticvar.h b/sys/alpha/tc/sticvar.h index be394ea..c45f93a 100644 --- a/sys/alpha/tc/sticvar.h +++ b/sys/alpha/tc/sticvar.h @@ -49,5 +49,5 @@ struct stic_softc { void* stic_pktbuf; /* kva of packet/polling area. */ }; -int stic_init __P((struct stic_softc *stic_sc)); +int stic_init(struct stic_softc *stic_sc); #endif /*_TC_STICVAR_H_ */ diff --git a/sys/alpha/tc/tc.c b/sys/alpha/tc/tc.c index 7c34306..39459f4 100644 --- a/sys/alpha/tc/tc.c +++ b/sys/alpha/tc/tc.c @@ -55,10 +55,10 @@ struct tc_softc { int nbuiltins; struct tc_builtin *builtins; struct tc_slotdesc *sc_slots; - void (*sc_intr_establish) __P((struct device *, void *, - tc_intrlevel_t, int (*)(void *), void *)); - void (*sc_intr_disestablish) __P((struct device *, void *)); -/* bus_dma_tag_t (*sc_get_dma_tag) __P((int)); + void (*sc_intr_establish)(struct device *, void *, + tc_intrlevel_t, int (*)(void *), void *); + void (*sc_intr_disestablish)(struct device *, void *); +/* bus_dma_tag_t (*sc_get_dma_tag)(int); */ }; #define NTC_ROMOFFS 2 @@ -91,19 +91,19 @@ static driver_t tc_driver = { #define C(x) ((void *)(u_long)x) -int tc_intrnull __P((void *)); +int tc_intrnull(void *); struct tcintr { - int (*tci_func) __P((void *)); + int (*tci_func)(void *); void *tci_arg; }; #ifdef DEC_3000_300 -void tc_3000_300_intr_setup __P((void)); -void tc_3000_300_intr_establish __P((struct device *, void *, - tc_intrlevel_t, int (*)(void *), void *)); -void tc_3000_300_intr_disestablish __P((struct device *, void *)); -void tc_3000_300_iointr __P((void *, unsigned long)); +void tc_3000_300_intr_setup(void); +void tc_3000_300_intr_establish(struct device *, void *, + tc_intrlevel_t, int (*)(void *), void *); +void tc_3000_300_intr_disestablish(struct device *, void *); +void tc_3000_300_iointr(void *, unsigned long); @@ -135,11 +135,11 @@ struct tcintr tc_3000_300_intr[TC_3000_300_NCOOKIES]; #endif /* DEC_3000_300 */ #ifdef DEC_3000_500 -void tc_3000_500_intr_setup __P((void)); -void tc_3000_500_intr_establish __P((struct device *, void *, - tc_intrlevel_t, int (*)(void *), void *)); -void tc_3000_500_intr_disestablish __P((struct device *, void *)); -void tc_3000_500_iointr __P((void *, unsigned long)); +void tc_3000_500_intr_setup(void); +void tc_3000_500_intr_establish(struct device *, void *, + tc_intrlevel_t, int (*)(void *), void *); +void tc_3000_500_intr_disestablish(struct device *, void *); +void tc_3000_500_iointr(void *, unsigned long); struct tc_slotdesc tc_3000_500_slots[] = { { KV(0x100000000), C(TC_3000_500_DEV_OPT0), }, /* 0 - opt slot 0 */ @@ -212,7 +212,7 @@ tc_3000_300_intr_establish(tcadev, cookie, level, func, arg) struct device *tcadev; void *cookie, *arg; tc_intrlevel_t level; - int (*func) __P((void *)); + int (*func)(void *); { volatile u_int32_t *imskp; u_long dev = (u_long)cookie; @@ -383,7 +383,7 @@ tc_3000_500_intr_establish(tcadev, cookie, level, func, arg) struct device *tcadev; void *cookie, *arg; tc_intrlevel_t level; - int (*func) __P((void *)); + int (*func)(void *); { u_long dev = (u_long)cookie; @@ -666,7 +666,7 @@ tc_intr_establish(dev, cookie, level, handler, arg) struct device *dev; void *cookie, *arg; tc_intrlevel_t level; - int (*handler) __P((void *)); + int (*handler)(void *); { struct tc_softc *sc = (struct tc_softc *)device_get_softc(dev); diff --git a/sys/alpha/tc/tcds.c b/sys/alpha/tc/tcds.c index 2fe9292..44ef3cd 100644 --- a/sys/alpha/tc/tcds.c +++ b/sys/alpha/tc/tcds.c @@ -104,9 +104,9 @@ struct tcds_softc { static int tcds_probe(device_t dev); static int tcds_attach(device_t dev); -static void tcds_intrnull __P((void *)); +static void tcds_intrnull(void *); static void tcds_lance_dma_setup(void *v); -static int tcds_intr __P((void *)); +static int tcds_intr(void *); @@ -342,7 +342,7 @@ tcds_intr_establish(tcds, cookie, level, func, arg) device_t tcds; void *cookie, *arg; tc_intrlevel_t level; - int (*func) __P((void *)); + int (*func)(void *); { struct tcds_softc *sc = device_get_softc(tcds); u_long slot; diff --git a/sys/alpha/tc/tcdsreg.h b/sys/alpha/tc/tcdsreg.h index da48eb8..43bf773 100644 --- a/sys/alpha/tc/tcdsreg.h +++ b/sys/alpha/tc/tcdsreg.h @@ -121,14 +121,14 @@ #define TCDS_DUD_BYTE11 0xff000000 /* byte 11 mask */ #if 0 -int tcds_scsi_iserr __P((struct dma_softc *)); -int tcds_scsi_isintr __P((int, int)); -void tcds_dma_disable __P((int)); -void tcds_dma_enable __P((int)); -void tcds_dma_init __P((struct dma_softc *, int)); -void tcds_scsi_disable __P((int)); -void tcds_scsi_enable __P((int)); -void tcds_scsi_reset __P((int)); +int tcds_scsi_iserr(struct dma_softc *); +int tcds_scsi_isintr(int, int); +void tcds_dma_disable(int); +void tcds_dma_enable(int); +void tcds_dma_init(struct dma_softc *, int); +void tcds_scsi_disable(int); +void tcds_scsi_enable(int); +void tcds_scsi_reset(int); /* * XXX diff --git a/sys/alpha/tc/tcdsvar.h b/sys/alpha/tc/tcdsvar.h index 8714507..138376f 100644 --- a/sys/alpha/tc/tcdsvar.h +++ b/sys/alpha/tc/tcdsvar.h @@ -35,7 +35,7 @@ struct tcds_slotconfig { int sc_slot; struct tcds_softc *sc_tcds; /* to frob TCDS regs */ struct esp_softc *sc_esp; /* to frob child's regs */ - void (*sc_intrhand) __P((void *)); /* intr. handler */ + void (*sc_intrhand)(void *); /* intr. handler */ void *sc_intrarg; /* intr. handler arg. */ /* @@ -84,25 +84,25 @@ struct tcdsdev_attach_args { /* * TCDS functions. */ -void tcds_intr_establish __P((device_t, void *, tc_intrlevel_t, - int (*)(void *), void *)); -void tcds_intr_disestablish __P((device_t, void *)); -void tcds_dma_enable __P((struct tcds_slotconfig *, int)); -void tcds_scsi_enable __P((struct tcds_slotconfig *, int)); -int tcds_scsi_isintr __P((struct tcds_slotconfig *, int)); -void tcds_scsi_reset __P((struct tcds_slotconfig *)); -int tcds_scsi_iserr __P((struct tcds_slotconfig *sc)); +void tcds_intr_establish(device_t, void *, tc_intrlevel_t, + int (*)(void *), void *); +void tcds_intr_disestablish(device_t, void *); +void tcds_dma_enable(struct tcds_slotconfig *, int); +void tcds_scsi_enable(struct tcds_slotconfig *, int); +int tcds_scsi_isintr(struct tcds_slotconfig *, int); +void tcds_scsi_reset(struct tcds_slotconfig *); +int tcds_scsi_iserr(struct tcds_slotconfig *sc); /* * TCDS DMA functions (used the the 53c94 driver) */ -int tcds_dma_isintr __P((struct tcds_slotconfig *)); -void tcds_dma_reset __P((struct tcds_slotconfig *)); -int tcds_dma_intr __P((struct tcds_slotconfig *)); -int tcds_dma_setup __P((struct tcds_slotconfig *, caddr_t *, size_t *, - int, size_t *)); -void tcds_dma_go __P((struct tcds_slotconfig *)); -int tcds_dma_isactive __P((struct tcds_slotconfig *)); +int tcds_dma_isintr (struct tcds_slotconfig *); +void tcds_dma_reset(struct tcds_slotconfig *); +int tcds_dma_intr(struct tcds_slotconfig *); +int tcds_dma_setup(struct tcds_slotconfig *, caddr_t *, size_t *, + int, size_t *); +void tcds_dma_go(struct tcds_slotconfig *); +int tcds_dma_isactive(struct tcds_slotconfig *); /* * The TCDS (bus) cfdriver, so that subdevices can more diff --git a/sys/alpha/tc/tcvar.h b/sys/alpha/tc/tcvar.h index 316c306..84b53f8 100644 --- a/sys/alpha/tc/tcvar.h +++ b/sys/alpha/tc/tcvar.h @@ -95,7 +95,7 @@ typedef int32_t tc_offset_t; * These functions are private, and may not be called by * machine-independent code. */ -void tc_dma_init __P((void)); +void tc_dma_init(void); /* * Address of scatter/gather SRAM on the 3000/500-series. @@ -149,9 +149,9 @@ struct tcbus_attach_args { /* TC bus resource management; XXX will move elsewhere eventually. */ /* - void (*tba_intr_establish) __P((device_t, void *, - tc_intrlevel_t, int (*)(void *), void *)); - void (*tba_intr_disestablish) __P((device_t, void *)); + void (*tba_intr_establish)(device_t, void *, + tc_intrlevel_t, int (*)(void *), void *); + void (*tba_intr_disestablish)(device_t, void *); */ }; @@ -174,9 +174,9 @@ struct tc_attach_args { /* * Interrupt establishment functions. */ -void tc_intr_establish __P((device_t, void *, tc_intrlevel_t, - int (*)(void *), void *)); -void tc_intr_disestablish __P((device_t, void *)); +void tc_intr_establish(device_t, void *, tc_intrlevel_t, + int (*)(void *), void *); +void tc_intr_disestablish(device_t, void *); #if 0 #include "locators.h" |