 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbsd32_ioctl.c,v 1.91 2018/01/19 23:38:56 macallan Exp $	*/
+/*	$NetBSD: netbsd32_ioctl.c,v 1.92 2018/03/06 07:59:59 mlelstv Exp $	*/
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
  * 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. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,27 +21,27 @@
  * 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.
  */
 /*
  * handle ioctl conversions from netbsd32 -> 64-bit kernel
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.91 2018/01/19 23:38:56 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.92 2018/03/06 07:59:59 mlelstv Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_ntp.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
 #include <sys/proc.h>
 #include <sys/socketvar.h>
 #include <sys/audioio.h>
 @@ -525,26 +525,38 @@ netbsd32_to_devlistargs(
 static inline void
 netbsd32_to_devrescanargs(
     const struct netbsd32_devrescanargs *s32p,
     struct devrescanargs *p,
     u_long cmd)
+{
 	memcpy(p->busname, s32p->busname, sizeof(p->busname));
 	memcpy(p->ifattr, s32p->ifattr, sizeof(p->ifattr));
 	p->numlocators = s32p->numlocators;
 	p->locators = NETBSD32PTR64(s32p->locators);
+}
 static inline void
 netbsd32_to_dkwedge_list(
     const struct netbsd32_dkwedge_list *s32p,
     struct dkwedge_list *p,
     u_long cmd)
+{
 	p->dkwl_buf = s32p->dkwl_buf;
 	p->dkwl_bufsize = s32p->dkwl_bufsize;
 	p->dkwl_nwedges = s32p->dkwl_nwedges;
 	p->dkwl_ncopied = s32p->dkwl_ncopied;
+}
 /*
  * handle ioctl conversions from 64-bit kernel -> netbsd32
  */
 #if 0
 static inline void
 netbsd32_from_format_op(struct format_op *p, struct netbsd32_format_op *s32p, u_long cmd)
+{
 /* filled in */
 #if 0
 	s32p->df_buf = (netbsd32_charp)p->df_buf;
 #endif
 @@ -967,26 +979,38 @@ netbsd32_from_devlistargs(
 static inline void
 netbsd32_from_devrescanargs(
     const struct devrescanargs *p,
     struct netbsd32_devrescanargs *s32p,
     u_long cmd)
+{
 	memcpy(s32p->busname, p->busname, sizeof(s32p->busname));
 	memcpy(s32p->ifattr, p->ifattr, sizeof(s32p->ifattr));
 	s32p->numlocators = p->numlocators;
 	NETBSD32PTR32(s32p->locators, p->locators);
+}
 static inline void
 netbsd32_from_dkwedge_list(
     const struct dkwedge_list *p,
     struct netbsd32_dkwedge_list *s32p,
     u_long cmd)
+{
 	s32p->dkwl_buf = p->dkwl_buf;
 	s32p->dkwl_bufsize = p->dkwl_bufsize;
 	s32p->dkwl_nwedges = p->dkwl_nwedges;
 	s32p->dkwl_ncopied = p->dkwl_ncopied;
+}
 #ifdef NTP
 static int
 netbsd32_do_clockctl_ntp_adjtime(struct clockctl_ntp_adjtime *args)
+{
 	struct netbsd32_timex ntv32;
 	struct timex ntv;
 	int error;
 	error = copyin(args->tp, &ntv32, sizeof(ntv32));
 	if (error)
 		return (error);
 @@ -1423,26 +1447,29 @@ netbsd32_ioctl(struct lwp *l, const stru
 		IOCTL_STRUCT_CONV_TO(IOC_NPF_SAVE, plistref);
 	case IOC_NPF_RULE32:
 		IOCTL_STRUCT_CONV_TO(IOC_NPF_RULE, plistref);
 	case DRVRESCANBUS32:
 		IOCTL_STRUCT_CONV_TO(DRVRESCANBUS, devrescanargs);
 	case DRVLISTDEV32:
 		IOCTL_STRUCT_CONV_TO(DRVLISTDEV, devlistargs);
 	case DRVCTLCOMMAND32:
 		IOCTL_STRUCT_CONV_TO(DRVCTLCOMMAND, plistref);
 	case DRVGETEVENT32:
 		IOCTL_STRUCT_CONV_TO(DRVGETEVENT, plistref);
 	case DIOCLWEDGES32:
 		IOCTL_STRUCT_CONV_TO(DIOCLWEDGES, dkwedge_list);
 	default:
 #ifdef NETBSD32_MD_IOCTL
 		error = netbsd32_md_ioctl(fp, com, data32, l);
 #else
 		error = (*fp->f_ops->fo_ioctl)(fp, com, data32);
 #endif
 		break;
+	}
 	if (error == EPASSTHROUGH)
 		error = ENOTTY;
 	/*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbsd32_ioctl.h,v 1.58 2018/01/19 23:38:56 macallan Exp $	*/
+/*	$NetBSD: netbsd32_ioctl.h,v 1.59 2018/03/06 07:59:59 mlelstv Exp $	*/
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
  * 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. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -623,13 +623,25 @@ struct netbsd32_devlistargs {
 };
 struct netbsd32_devrescanargs {
 	char			busname[16];
 	char			ifattr[16];
 	unsigned int		numlocators;
 	netbsd32_intp		locators;
 };
 #define	DRVRESCANBUS32		_IOW('D', 124, struct netbsd32_devrescanargs)
 #define DRVCTLCOMMAND32		_IOWR('D', 125, struct netbsd32_plistref)
 #define	DRVLISTDEV32		_IOWR('D', 127, struct netbsd32_devlistargs)
 #define DRVGETEVENT32		_IOR('D', 128, struct netbsd32_plistref)
 /* From sys/disk.h, sys/dkio.h */
 struct netbsd32_dkwedge_list {
 	void			*dkwl_buf;	/* storage for dkwedge_info array */
 	netbsd32_size_t		dkwl_bufsize;	/* size	of that	buffer */
 	u_int			dkwl_nwedges;	/* total number	of wedges */
 	u_int			dkwl_ncopied;	/* number actually copied */
 };
 #define DIOCLWEDGES32		_IOWR('d', 124, struct netbsd32_dkwedge_list)