From 2a8d65dfceb4ac35b09935a5e5fb62be1a44ab14 Mon Sep 17 00:00:00 2001 From: Marin Ramesa Date: Fri, 4 Apr 2014 21:52:39 +0200 Subject: Use explicit prototypes for struct dev_ops fields * device/conf.h: Include , , . Predefine struct io_req, io_req_t and io_return_t. (dev_ops): Add explicit prototypes for d_open, d_close, d_read, d_write, d_getstat, d_setstat, d_mmap, d_port_death. (nulldev_open, nulldev_close, nulldev_read, nulldev_write, nulldev_getstat, nulldev_setstat, nulldev_portdeath): Add prototypes. (nomap): Fix prototype. * device/dev_name.c (nulldev_open, nulldev_close, nulldev_read, nulldev_write, nulldev_getstat, nulldev_setstat, nulldev_portdeath): New functions. (nomap): Fix prototype. * device/ds_routines.c (dev_close): Pass 0 as flag parameter. * device/kmsg.c (kmsgclose): Drop return value. * device/kmsg.h (kmsgclose): Fix prototype. * i386/i386at/com.c (comopen): Fix prototype. (comclose): Fix prototype, drop return value. (comread, comwrite): Fix prototype. * i386/i386at/com.h (comopen, comclose, comread, comwrite): Fix prototype. * i386/i386at/conf.c (dev_ops): Use nulldev_open, nulldev_close, nulldev_read, nulldev_write, nulldev_getstat, nulldev_setstat, nulldev_portdeath where appropriate. * i386/i386at/kd.c (kdclose, kdread, kdwrite, kdmmap): Fix prototype. * i386/i386at/kd.h (kdclose, kdread, kdwrite, kdmmap): Likewise. * i386/i386at/kd_event.c (kbdopen): Likewise. * i386/i386at/kd_event.h (kbdopen): Likewise. * i386/i386at/kd_mouse.c (mouseopen): Likewise. * i386/i386at/kd_mouse.h (mouseopen): Likewise. * i386/i386at/lpr.c (lpropen, lprclose, lprread, lprwrite): Likewise. * i386/i386at/lpr.h (lpropen, lprclose, lprread, lprwrite): Likewise. * i386/i386at/mem.c (memmmap): Likewise. * i386/i386at/mem.h (memmmap): Likewise. * i386/i386at/model_dep.c (timemmap): Likewise. * i386/i386at/model_dep.h (timemmap): Likewise. * kern/mach_clock.c (timeopen, timeclose): Likewise. * kern/mach_clock.h: Include , predefine struct io_req and io_req_t. (timeopen, timeclose): Fix prototype. --- i386/i386at/kd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'i386/i386at/kd.c') diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c index acd69f7d..0de1e505 100644 --- a/i386/i386at/kd.c +++ b/i386/i386at/kd.c @@ -487,7 +487,7 @@ kdopen(dev, flag, ior) /*ARGSUSED*/ void kdclose(dev, flag) -int dev; +dev_t dev; int flag; { struct tty *tp; @@ -519,7 +519,7 @@ int flag; /*ARGSUSED*/ int kdread(dev, uio) -int dev; +dev_t dev; io_req_t uio; { struct tty *tp; @@ -544,7 +544,7 @@ io_req_t uio; /*ARGSUSED*/ int kdwrite(dev, uio) -int dev; +dev_t dev; io_req_t uio; { return((*linesw[kd_tty.t_line].l_write)(&kd_tty, uio)); @@ -558,8 +558,8 @@ io_req_t uio; int kdmmap(dev, off, prot) dev_t dev; - off_t off; - int prot; + vm_offset_t off; + vm_prot_t prot; { if (off >= (128*1024)) return(-1); -- cgit v1.2.3