Use -Wstrict-prototypes and fix warnings

Most of the changes include defining and using proper function type
declarations (with argument types declared) and avoiding using the
K&R style of function declarations.
Message-Id: <Y6Jazsuis1QA0lXI@mars>

8 files changed, 25 insertions, 68 deletions

diff --git a/device/blkio.c b/device/blkio.c
index 7ec1f2cf..62fc6295 100644
--- a/device/blkio.c
+++ b/device/blkio.c
@@ -37,50 +37,6 @@
 #include <device/ds_routines.h>
 
 
-
-io_return_t block_io(
-	void			(*strat)(),
-	void			(*max_count)(),
-	io_req_t		ior)
-{
-	kern_return_t		rc;
-	boolean_t		wait = FALSE;
-
-	/*
-	 * Make sure the size is not too large by letting max_count
-	 * change io_count.  If we are doing a write, then io_alloc_size
-	 * preserves the original io_count.
-	 */
-	(*max_count)(ior);
-
-	/*
-	 * If reading, allocate memory.  If writing, wire
-	 * down the incoming memory.
-	 */
-	if (ior->io_op & IO_READ)
-	    rc = device_read_alloc(ior, (vm_size_t)ior->io_count);
-	else
-	    rc = device_write_get(ior, &wait);
-
-	if (rc != KERN_SUCCESS)
-	    return (rc);
-
-	/*
-	 * Queue the operation for the device.
-	 */
-	(*strat)(ior);
-
-	/*
-	 * The io is now queued.  Wait for it if needed.
-	 */
-	if (wait) {
-		iowait(ior);
-		return(D_SUCCESS);
-	}
-
-	return (D_IO_QUEUED);
-}
-
 /*
  * 'standard' max_count routine.  VM continuations mean that this
  * code can cope with arbitrarily-sized write operations (they won't be
diff --git a/device/buf.h b/device/buf.h
index a79ed8e4..7c8a4362 100644
--- a/device/buf.h
+++ b/device/buf.h
@@ -83,12 +83,6 @@
 #define	B_MD1		IO_SPARE_START
 
 /*
- * Redefine physio routine
- */
-#define	physio(strat, xbuf, dev, ops, minphys, ior) \
-		block_io(strat, minphys, ior)
-
-/*
  * Export standard minphys routine.
  */
 extern void minphys(io_req_t);
diff --git a/device/conf.h b/device/conf.h
index 1af00285..8177966b 100644
--- a/device/conf.h
+++ b/device/conf.h
@@ -36,6 +36,7 @@
 #include <mach/port.h>
 #include <mach/vm_prot.h>
 #include <device/device_types.h>
+#include <device/net_status.h>
 
 struct io_req;
 typedef struct io_req *io_req_t;
@@ -54,20 +55,20 @@ struct dev_ops {
 	int		(*d_getstat)(dev_t, dev_flavor_t, dev_status_t, mach_msg_type_number_t *);	/* get status/control */
 	int		(*d_setstat)(dev_t, dev_flavor_t, dev_status_t, mach_msg_type_number_t);	/* set status/control */
 	vm_offset_t	(*d_mmap)(dev_t, vm_offset_t, vm_prot_t);	/* map memory */
-	int		(*d_async_in)();		/* asynchronous input setup */
-	int		(*d_reset)();			/* reset device */
+	int		(*d_async_in)(dev_t, const ipc_port_t, int, filter_t*, unsigned int);		/* asynchronous input setup */
+	int		(*d_reset)(dev_t);		/* reset device */
 	int		(*d_port_death)(dev_t, mach_port_t);
 					/* clean up reply ports */
 	int		d_subdev;	/* number of sub-devices per
 					   unit */
-	int		(*d_dev_info)(); /* driver info for kernel */
+	int		(*d_dev_info)(dev_t, int, int*); /* driver info for kernel */
 };
 typedef struct dev_ops *dev_ops_t;
 
 /*
  * Routines for null entries.
  */
-extern int	nulldev(void);		/* no operation - OK */
+extern int	nulldev_reset(dev_t dev);
 extern int	nulldev_open(dev_t dev, int flag, io_req_t ior);
 extern void	nulldev_close(dev_t dev, int flags);
 extern int	nulldev_read(dev_t dev, io_req_t ior);
@@ -75,7 +76,8 @@ extern int	nulldev_write(dev_t dev, io_req_t ior);
 extern io_return_t	nulldev_getstat(dev_t dev, dev_flavor_t flavor, dev_status_t data, mach_msg_type_number_t *count);
 extern io_return_t	nulldev_setstat(dev_t dev, dev_flavor_t flavor, dev_status_t data, mach_msg_type_number_t count);
 extern io_return_t	nulldev_portdeath(dev_t dev, mach_port_t port);
