diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-07-28 18:41:00 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-07-28 18:41:00 +0200 |
| commit | cc0dffd12bbf19cc2f7f3480db4987b2dd9039b9 (patch) | |
| tree | 980b16c974629cf5005a1febc65b91097bb53c9b /xen | |
| parent | 4962b90a59b550525856a8eaa31104493407dc84 (diff) | |
Fix dev_ops types
* device/conf.h: Include <device/device_types.h>.
(dev_ops): Make d_getstat and d_setstat fields use dev_flavor_t,
dev_status_t, and mach_msg_type_number_t types.
* device/tty.h: (t_getstat, t_setstat): Likewise.
* device/conf.h (nulldev_getstat, nulldev_setstat): Fix parameter types
accordingly.
* device/dev_name.c (nulldev_getstat, nulldev_setstat): Likewise.
* device/kmsg.c (kmsggetstat): Likewise.
* device/kmsg.h (kmsggetstat): Likewise.
* device/net_io.c (net_getstat): Likewise.
* device/net_io.h (net_getstat): Likewise.
* i386/i386at/com.c (comgetstat, comsetstat): Likewise.
* i386/i386at/com.h (comgetstat, comsetstat): Likewise.
* i386/i386at/kd.c (kdgetstat, kdsetstat): Likewise.
* i386/i386at/kd.h (kdgetstat, kdsetstat): Likewise.
* i386/i386at/kd_event.c (kbdgetstat, kbdsetstat): Likewise.
* i386/i386at/kd_event.h (kbdgetstat, kbdsetstat): Likewise.
* i386/i386at/kd_mouse.c (mousegetstat): Likewise.
* i386/i386at/kd_mouse.h (mousegetstat): Likewise.
* i386/i386at/lpr.c (lprgetstat, lprsetstat): Likewise.
* i386/i386at/lpr.h (lprgetstat, lprsetstat): Likewise.
* xen/console.c (hypcngetstat, hypcnsetstat): Likewise.
* xen/console.h (hypcngetstat, hypcnsetstat): Likewise.
* device/dev_hdr.h: Forward-declare struct dev_ops and dev_ops_t type
instead of including <device/conf.h>.
* device/dev_pager.c: Include <device/conf.h>
* i386/i386/pcb.h: Include <machine/io_perm.h>
* i386/i386/thread.h: Do not include <i386/tss.h>
Diffstat (limited to 'xen')
| -rw-r--r-- | xen/console.c | 4 | ||||
| -rw-r--r-- | xen/console.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xen/console.c b/xen/console.c index aed63cb5..e5aeb186 100644 --- a/xen/console.c +++ b/xen/console.c @@ -169,12 +169,12 @@ void hypcnstop() { } -io_return_t hypcngetstat(dev_t dev, int flavor, int *data, unsigned int *count) +io_return_t hypcngetstat(dev_t dev, dev_flavor_t flavor, dev_status_t data, mach_msg_type_number_t *count) { return tty_get_status(&hypcn_tty, flavor, data, count); } -io_return_t hypcnsetstat(dev_t dev, int flavor, int *data, unsigned int count) +io_return_t hypcnsetstat(dev_t dev, dev_flavor_t flavor, dev_status_t data, mach_msg_type_number_t count) { return tty_set_status(&hypcn_tty, flavor, data, count); } diff --git a/xen/console.h b/xen/console.h index cd5fd5fc..527f5fbd 100644 --- a/xen/console.h +++ b/xen/console.h @@ -43,8 +43,8 @@ extern int hypcnopen(dev_t dev, int flag, io_req_t ior); extern int hypcnread(dev_t dev, io_req_t ior); extern int hypcnwrite(dev_t dev, io_req_t ior); extern void hypcnclose(dev_t dev, int flag); -extern io_return_t hypcngetstat(dev_t dev, int flavor, int *data, unsigned int *count); -extern io_return_t hypcnsetstat(dev_t dev, int flavor, int *data, unsigned int count); +extern io_return_t hypcngetstat(dev_t dev, dev_flavor_t flavor, dev_status_t data, mach_msg_type_number_t *count); +extern io_return_t hypcnsetstat(dev_t dev, dev_flavor_t flavor, dev_status_t data, mach_msg_type_number_t count); extern int hypcnportdeath(dev_t dev, mach_port_t port); #endif /* XEN_CONSOLE_H */ |