diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2008-12-01 22:04:15 +0000 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-06-18 00:27:21 +0200 |
| commit | 4bdef12bf49e8712cb6b9104b14d7b4d565e6ec1 (patch) | |
| tree | 314b5da00d15009e863d8f1077c4464dbb62e8d7 /device/device_emul.h | |
| parent | 4276d54c0037552d74b4ef6840783f905d3dd6c4 (diff) | |
| download | gnumach-4bdef12bf49e8712cb6b9104b14d7b4d565e6ec1.tar.gz gnumach-4bdef12bf49e8712cb6b9104b14d7b4d565e6ec1.tar.bz2 gnumach-4bdef12bf49e8712cb6b9104b14d7b4d565e6ec1.zip | |
2008-11-15 Shakthi Kannan <shakshurd@gmail.com>
* device/ds_routines.h (device_reference, device_deallocate): Add
function prototypes.
* kern/task.c (task_create): Moved unused i variable inside FAST_TAS.
* vm/vm_map.h (vm_map_copy_page_discard): Add function prototype.
* vm/vm_kern.c (projected_buffer_deallocate): Give &map->hdr
instead of map to _vm_map_clip_start and _vm_map_clip_end functions.
2008-12-01 Samuel Thibault <samuel.thibault@ens-lyon.org>
* device/device_emul.h (device_emulation_ops): Turn back reference,
dealloc, dev_to_port, write_trap and writev_trap into taking a void*,
as they do not always take a mach_device_t.
* device/ds_routines.c (mach_device_emulation_ops): Cast
mach_device_reference, mach_device_deallocate,
mach_convert_device_to_port, device_write_trap and device_writev_trap
to (void*) to make them accept a void* argument.
* linux/pcmcia-cs/glue/ds.c (device_deallocate): Rename function
into...
(ds_device_deallocate): ... this.
(dev_to_port): Call ds_device_deallocate instead of device_deallocate.
(linux_pcmcia_emulation_ops): Use ds_device_deallocate instead of
device_deallocate, cast mach_device_reference to (void*) to make it
accept a void* argument.
Diffstat (limited to 'device/device_emul.h')
| -rw-r--r-- | device/device_emul.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/device/device_emul.h b/device/device_emul.h index 879736ca..957bd505 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) (mach_device_t); - void (*dealloc) (mach_device_t); - ipc_port_t (*dev_to_port) (mach_device_t); + void (*reference) (void *); + void (*dealloc) (void *); + 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 *); @@ -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) (mach_device_t, dev_mode_t, + io_return_t (*write_trap) (void *, dev_mode_t, recnum_t, vm_offset_t, vm_size_t); - io_return_t (*writev_trap) (mach_device_t, dev_mode_t, + io_return_t (*writev_trap) (void *, dev_mode_t, recnum_t, io_buf_vec_t *, vm_size_t); }; |