1 files changed, 46 insertions, 46 deletions

diff --git a/sys/dev/firewire/firewirereg.h b/sys/dev/firewire/firewirereg.h
index 1e205c1..bea218b 100644
--- a/sys/dev/firewire/firewirereg.h
+++ b/sys/dev/firewire/firewirereg.h
@@ -81,8 +81,8 @@ struct firewire_softc {
 struct firewire_dev_comm {
 	device_t dev;
 	struct firewire_comm *fc;
-	void (*post_busreset) __P((void *));
-	void (*post_explore) __P((void *));
+	void (*post_busreset) (void *);
+	void (*post_explore) (void *);
 };
 
 struct tcode_info {
@@ -150,19 +150,19 @@ struct firewire_comm{
 	struct callout bmr_callout;
 	struct callout timeout_callout;
 	struct callout retry_probe_callout;
-	u_int32_t (*cyctimer) __P((struct  firewire_comm *));
-	void (*ibr) __P((struct firewire_comm *));
-	u_int32_t (*set_bmr) __P((struct firewire_comm *, u_int32_t));
-	int (*ioctl) __P((dev_t, u_long, caddr_t, int, fw_proc *));
-	int (*irx_enable) __P((struct firewire_comm *, int));
-	int (*irx_disable) __P((struct firewire_comm *, int));
-	int (*itx_enable) __P((struct firewire_comm *, int));
-	int (*itx_disable) __P((struct firewire_comm *, int));
-	void (*timeout) __P((void *));
-	void (*poll) __P((struct firewire_comm *, int, int));
-	void (*set_intr) __P((struct firewire_comm *, int));
-	void (*irx_post) __P((struct firewire_comm *, u_int32_t *));
-	void (*itx_post) __P((struct firewire_comm *, u_int32_t *));
+	u_int32_t (*cyctimer) (struct  firewire_comm *);
+	void (*ibr) (struct firewire_comm *);
+	u_int32_t (*set_bmr) (struct firewire_comm *, u_int32_t);
+	int (*ioctl) (dev_t, u_long, caddr_t, int, fw_proc *);
+	int (*irx_enable) (struct firewire_comm *, int);
+	int (*irx_disable) (struct firewire_comm *, int);
+	int (*itx_enable) (struct firewire_comm *, int);
+	int (*itx_disable) (struct firewire_comm *, int);
+	void (*timeout) (void *);
+	void (*poll) (struct firewire_comm *, int, int);
+	void (*set_intr) (struct firewire_comm *, int);
+	void (*irx_post) (struct firewire_comm *, u_int32_t *);
+	void (*itx_post) (struct firewire_comm *, u_int32_t *);
 	struct tcode_info *tcode;
 	bus_dma_tag_t dmat;
 };
@@ -188,7 +188,7 @@ struct fw_xferq {
 
 #define FWXFERQ_HANDLER (1 << 16)
 #define FWXFERQ_WAKEUP (1 << 17)
-	void (*start) __P((struct firewire_comm*));
+	void (*start) (struct firewire_comm*);
 	int dmach;
 	STAILQ_HEAD(, fw_xfer) q;
 	u_int queued;
@@ -205,7 +205,7 @@ struct fw_xferq {
 	struct fw_bulkxfer *stproc;
 	struct selinfo rsel;
 	caddr_t sc;
-	void (*hand) __P((struct fw_xferq *));
+	void (*hand) (struct fw_xferq *);
 };
 
 struct fw_bulkxfer{
@@ -251,9 +251,9 @@ struct fw_xfer{
 	u_int8_t state;
 	u_int8_t retry;
 	u_int8_t tl;
-	void (*retry_req) __P((struct fw_xfer *));
+	void (*retry_req) (struct fw_xfer *);
 	union{
-		void (*hand) __P((struct fw_xfer *));
+		void (*hand) (struct fw_xfer *);
 	} act;
 	struct {
 		struct fw_pkt hdr;
@@ -274,33 +274,33 @@ struct fw_rcv_buf {
 	u_int8_t spd;
 };
 
-void fw_sidrcv __P((struct firewire_comm *, u_int32_t *, u_int));
-void fw_rcv __P((struct fw_rcv_buf *));
-void fw_xfer_unload __P(( struct fw_xfer*));
-void fw_xfer_free_buf __P(( struct fw_xfer*));
-void fw_xfer_free __P(( struct fw_xfer*));
-struct fw_xfer *fw_xfer_alloc __P((struct malloc_type *));
-struct fw_xfer *fw_xfer_alloc_buf __P((struct malloc_type *, int, int));
-void fw_init __P((struct firewire_comm *));
-int fw_tbuf_update __P((struct firewire_comm *, int, int));
-int fw_rbuf_update __P((struct firewire_comm *, int, int));
-void fw_asybusy __P((struct fw_xfer *));
-int fw_bindadd __P((struct firewire_comm *, struct fw_bind *));
-int fw_bindremove __P((struct firewire_comm *, struct fw_bind *));
-int fw_asyreq __P((struct firewire_comm *, int, struct fw_xfer*));
-void fw_busreset __P((struct firewire_comm *));
-u_int16_t fw_crc16 __P((u_int32_t *, u_int32_t));
-void fw_xfer_timeout __P((void *));
-void fw_xfer_done __P((struct fw_xfer *));
-void fw_asy_callback __P((struct fw_xfer *));
-void fw_asy_callback_free __P((struct fw_xfer *));
-struct fw_device *fw_noderesolve_nodeid __P((struct firewire_comm *, int));
-struct fw_device *fw_noderesolve_eui64 __P((struct firewire_comm *, struct fw_eui64 *));
-struct fw_bind *fw_bindlookup __P((struct firewire_comm *, u_int16_t, u_int32_t));
-void fw_drain_txq __P((struct firewire_comm *));
-int fwdev_makedev __P((struct firewire_softc *));
-int fwdev_destroydev __P((struct firewire_softc *));
-void fwdev_clone __P((void *, char *, int, dev_t *));
+void fw_sidrcv (struct firewire_comm *, u_int32_t *, u_int);
+void fw_rcv (struct fw_rcv_buf *);
+void fw_xfer_unload ( struct fw_xfer*);
+void fw_xfer_free_buf ( struct fw_xfer*);
+void fw_xfer_free ( struct fw_xfer*);
+struct fw_xfer *fw_xfer_alloc (struct malloc_type *);
+struct fw_xfer *fw_xfer_alloc_buf (struct malloc_type *, int, int);
+void fw_init (struct firewire_comm *);
+int fw_tbuf_update (struct firewire_comm *, int, int);
+int fw_rbuf_update (struct firewire_comm *, int, int);
+void fw_asybusy (struct fw_xfer *);
+int fw_bindadd (struct firewire_comm *, struct fw_bind *);
+int fw_bindremove (struct firewire_comm *, struct fw_bind *);
+int fw_asyreq (struct firewire_comm *, int, struct fw_xfer*);
+void fw_busreset (struct firewire_comm *);
+u_int16_t fw_crc16 (u_int32_t *, u_int32_t);
+void fw_xfer_timeout (void *);
+void fw_xfer_done (struct fw_xfer *);
+void fw_asy_callback (struct fw_xfer *);
+void fw_asy_callback_free (struct fw_xfer *);
+struct fw_device *fw_noderesolve_nodeid (struct firewire_comm *, int);
+struct fw_device *fw_noderesolve_eui64 (struct firewire_comm *, struct fw_eui64 *);
+struct fw_bind *fw_bindlookup (struct firewire_comm *, u_int16_t, u_int32_t);
+void fw_drain_txq (struct firewire_comm *);
+int fwdev_makedev (struct firewire_softc *);
+int fwdev_destroydev (struct firewire_softc *);
+void fwdev_clone (void *, char *, int, dev_t *);
 
 extern int firewire_debug;
 extern devclass_t firewire_devclass;