From a383432958ee5352b37a8219863aabb7c537c9b4 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Thu, 13 Nov 2008 23:41:13 +0000 Subject: 2008-07-19 Barry deFreese * device/device_emul.h (struct device_emulation_ops): Make members reference, dealloc, dev_to_port, write_trap, and writev_trap take mach_device_t parameter instead of void *. * i386/i386at/autoconf.c: Make forward declarations for comintr() and lprintr() match prototype. Add brackets around initialization members for bus_ctlr and bus_device structs. * i386/i386at/conf.c (dev_name_list): Pass nomap instead of nulldev for map field. * i386/i386at/pic_isa.c (intnull, fpintr, hardclock, kdintr, prtnull): Declare the type of the value returned by functions to void. --- device/device_emul.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'device/device_emul.h') diff --git a/device/device_emul.h b/device/device_emul.h index 957bd50..879736c 100644 --- a/device/device_emul.h +++ b/device/device_emul.h @@ -32,9 +32,9 @@ /* Each emulation layer provides these operations. */ struct device_emulation_ops { - void (*reference) (void *); - void (*dealloc) (void *); - ipc_port_t (*dev_to_port) (void *); + void (*reference) (mach_device_t); + void (*dealloc) (mach_device_t); + ipc_port_t (*dev_to_port) (mach_device_t); io_return_t (*open) (ipc_port_t, mach_msg_type_name_t, dev_mode_t, char *, device_t *); io_return_t (*close) (void *); @@ -55,9 +55,9 @@ struct device_emulation_ops io_return_t (*map) (void *, vm_prot_t, vm_offset_t, vm_size_t, ipc_port_t *, boolean_t); void (*no_senders) (mach_no_senders_notification_t *); - io_return_t (*write_trap) (void *, dev_mode_t, + io_return_t (*write_trap) (mach_device_t, dev_mode_t, recnum_t, vm_offset_t, vm_size_t); - io_return_t (*writev_trap) (void *, dev_mode_t, + io_return_t (*writev_trap) (mach_device_t, dev_mode_t, recnum_t, io_buf_vec_t *, vm_size_t); }; -- cgit v1.2.3