 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbsd32.h,v 1.81 2009/01/28 00:43:04 njoly Exp $	*/
+/*	$NetBSD: netbsd32.h,v 1.82 2009/03/16 20:48:13 njoly Exp $	*/
 /*
  * Copyright (c) 1998, 2001, 2008 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.
 @@ -148,26 +148,27 @@ typedef netbsd32_pointer_t netbsd32_fsid
 typedef netbsd32_pointer_t netbsd32_lwpidp;
 typedef netbsd32_pointer_t netbsd32_ucontextp;
 typedef netbsd32_pointer_t netbsd32_caddr_t;
 typedef netbsd32_pointer_t netbsd32_lwpctlp;
 /*
  * now, the compatibility structures and their fake pointer types.
  */
 /* from <sys/types.h> */
 typedef netbsd32_pointer_t netbsd32_fd_setp_t;
 typedef netbsd32_intptr_t netbsd32_semid_t;
 typedef netbsd32_pointer_t netbsd32_semidp_t;
 typedef netbsd32_uint64 netbsd32_dev_t;
 /* from <sys/uio.h> */
 typedef netbsd32_pointer_t netbsd32_iovecp_t;
 struct netbsd32_iovec {
 	netbsd32_voidp	 iov_base;	/* Base address. */
 	netbsd32_size_t	 iov_len;	/* Length. */
 };
 /* from <sys/time.h> */
 typedef int32_t netbsd32_timer_t;
 typedef	int32_t netbsd32_time50_t;
 typedef	netbsd32_int64 netbsd32_time_t;
 typedef netbsd32_pointer_t netbsd32_timerp_t;
 @@ -584,33 +585,33 @@ struct netbsd32_msghdr {
 typedef netbsd32_pointer_t netbsd32_omsghdrp_t;
 struct netbsd32_omsghdr {
 	netbsd32_caddr_t msg_name;		/* optional address */
 	int		 msg_namelen;		/* size of address */
 	netbsd32_iovecp_t msg_iov;		/* scatter/gather array */
 	int		 msg_iovlen;		/* # elements in msg_iov */
 	netbsd32_caddr_t msg_accrights;		/* access rights sent/recvd */
 	int		 msg_accrightslen;
 };
 /* from <sys/stat.h> */
 typedef netbsd32_pointer_t netbsd32_stat12p_t;
 struct netbsd32_stat12 {		/* NetBSD-1.2 stat struct */
-	dev_t		st_dev;		/* inode's device */
+	uint32_t	st_dev;		/* inode's device */
 	uint32_t	st_ino;		/* inode's number */
 	uint16_t	st_mode;	/* inode protection mode */
 	uint16_t	st_nlink;	/* number of hard links */
 	uid_t		st_uid;		/* user ID of the file's owner */
 	gid_t		st_gid;		/* group ID of the file's group */
-	dev_t		st_rdev;	/* device type */
+	uint32_t	st_rdev;	/* device type */
 	struct netbsd32_timespec st_atimespec;/* time of last access */
 	struct netbsd32_timespec st_mtimespec;/* time of last data modification */
 	struct netbsd32_timespec st_ctimespec;/* time of last file status change */
 	netbsd32_int64	st_size;	/* file size, in bytes */
 	netbsd32_int64	st_blocks;	/* blocks allocated for file */
 	uint32_t	st_blksize;	/* optimal blocksize for I/O */
 	uint32_t	st_flags;	/* user defined flags for file */
 	uint32_t	st_gen;		/* file generation number */
 	int32_t		st_lspare;
 	netbsd32_int64	st_qspare[2];
 };
 typedef netbsd32_pointer_t netbsd32_stat43p_t;
 @@ -666,33 +667,33 @@ struct netbsd32_stat50 {
 	struct netbsd32_timespec50 st_mtimespec;/* time of last data modification */
 	struct netbsd32_timespec50 st_ctimespec;/* time of last file status change */
 	struct netbsd32_timespec50 st_birthtimespec; /* time of creation */
 	netbsd32_int64	st_size;	/* file size, in bytes */
 	netbsd32_uint64 st_blocks;	/* blocks allocated for file */
 	blksize_t	st_blksize;	/* optimal blocksize for I/O */
 	uint32_t	st_flags;	/* user defined flags for file */
 	uint32_t	st_gen;		/* file generation number */
 	uint32_t	st_spare[2];
 };
 typedef netbsd32_pointer_t netbsd32_statp_t;
 struct netbsd32_stat {
-	dev_t		st_dev;		/* inode's device */
+	netbsd32_dev_t	st_dev;		/* inode's device */
 	mode_t		st_mode;	/* inode protection mode */
 	netbsd32_uint64	st_ino;		/* inode's number */
 	nlink_t		st_nlink;	/* number of hard links */
 	uid_t		st_uid;		/* user ID of the file's owner */
 	gid_t		st_gid;		/* group ID of the file's group */
-	dev_t		st_rdev;	/* device type */
+	netbsd32_dev_t	st_rdev;	/* device type */
 	struct netbsd32_timespec st_atimespec;/* time of last access */
 	struct netbsd32_timespec st_mtimespec;/* time of last data modification */
 	struct netbsd32_timespec st_ctimespec;/* time of last file status change */
 	struct netbsd32_timespec st_birthtimespec; /* time of creation */
 	netbsd32_int64	st_size;	/* file size, in bytes */
 	netbsd32_uint64 st_blocks;	/* blocks allocated for file */
 	blksize_t	st_blksize;	/* optimal blocksize for I/O */
 	uint32_t	st_flags;	/* user defined flags for file */
 	uint32_t	st_gen;		/* file generation number */
 	uint32_t	st_spare[2];
 };
 /* from <sys/statvfs.h> */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbsd32_netbsd.c,v 1.155 2009/03/04 18:11:24 skrll Exp $	*/
+/*	$NetBSD: netbsd32_netbsd.c,v 1.156 2009/03/16 20:48:13 njoly Exp $	*/
 /*
  * Copyright (c) 1998, 2001, 2008 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.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.155 2009/03/04 18:11:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.156 2009/03/16 20:48:13 njoly Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
 #include "opt_ntp.h"
 #include "opt_compat_netbsd.h"
 #include "opt_compat_43.h"
 #include "opt_sysv.h"
 #include "opt_syscall_debug.h"
 #include "opt_sa.h"
 #include "fs_lfs.h"
 #endif
 @@ -313,27 +313,27 @@ netbsd32_fchdir(struct lwp *l, const str
 	struct sys_fchdir_args ua;
 	NETBSD32TO64_UAP(fd);
 	return (sys_fchdir(l, &ua, retval));
+}
 int
 netbsd32___mknod50(struct lwp *l, const struct netbsd32___mknod50_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(mode_t) mode;
-		syscallarg(dev_t) dev;
+		syscallarg(netbsd32_dev_t) dev;
 	} */
 	return do_sys_mknod(l, SCARG_P32(uap, path), SCARG(uap, mode),
 	    SCARG(uap, dev), retval);
+}
 int
 netbsd32_chmod(struct lwp *l, const struct netbsd32_chmod_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(mode_t) mode;
 	} */

 @@ -1,14 +1,14 @@
