From cc0dffd12bbf19cc2f7f3480db4987b2dd9039b9 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sat, 28 Jul 2018 18:41:00 +0200 Subject: Fix dev_ops types * device/conf.h: Include . (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/dev_pager.c: Include * i386/i386/pcb.h: Include * i386/i386/thread.h: Do not include --- i386/i386at/com.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'i386/i386at/com.c') diff --git a/i386/i386at/com.c b/i386/i386at/com.c index 84891bd2..4689e30d 100644 --- a/i386/i386at/com.c +++ b/i386/i386at/com.c @@ -443,9 +443,9 @@ mach_port_t port; io_return_t comgetstat(dev, flavor, data, count) dev_t dev; -int flavor; -int *data; /* pointer to OUT array */ -natural_t *count; /* out */ +dev_flavor_t flavor; +dev_status_t data; /* pointer to OUT array */ +mach_msg_type_number_t *count; /* out */ { io_return_t result = D_SUCCESS; int unit = minor(dev); @@ -466,9 +466,9 @@ natural_t *count; /* out */ io_return_t comsetstat( dev_t dev, - int flavor, - int * data, - natural_t count) + dev_flavor_t flavor, + dev_status_t data, + mach_msg_type_number_t count) { io_return_t result = D_SUCCESS; int unit = minor(dev); -- cgit v1.2.3