-extern int	nodev(void);		/* no operation - error */
+extern int nodev_async_in(dev_t, const ipc_port_t, int, filter_t*, unsigned int); /* no operation - error */
+extern int nodev_info(dev_t, int, int*); /* no operation - error */
 extern vm_offset_t	nomap(dev_t dev, vm_offset_t off, int prot);		/* no operation - error */
 
 /*
diff --git a/device/dev_hdr.h b/device/dev_hdr.h
index 4bd12c1c..56e0d825 100644
--- a/device/dev_hdr.h
+++ b/device/dev_hdr.h
@@ -119,10 +119,12 @@ device_t	dev_port_lookup(ipc_port_t);
 void		dev_port_enter(mach_device_t);
 void		dev_port_remove(mach_device_t);
 
+typedef boolean_t (*dev_map_fn)(mach_device_t, mach_port_t);
+
 /*
  * To call a routine on each device
  */
-boolean_t	dev_map(boolean_t (*)(), mach_port_t);
+boolean_t	dev_map(dev_map_fn, mach_port_t);
 
 /*
  * To lock and unlock state and open-count
diff --git a/device/dev_lookup.c b/device/dev_lookup.c
index 9af7508c..e9d38925 100644
--- a/device/dev_lookup.c
+++ b/device/dev_lookup.c
@@ -70,8 +70,7 @@ struct kmem_cache	dev_hdr_cache;
  * The number table lock must be held.
  */
 void
-dev_number_enter(device)
-	const mach_device_t	device;
+dev_number_enter(const mach_device_t device)
 {
 	queue_t	q;
 
@@ -84,8 +83,7 @@ dev_number_enter(device)
  * The device-number table lock must be held.
  */
 void
-dev_number_remove(device)
-	const mach_device_t	device;
+dev_number_remove(const mach_device_t device)
 {
 	queue_t	q;
 
@@ -98,9 +96,7 @@ dev_number_remove(device)
  * The number table lock must be held.
  */
 mach_device_t
-dev_number_lookup(ops, devnum)
-	const dev_ops_t	ops;
-	int		devnum;
+dev_number_lookup(const dev_ops_t ops, int devnum)
 {
 	queue_t	q;
 	mach_device_t	device;
@@ -316,7 +312,7 @@ convert_device_to_port(device)
  */
 boolean_t
 dev_map(
-	boolean_t	(*routine)(),
+	dev_map_fn	routine,
 	mach_port_t	port)
 {
 	int		i;
diff --git a/device/dev_name.c b/device/dev_name.c
index 59ea961b..13ff6dc9 100644
--- a/device/dev_name.c
+++ b/device/dev_name.c
@@ -39,7 +39,7 @@
 /*
  * Routines placed in empty entries in the device tables
  */
-int nulldev(void)
+int nulldev_reset(dev_t)
 {
 	return (D_SUCCESS);
 }
@@ -78,7 +78,12 @@ int nulldev_portdeath(dev_t dev, mach_port_t port)
 	return (D_SUCCESS);
 }
 
-int nodev(void)
+int nodev_async_in(dev_t, const ipc_port_t, int, filter_t*, unsigned int)
+{
+	return (D_INVALID_OPERATION);
+}
+
+int nodev_info(dev_t, int, int*)
 {
 	return (D_INVALID_OPERATION);
 }
diff --git a/device/net_io.c b/device/net_io.c
index 72b040a0..338b433c 100644
--- a/device/net_io.c
+++ b/device/net_io.c
@@ -1437,7 +1437,7 @@ printf ("net_getstat: count: %d, addr_int_count: %d\n",
 io_return_t
 net_write(
 	struct 		ifnet *ifp,
-	int		(*start)(),
+	net_write_start_device_fn	start,
 	io_req_t	ior)
 {
 	spl_t	s;
diff --git a/device/net_io.h b/device/net_io.h
index 9468e34b..c9af85ee 100644
--- a/device/net_io.h
+++ b/device/net_io.h
@@ -79,7 +79,9 @@ extern void net_packet(struct ifnet *, ipc_kmsg_t, unsigned int, boolean_t);
 extern void net_filter(ipc_kmsg_t, ipc_kmsg_queue_t);
 extern io_return_t net_getstat(struct ifnet *, dev_flavor_t, dev_status_t,
 			       mach_msg_type_number_t *);
-extern io_return_t net_write(struct ifnet *, int (*)(), io_req_t);
+
+typedef int (*net_write_start_device_fn)(short);
+extern io_return_t net_write(struct ifnet *, net_write_start_device_fn, io_req_t);
 
 /*
  * Non-interrupt code may allocate and free net_kmsgs with these functions.