-	$NetBSD: syscalls.master,v 1.78 2009/02/26 21:08:48 christos Exp $
+	$NetBSD: syscalls.master,v 1.79 2009/03/16 20:48:13 njoly Exp $
 ;	from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ; NetBSD system call name/number "master" file.
 ; (See syscalls.conf to see what it is processed into.)
+;
 ; Fields: number type [type-dependent ...]
 ;	number	system call number, must be in order
 ;	type	one of STD, OBSOL, UNIMPL, IGNORED, NODEF, NOARGS, or one of
 ;		the compatibility options defined in syscalls.conf.
+;
 ; types:
 @@ -974,16 +974,16 @@
 			    netbsd32_itimerspecp_t ovalue); }
 	STD		{ int|netbsd32|50|timer_gettime(timer_t timerid, \
 			    netbsd32_itimerspecp_t value); }
 #if defined(NTP) || !defined(_KERNEL_OPT)
 	STD		{ int|netbsd32|50|ntp_gettime( \
 			    netbsd32_ntptimevalp_t ntvp); }
 #else
 	EXCL		___ntp_gettime50
 #endif
 	STD 		{ int|netbsd32|50|wait4(int pid, \
 			    netbsd32_intp status, \
 			    int options, netbsd32_rusagep_t rusage); }
 	STD 		{ int|netbsd32|50|mknod(const netbsd32_charp path, \
-			    mode_t mode, dev_t dev); }
+			    mode_t mode, netbsd32_dev_t dev); }
 	STD	 	{ int|netbsd32|50|fhstat(const netbsd32_voidp fhp, \
 			    netbsd32_size_t fh_size, netbsd32_statp_t sb); }