[PATCH 67/68] device/ds_routines.c: fix initialization from incompatible pointer type

[Marin Ramesa]

* device/device_emul.h (device_emulation_ops): Modify struct definition. 

---
 device/device_emul.h | 58 +++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 44 insertions(+), 14 deletions(-)

diff --git a/device/device_emul.h b/device/device_emul.h
index 957bd50..b2c77ba 100644
--- a/device/device_emul.h
+++ b/device/device_emul.h
@@ -37,23 +37,53 @@ struct device_emulation_ops
   ipc_port_t (*dev_to_port) (void *);
   io_return_t (*open) (ipc_port_t, mach_msg_type_name_t,
                       dev_mode_t, char *, device_t *);
-  io_return_t (*close) (void *);
-  io_return_t (*write) (void *, ipc_port_t, mach_msg_type_name_t,
-                       dev_mode_t, recnum_t, io_buf_ptr_t, unsigned, int *);
+  io_return_t (*close) (mach_device_t);
+  io_return_t (*write) (mach_device_t,
+                       ipc_port_t,
+                       mach_msg_type_name_t,
+                       dev_mode_t,
+                       recnum_t,
+                       io_buf_ptr_t,
+                       unsigned int,
+                       int *);
   io_return_t (*write_inband) (void *, ipc_port_t, mach_msg_type_name_t,
                               dev_mode_t, recnum_t, io_buf_ptr_inband_t,
                               unsigned, int *);
-  io_return_t (*read) (void *, ipc_port_t, mach_msg_type_name_t,
-                      dev_mode_t, recnum_t, int, io_buf_ptr_t *, unsigned *);
-  io_return_t (*read_inband) (void *, ipc_port_t, mach_msg_type_name_t,
-                             dev_mode_t, recnum_t, int, char *, unsigned *);
-  io_return_t (*set_status) (void *, dev_flavor_t, dev_status_t,
-                            mach_msg_type_number_t);
-  io_return_t (*get_status) (void *, dev_flavor_t, dev_status_t,
-                            mach_msg_type_number_t *);
-  io_return_t (*set_filter) (void *, ipc_port_t, int, filter_t [], unsigned);
-  io_return_t (*map) (void *, vm_prot_t, vm_offset_t,
-                     vm_size_t, ipc_port_t *, boolean_t);
+  io_return_t (*read) (mach_device_t,
+                       ipc_port_t,
+                       mach_msg_type_name_t,
+                       dev_mode_t,
+                       recnum_t,
+                       int,
+                       io_buf_ptr_t *,
+                       unsigned int *);
+  io_return_t (*read_inband) (mach_device_t,
+                               ipc_port_t,
+                               mach_msg_type_name_t,
+                               dev_mode_t,
+                               recnum_t,
+                               int,
+                               char *,         
+                               unsigned int *);
+  io_return_t (*set_status) (mach_device_t,
+                               dev_flavor_t,
+                               dev_status_t,
+                               mach_msg_type_number_t);
+  io_return_t (*get_status) (mach_device_t,
+                               dev_flavor_t,
+                               dev_status_t,           
+                               mach_msg_type_number_t *);
+  io_return_t (*set_filter) (mach_device_t,
+                               ipc_port_t,
+                               int,
+                               filter_t *,     
+                               unsigned int);
+  io_return_t (*map) (mach_device_t,
+                       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,
                             recnum_t, vm_offset_t, vm_size_t);
-- 
1.8.1.4