 @@ -1,14 +1,14 @@
-/*	$NetBSD: sunos_ioctl.c,v 1.67 2015/12/12 17:48:18 nakayama Exp $	*/
+/*	$NetBSD: sunos_ioctl.c,v 1.68 2016/10/08 15:48:07 maxv Exp $	*/
 /*
  * Copyright (c) 1993 Markus Wild.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission
+ *
 @@ -17,27 +17,27 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  * loosely from: Header: sunos_ioctl.c,v 1.7 93/05/28 04:40:43 torek Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos_ioctl.c,v 1.67 2015/12/12 17:48:18 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_ioctl.c,v 1.68 2016/10/08 15:48:07 maxv Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
 #include <sys/termios.h>
 #include <sys/tty.h>
 #include <sys/socket.h>
 #include <sys/audioio.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 @@ -433,27 +433,27 @@ sunos_sys_ioctl(struct lwp *l, const str
 			disc = 0;
 		/* all other disciplines are not supported by NetBSD */
 		if (disc) {
 			error = ENXIO;
 			break;
+		}
 		error = (*ctl)(fp, TIOCSETD, &disc);
+	    }
 	case _IOW('t', 101, int):	/* sun SUNOS_TIOCSSOFTCAR */
+	    {
 		int x;	/* unused */
-		error = copyin((void *)&x, SCARG(uap, data), sizeof x);
+		error = copyin(SCARG(uap, data), (void *)&x, sizeof x);
 		break;
+	    }
 	case _IOR('t', 100, int):	/* sun SUNOS_TIOCSSOFTCAR */
+	    {
 		int x = 0;
 		error = copyout((void *)&x, SCARG(uap, data), sizeof x);
 		break;
+	    }
 	case _IO('t', 36): 		/* sun TIOCCONS, no parameters */
+	    {
 		int on = 1;
 		error = (*ctl)(fp, TIOCCONS, &on);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ultrix_ioctl.c,v 1.36 2009/12/14 00:47:12 matt Exp $ */
+/*	$NetBSD: ultrix_ioctl.c,v 1.37 2016/10/08 15:48:07 maxv Exp $ */
 /*	from : NetBSD: sunos_ioctl.c,v 1.21 1995/10/07 06:27:31 mycroft Exp */
 /*
  * Copyright (c) 1993 Markus Wild.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission
 @@ -18,27 +18,27 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  * loosely from: Header: sunos_ioctl.c,v 1.7 93/05/28 04:40:43 torek Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ultrix_ioctl.c,v 1.36 2009/12/14 00:47:12 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_ioctl.c,v 1.37 2016/10/08 15:48:07 maxv Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_ultrix.h"
 #include "opt_compat_sunos.h"
 #endif
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
 #include <sys/termios.h>
 @@ -481,27 +481,27 @@ ultrix_sys_ioctl(struct lwp *l, const st
 		/* map SunOS NTTYDISC into our termios discipline */
 		if (disc == 2)
 			disc = 0;
 		/* all other disciplines are not supported by NetBSD */
 		if (disc)
 			return ENXIO;
 		return ultrix_do_ioctl(SCARG(&ap, fd), TIOCSETD, &disc, l);
+	    }
 	case _IOW('t', 101, int):	/* sun SUNOS_TIOCSSOFTCAR */
+	    {
 		int x;	/* unused */
-		return copyin(&x, SCARG(&ap, data), sizeof x);
+		return copyin(SCARG(&ap, data), &x, sizeof x);
+	    }
 	case _IOR('t', 100, int):	/* sun SUNOS_TIOCSSOFTCAR */
+	    {
 		int x = 0;
 		return copyout(&x, SCARG(&ap, data), sizeof x);
+	    }
 	case _IO('t', 36): 		/* sun TIOCCONS, no parameters */
+	    {
 		int on = 1;
 		return ultrix_do_ioctl(SCARG(&ap, fd), TIOCCONS, &on, l);
+	    }
 	case _IOW('t', 37, struct sunos_ttysize):