[src/netbsd-1-5]: src/sys/compat/linux/common Pull up revisions 1.12-1.13 (re...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0efe1fd0a35d
branches:  netbsd-1-5
changeset: 490992:0efe1fd0a35d
user:      he <he%NetBSD.org@localhost>
date:      Fri Mar 30 21:41:01 2001 +0000

description:
Pull up revisions 1.12-1.13 (requested by fvdl):
  Add some required Linux emulation bits to support the Linux
  version of VMware.

diffstat:

 sys/compat/linux/common/linux_ioctl.h |  43 ++++++++++++++++++++++++++++++++++-
 1 files changed, 42 insertions(+), 1 deletions(-)

diffs (62 lines):

diff -r 70b52f40d527 -r 0efe1fd0a35d sys/compat/linux/common/linux_ioctl.h
--- a/sys/compat/linux/common/linux_ioctl.h     Fri Mar 30 21:40:29 2001 +0000
+++ b/sys/compat/linux/common/linux_ioctl.h     Fri Mar 30 21:41:01 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_ioctl.h,v 1.11 1998/12/15 19:31:39 itohy Exp $   */
+/*     $NetBSD: linux_ioctl.h,v 1.11.18.1 2001/03/30 21:41:01 he Exp $ */
 
 /*-
  * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -50,6 +50,12 @@
     register_t *));
 int linux_ioctl_socket __P((struct proc *, struct linux_sys_ioctl_args *,
     register_t *));
+int linux_ioctl_hdio __P((struct proc *, struct linux_sys_ioctl_args *,
+    register_t *));
+int linux_ioctl_fdio __P((struct proc *p, struct linux_sys_ioctl_args *uap, 
+                 register_t *retval));
+int linux_ioctl_blkio __P((struct proc *p, struct linux_sys_ioctl_args *uap, 
+                 register_t *retval));
 __END_DECLS
 #endif /* !_KERNEL */
 
@@ -63,4 +69,39 @@
 #error Undefined linux_ioctl.h machine type.
 #endif
 
+#define        _LINUX_IOC_NRMASK       ((1 << _LINUX_IOC_NRBITS) - 1)
+#define        _LINUX_IOC_TYPEMASK     ((1 << _LINUX_IOC_TYPEBITS) - 1)
+#define        _LINUX_IOC_SIZEMAEK     ((1 << _LINUX_IOC_SIZEBITS) - 1)
+#define _LINUX_IOC_DIRMASK     ((1 << _LINUX_IOC_DIRBITS) - 1)
+
+#define        _LINUX_IOC_TYPESHIFT    (_LINUX_IOC_NRSHIFT + _LINUX_IOC_NRBITS)
+#define        _LINUX_IOC_SIZESHIFT    (_LINUX_IOC_TYPESHIFT + _LINUX_IOC_TYPEBITS)
+#define        _LINUX_IOC_DIRSHIFT     (_LINUX_IOC_SIZESHIFT + _LINUX_IOC_SIZEBITS)
+
+#define        _LINUX_IOC(dir,type,nr,size)            \
+       (((nr)   << _LINUX_IOC_NRSHIFT) |       \
+        ((type) << _LINUX_IOC_TYPESHIFT) |     \
+        ((size) << _LINUX_IOC_SIZESHIFT) |     \
+        ((dir)  << _LINUX_IOC_DIRSHIFT))
+
+#define _LINUX_IO(type,nr)             \
+       _LINUX_IOC(_LINUX_IOC_NONE,(type),(nr),0)
+#define        _LINUX_IOR(type,nr,size)        \
+       _LINUX_IOC(_LINUX_IOC_READ,(type),(nr),sizeof(size))
+#define        _LINUX_IOW(type,nr,size)        \
+       _LINUX_IOC(_LINUX_IOC_WRITE,(type),(nr),sizeof(size))
+#define        _LINUX_IOWR(type,nr,size)       \
+       _LINUX_IOC(_LINUX_IOC_READ|_LINUX_IOC_WRITE,(type),(nr),sizeof(size))
+
+#define _LINUX_IOC_DIR(nr)     \
+       (((nr) >> _LINUX_IOC_DIRSHIFT) & _LINUX_IOC_DIRMASK)
+#define _LINUX_IOC_TYPE(nr)    \
+       (((nr) >> _LINUX_IOC_TYPESHIFT) & _LINUX_IOC_TYPEMASK)
+#define _LINUX_IOC_NR(nr)      \
+       (((nr) >> _LINUX_IOC_NRSHIFT) & _LINUX_IOC_NRMASK)
+#define _LINUX_IOC_SIZE(nr)    \
+       (((nr) >> _LINUX_IOC_SIZESHIFT) & _LINUX_IOC_SIZEMASK)
+
+#define LINUX_IOCGROUP(x)      _LINUX_IOC_TYPE(x)
+
 #endif /* !_LINUX_IOCTL_H */