From bc85b8639e6a4f3133d8bf10161a5947dfb5b29d Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Mon, 30 Apr 2007 20:30:11 +0000
Subject: 2007-04-30 Thomas Schwinge <tschwinge@gnu.org>
We're not in the eighties anymore. List arguments in function
prototypes and definitions for a lot of symbols. Also drop some unused
prototypes. I refrain from listing every changed symbol.
* chips/busses.h: Do as described.
* ddb/db_break.c: Likewise.
* ddb/db_break.h: Likewise.
* ddb/db_command.c: Likewise.
* ddb/db_command.h: Likewise.
* ddb/db_lex.c: Likewise.
* ddb/db_lex.h: Likewise.
* ddb/db_output.c: Likewise.
* ddb/db_output.h: Likewise.
* ddb/db_sym.h: Likewise.
* ddb/db_task_thread.c: Likewise.
* ddb/db_task_thread.h: Likewise.
* ddb/db_variables.h: Likewise.
* ddb/db_watch.c: Likewise.
* ddb/db_watch.h: Likewise.
* device/buf.h: Likewise.
* device/conf.h: Likewise.
* device/dev_hdr.h: Likewise.
* device/ds_routines.h: Likewise.
* device/if_ether.h: Likewise.
* device/io_req.h: Likewise.
* device/net_io.h: Likewise.
* i386/i386/io_port.h: Likewise.
* i386/i386/lock.h: Likewise.
* i386/i386/mp_desc.c: Likewise.
* i386/i386/mp_desc.h: Likewise.
* i386/i386/proc_reg.h: Likewise.
* i386/i386/user_ldt.h: Likewise.
* i386/i386at/kd_queue.h: Likewise.
* i386/i386at/kdsoft.h: Likewise.
* i386/intel/pmap.c: Likewise.
* i386/intel/pmap.h: Likewise.
* include/mach/mach_traps.h: Likewise.
* ipc/ipc_entry.h: Likewise.
* ipc/ipc_hash.h: Likewise.
* ipc/ipc_kmsg.h: Likewise.
* ipc/ipc_marequest.c: Likewise.
* ipc/ipc_marequest.h: Likewise.
* ipc/ipc_mqueue.h: Likewise.
* ipc/ipc_notify.h: Likewise.
* ipc/ipc_object.h: Likewise.
* ipc/ipc_port.h: Likewise.
* ipc/ipc_pset.h: Likewise.
* ipc/ipc_right.h: Likewise.
* ipc/ipc_space.h: Likewise.
* ipc/ipc_table.h: Likewise.
* ipc/mach_msg.c: Likewise.
* ipc/mach_msg.h: Likewise.
* kern/ast.c: Likewise.
* kern/ast.h: Likewise.
* kern/debug.c: Likewise.
* kern/debug.h: Likewise.
* kern/ipc_tt.c: Likewise.
* kern/ipc_tt.h: Likewise.
* kern/mach_factor.c: Likewise.
* kern/mach_factor.h: Likewise.
* kern/printf.c: Likewise.
* kern/printf.h: Likewise.
* kern/queue.h: Likewise.
* kern/sched.h: Likewise.
* kern/syscall_subr.c: Likewise.
* kern/syscall_subr.h: Likewise.
* kern/task.h: Likewise.
* kern/thread_swap.c: Likewise.
* kern/thread_swap.h: Likewise.
* kern/timer.h: Likewise.
* kern/xpr.c: Likewise.
* kern/xpr.h: Likewise.
* kern/zalloc.c: Likewise.
* kern/zalloc.h: Likewise.
* ipc/ipc_port.h: Don't include <ipc/ipc_space.h>.
* device/net_io.h: Include <device/if_hdr.h> and <device/io_req.h>.
* ipc/ipc_entry.h: Include <mach/mach_types.h> and <ipc/ipc_types.h>.
* ipc/ipc_kmsg.h: Include <ipc/ipc_object.h>, <ipc/ipc_types.h> and
<vm/vm_map.h>.
* ipc/ipc_marequest.h: Include <mach_debug/hash_info.h> and
<ipc/ipc_types.h>.
* ipc/ipc_object.h: Include <ipc/ipc_types.h>.
* ipc/ipc_right.h: Include <ipc/ipc_entry.h>.
* ipc/ipc_space.h: Include <mach/mach_types.h> and <ipc/ipc_types.h>.
* kern/ipc_tt.h: Include <mach/mach_types.h>.
* kern/sched.h: Include <kern/kern_types.h>.
* ipc/ipc_hash.c (ipc_hash_index_t): Move type definition...
* ipc/ipc_hash.h: ... into here.
---
device/buf.h | 2 +-
device/conf.h | 2 +-
device/dev_hdr.h | 14 +++++++-------
device/ds_routines.h | 14 ++++++++------
device/if_ether.h | 2 +-
device/io_req.h | 2 +-
device/net_io.h | 15 +++++++++------
7 files changed, 28 insertions(+), 23 deletions(-)
(limited to 'device')
diff --git a/device/buf.h b/device/buf.h
index cf346948..cf538802 100644
--- a/device/buf.h
+++ b/device/buf.h
@@ -93,7 +93,7 @@
/*
* Export standard minphys routine.
*/
-extern minphys();
+extern minphys(io_req_t);
/*
* Alternate name for iodone
diff --git a/device/conf.h b/device/conf.h
index 7ca5dd67..e91e0996 100644
--- a/device/conf.h
+++ b/device/conf.h
@@ -108,7 +108,7 @@ extern int dev_indirect_count;
/*
* Exported routine to set indirection.
*/
-extern void dev_set_indirect();
+extern void dev_set_indirect(char *, dev_ops_t, int);
#endif /* _DEVICE_CONF_H_ */
diff --git a/device/dev_hdr.h b/device/dev_hdr.h
index 50e2977f..7384766a 100644
--- a/device/dev_hdr.h
+++ b/device/dev_hdr.h
@@ -106,22 +106,22 @@ typedef struct mach_device *mach_device_t;
/*
* To find and remove device entries
*/
-mach_device_t device_lookup(); /* by name */
+mach_device_t device_lookup(char *); /* by name */
-void mach_device_reference();
-void mach_device_deallocate();
+void mach_device_reference(mach_device_t);
+void mach_device_deallocate(mach_device_t);
/*
* To find and remove port-to-device mappings
*/
-device_t dev_port_lookup();
-void dev_port_enter();
-void dev_port_remove();
+device_t dev_port_lookup(ipc_port_t);
+void dev_port_enter(mach_device_t);
+void dev_port_remove(mach_device_t);
/*
* To call a routine on each device
*/
-boolean_t dev_map();
+boolean_t dev_map(boolean_t (*)(), mach_port_t);
/*
* To lock and unlock state and open-count
diff --git a/device/ds_routines.h b/device/ds_routines.h
index 111505d1..3281c4c7 100644
--- a/device/ds_routines.h
+++ b/device/ds_routines.h
@@ -35,18 +35,20 @@
#include <vm/vm_map.h>
#include <device/device_types.h>
+#include <device/io_req.h>
+#include <mach/machine/vm_types.h>
/*
* Map for device IO memory.
*/
vm_map_t device_io_map;
-kern_return_t device_read_alloc();
-kern_return_t device_write_get();
-boolean_t device_write_dealloc();
+kern_return_t device_read_alloc(io_req_t, vm_size_t);
+kern_return_t device_write_get(io_req_t, boolean_t *);
+boolean_t device_write_dealloc(io_req_t);
-boolean_t ds_open_done();
-boolean_t ds_read_done();
-boolean_t ds_write_done();
+boolean_t ds_open_done(io_req_t);
+boolean_t ds_read_done(io_req_t);
+boolean_t ds_write_done(io_req_t);
#endif /* DS_ROUTINES_H */
diff --git a/device/if_ether.h b/device/if_ether.h
index 5da40d62..2ac938e2 100644
--- a/device/if_ether.h
+++ b/device/if_ether.h
@@ -51,7 +51,7 @@ struct ether_header {
#ifdef KERNEL
u_char etherbroadcastaddr[6];
-extern char * ether_sprintf();
+extern char * ether_sprintf(u_char *);
#endif /* KERNEL */
#endif /*_DEVICE_IF_ETHER_H_*/
diff --git a/device/io_req.h b/device/io_req.h
index 2bb4a99b..4d249c67 100644
--- a/device/io_req.h
+++ b/device/io_req.h
@@ -121,7 +121,7 @@ typedef struct io_req * io_req_t;
/*
* Standard completion routine for io_requests.
*/
-void iodone(/* io_req_t */);
+void iodone(io_req_t);
/*
* Macros to allocate and free IORs - will convert to zones later.
diff --git a/device/net_io.h b/device/net_io.h
index 789614ed..6842dec0 100644
--- a/device/net_io.h
+++ b/device/net_io.h
@@ -42,6 +42,8 @@
#include <kern/lock.h>
#include <kern/kalloc.h>
+#include <device/if_hdr.h>
+#include <device/io_req.h>
#include <device/net_status.h>
/*
@@ -56,17 +58,18 @@
* functions. net_kmsg_get may return IKM_NULL.
*/
-extern ipc_kmsg_t net_kmsg_get();
-extern void net_kmsg_put();
+extern ipc_kmsg_t net_kmsg_get(void);
+extern void net_kmsg_put(ipc_kmsg_t);
/*
* Network utility routines.
*/
-extern void net_packet();
-extern void net_filter();
-extern io_return_t net_getstat();
-extern io_return_t net_write();
+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,
+ natural_t *);
+extern io_return_t net_write(struct ifnet *, int (*)(), io_req_t);
/*
* Non-interrupt code may allocate and free net_kmsgs with these functions.
--
cgit v1.2.3