diff options
Diffstat (limited to 'device')
| -rw-r--r-- | device/buf.h | 2 | ||||
| -rw-r--r-- | device/conf.h | 2 | ||||
| -rw-r--r-- | device/dev_hdr.h | 14 | ||||
| -rw-r--r-- | device/ds_routines.h | 14 | ||||
| -rw-r--r-- | device/if_ether.h | 2 | ||||
| -rw-r--r-- | device/io_req.h | 2 | ||||
| -rw-r--r-- | device/net_io.h | 15 |
7 files changed, 28 insertions, 23 deletions
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. |