diff options
| -rw-r--r-- | sys/dev/cninit.c | 7 | ||||
| -rw-r--r-- | sys/dev/ksyms.c | 49 | ||||
| -rw-r--r-- | sys/dev/sequencer.c | 4 | ||||
| -rw-r--r-- | sys/dev/systrace.c | 59 | ||||
| -rw-r--r-- | sys/dev/usb/ehci.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/ucom.c | 6 |
6 files changed, 27 insertions, 102 deletions
diff --git a/sys/dev/cninit.c b/sys/dev/cninit.c index f991fb43d19..dcde72f1794 100644 --- a/sys/dev/cninit.c +++ b/sys/dev/cninit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cninit.c,v 1.10 2010/06/26 23:24:44 guenther Exp $ */ +/* $OpenBSD: cninit.c,v 1.11 2011/06/23 16:02:33 tedu Exp $ */ /* $NetBSD: cninit.c,v 1.2 1995/04/11 22:08:10 pk Exp $ */ /* @@ -54,7 +54,7 @@ struct consdev *cn_tab = NULL; void -cninit() +cninit(void) { struct consdev *cp; @@ -82,8 +82,7 @@ cninit() } int -cnset(dev) - dev_t dev; +cnset(dev_t dev) { struct consdev *cp; diff --git a/sys/dev/ksyms.c b/sys/dev/ksyms.c index bcb032e3110..2aec3c20c3a 100644 --- a/sys/dev/ksyms.c +++ b/sys/dev/ksyms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ksyms.c,v 1.20 2010/12/26 15:41:00 miod Exp $ */ +/* $OpenBSD: ksyms.c,v 1.21 2011/06/23 16:02:33 tedu Exp $ */ /* * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> * Copyright (c) 2001 Artur Grabowski <art@openbsd.org> @@ -62,8 +62,7 @@ void ksymsattach(int); /*ARGSUSED*/ void -ksymsattach(num) - int num; +ksymsattach(int num) { #if defined(__sparc64__) || defined(__mips__) @@ -152,10 +151,7 @@ ksymsattach(num) /*ARGSUSED*/ int -ksymsopen(dev, flag, mode, p) - dev_t dev; - int flag, mode; - struct proc *p; +ksymsopen(dev_t dev, int flag, int mode, struct proc *p) { /* There are no non-zero minor devices */ @@ -175,10 +171,7 @@ ksymsopen(dev, flag, mode, p) /*ARGSUSED*/ int -ksymsclose(dev, flag, mode, p) - dev_t dev; - int flag, mode; - struct proc *p; +ksymsclose(dev_t dev, int flag, int mode, struct proc *p) { return (0); @@ -186,10 +179,7 @@ ksymsclose(dev, flag, mode, p) /*ARGSUSED*/ int -ksymsread(dev, uio, flags) - dev_t dev; - struct uio *uio; - int flags; +ksymsread(dev_t dev, struct uio *uio, int flags) { int error; size_t len; @@ -218,32 +208,3 @@ ksymsread(dev, uio, flags) return (0); } - -/* XXX - not yet */ -#if 0 -paddr_t -ksymsmmap(dev, off, prot) - dev_t dev; - off_t off; - int prot; -{ - vaddr_t va; - paddr_t pa; - - if (off < 0) - return (-1); - if (off >= ksym_head_size + ksym_syms_size) - return (-1); - - if ((vaddr_t)off < ksym_head_size) { - va = (vaddr_t)ksym_head + off; - } else { - va = (vaddr_t)ksym_syms + off; - } - - if (pmap_extract(pmap_kernel, va, &pa) == FALSE) - panic("ksymsmmap: unmapped page"); - - return (pa); -} -#endif diff --git a/sys/dev/sequencer.c b/sys/dev/sequencer.c index d1756d4c991..4f77257b76c 100644 --- a/sys/dev/sequencer.c +++ b/sys/dev/sequencer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sequencer.c,v 1.20 2010/11/18 21:15:14 miod Exp $ */ +/* $OpenBSD: sequencer.c,v 1.21 2011/06/23 16:02:33 tedu Exp $ */ /* $NetBSD: sequencer.c,v 1.13 1998/11/25 22:17:07 augustss Exp $ */ /* @@ -1250,7 +1250,7 @@ midiseq_putc(struct midi_dev *md, int data) */ int -midi_unit_count() +midi_unit_count(void) { return (0); } diff --git a/sys/dev/systrace.c b/sys/dev/systrace.c index a7c04e35bd1..c15302365d8 100644 --- a/sys/dev/systrace.c +++ b/sys/dev/systrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: systrace.c,v 1.55 2011/06/22 01:32:16 djm Exp $ */ +/* $OpenBSD: systrace.c,v 1.56 2011/06/23 16:02:33 tedu Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * All rights reserved. @@ -199,11 +199,8 @@ int systrace_debug = 0; /* ARGSUSED */ int -systracef_read(fp, poff, uio, cred) - struct file *fp; - off_t *poff; - struct uio *uio; - struct ucred *cred; +systracef_read(struct file *fp, off_t *poff, struct uio *uio, + struct ucred *cred) { struct fsystrace *fst = (struct fsystrace *)fp->f_data; struct str_process *process; @@ -250,11 +247,8 @@ systracef_read(fp, poff, uio, cred) /* ARGSUSED */ int -systracef_write(fp, poff, uio, cred) - struct file *fp; - off_t *poff; - struct uio *uio; - struct ucred *cred; +systracef_write(struct file *fp, off_t *poff, struct uio *uio, + struct ucred *cred) { return (EIO); } @@ -266,11 +260,7 @@ systracef_write(fp, poff, uio, cred) /* ARGSUSED */ int -systracef_ioctl(fp, cmd, data, p) - struct file *fp; - u_long cmd; - caddr_t data; - struct proc *p; +systracef_ioctl(struct file *fp, u_long cmd, caddr_t data, struct proc *p) { int ret = 0; struct fsystrace *fst = (struct fsystrace *)fp->f_data; @@ -410,10 +400,7 @@ systracef_ioctl(fp, cmd, data, p) /* ARGSUSED */ int -systracef_poll(fp, events, p) - struct file *fp; - int events; - struct proc *p; +systracef_poll(struct file *fp, int events, struct proc *p) { struct fsystrace *fst = (struct fsystrace *)fp->f_data; int revents = 0; @@ -435,28 +422,21 @@ systracef_poll(fp, events, p) /* ARGSUSED */ int -systracef_kqfilter(fp, kn) - struct file *fp; - struct knote *kn; +systracef_kqfilter(struct file *fp, struct knote *kn) { return (1); } /* ARGSUSED */ int -systracef_stat(fp, sb, p) - struct file *fp; - struct stat *sb; - struct proc *p; +systracef_stat(struct file *fp, struct stat *sb, struct proc *p) { return (EOPNOTSUPP); } /* ARGSUSED */ int -systracef_close(fp, p) - struct file *fp; - struct proc *p; +systracef_close(struct file *fp, struct proc *p) { struct fsystrace *fst = (struct fsystrace *)fp->f_data; struct str_process *strp; @@ -511,32 +491,19 @@ systraceattach(int n) } int -systraceopen(dev, flag, mode, p) - dev_t dev; - int flag; - int mode; - struct proc *p; +systraceopen(dev_t dev, int flag, int mode, struct proc *p) { return (0); } int -systraceclose(dev, flag, mode, p) - dev_t dev; - int flag; - int mode; - struct proc *p; +systraceclose(dev_t dev, int flag, int mode, struct proc *p) { return (0); } int -systraceioctl(dev, cmd, data, flag, p) - dev_t dev; - u_long cmd; - caddr_t data; - int flag; - struct proc *p; +systraceioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) { struct file *f; struct fsystrace *fst = NULL; diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index 90370a1981d..65bfdf6f35c 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci.c,v 1.115 2010/12/14 16:13:16 jakemsr Exp $ */ +/* $OpenBSD: ehci.c,v 1.116 2011/06/23 16:02:33 tedu Exp $ */ /* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */ /* @@ -1304,7 +1304,7 @@ ehci_dump_regs(ehci_softc_t *sc) * debugger. */ void -ehci_dump() +ehci_dump(void) { ehci_dump_regs(theehci); } diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c index 05eb737f20f..15fccf18527 100644 --- a/sys/dev/usb/ucom.c +++ b/sys/dev/usb/ucom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ucom.c,v 1.51 2010/09/24 08:33:59 yuo Exp $ */ +/* $OpenBSD: ucom.c,v 1.52 2011/06/23 16:02:33 tedu Exp $ */ /* $NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $ */ /* @@ -769,9 +769,7 @@ XXX; } void -ucom_break(sc, onoff) - struct ucom_softc *sc; - int onoff; +ucom_break(struct ucom_softc *sc, int onoff) { DPRINTF(("ucom_break: onoff=%d\n", onoff)); |