sure. ok krw@
.... Ken
On Wed, Jun 22, 2011 at 01:06:49PM -0400, Ted Unangst wrote:
> checked with md5, before line folding caused differences.
>
>
> Index: cninit.c
> ===================================================================
> RCS file: /home/tedu/cvs/src/sys/dev/cninit.c,v
> retrieving revision 1.10
> diff -u -r1.10 cninit.c
> --- cninit.c 26 Jun 2010 23:24:44 -0000 1.10
> +++ cninit.c 22 Jun 2011 17:03:06 -0000
> @@ -54,7 +54,7 @@
> struct consdev *cn_tab = NULL;
>
> void
> -cninit()
> +cninit(void)
> {
> struct consdev *cp;
>
> @@ -82,8 +82,7 @@
> }
>
> int
> -cnset(dev)
> - dev_t dev;
> +cnset(dev_t dev)
> {
> struct consdev *cp;
>
> Index: ksyms.c
> ===================================================================
> RCS file: /home/tedu/cvs/src/sys/dev/ksyms.c,v
> retrieving revision 1.20
> diff -u -r1.20 ksyms.c
> --- ksyms.c 26 Dec 2010 15:41:00 -0000 1.20
> +++ ksyms.c 22 Jun 2011 17:01:08 -0000
> @@ -62,8 +62,7 @@
>
> /*ARGSUSED*/
> void
> -ksymsattach(num)
> - int num;
> +ksymsattach(int num)
> {
>
> #if defined(__sparc64__) || defined(__mips__)
> @@ -152,10 +151,7 @@
>
> /*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 @@
>
> /*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 @@
>
> /*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 @@
>
> 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
> Index: sequencer.c
> ===================================================================
> RCS file: /home/tedu/cvs/src/sys/dev/sequencer.c,v
> retrieving revision 1.20
> diff -u -r1.20 sequencer.c
> --- sequencer.c 18 Nov 2010 21:15:14 -0000 1.20
> +++ sequencer.c 22 Jun 2011 17:01:38 -0000
> @@ -1250,7 +1250,7 @@
> */
>
> int
> -midi_unit_count()
> +midi_unit_count(void)
> {
> return (0);
> }
> Index: systrace.c
> ===================================================================
> RCS file: /home/tedu/cvs/src/sys/dev/systrace.c,v
> retrieving revision 1.54
> diff -u -r1.54 systrace.c
> --- systrace.c 2 Apr 2011 17:04:35 -0000 1.54
> +++ systrace.c 22 Jun 2011 16:59:32 -0000
> @@ -199,11 +199,8 @@
>
> /* 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 @@
>
> /* 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);
> }
> @@ -265,11 +259,7 @@
>
> /* 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;
> @@ -409,10 +399,7 @@
>
> /* 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;
> @@ -434,28 +421,21 @@
>
> /* 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;
> @@ -510,32 +490,19 @@
> }
>
> 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;
> Index: usb/ehci.c
> ===================================================================
> RCS file: /home/tedu/cvs/src/sys/dev/usb/ehci.c,v
> retrieving revision 1.115
> diff -u -r1.115 ehci.c
> --- usb/ehci.c 14 Dec 2010 16:13:16 -0000 1.115
> +++ usb/ehci.c 22 Jun 2011 17:03:30 -0000
> @@ -1304,7 +1304,7 @@
> * debugger.
> */
> void
> -ehci_dump()
> +ehci_dump(void)
> {
> ehci_dump_regs(theehci);
> }
> Index: usb/ucom.c
> ===================================================================
> RCS file: /home/tedu/cvs/src/sys/dev/usb/ucom.c,v
> retrieving revision 1.51
> diff -u -r1.51 ucom.c
> --- usb/ucom.c 24 Sep 2010 08:33:59 -0000 1.51
> +++ usb/ucom.c 22 Jun 2011 17:04:23 -0000
> @@ -769,9 +769,7 @@
> }
>
> 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));
