Implement pluggable ioctl handlers.

Other modules can register and unregister ioctl handlers to extend the
ioctls known by the Linuxulator. A recent application is the vmware
port. The Linuxulator itself uses the new interface to register its
handlers as well. Handlers for the following types of ioctls have been
defined:
	cdrom
	console (=keyboard and VT handling)
	socket
	sound
	termio

All ioctl related defines and declarations have been moved to a new
file (linux_ioctl.h), except for the pluggable ioctl handler interface
definition.

While there, cleanup linux.h some more.

linux.h and linux_ioctl.[ch] have been made to conform to style(9) as
much as possible.

Inspired and reviewed by: Vladimir N. Silyaev

1 files changed, 301 insertions, 649 deletions

diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h
index d3ba6cc..528a591 100644
--- a/sys/i386/linux/linux.h
+++ b/sys/i386/linux/linux.h
@@ -29,63 +29,162 @@
  */
 
 #ifndef _I386_LINUX_LINUX_H_
-#define _I386_LINUX_LINUX_H_
+#define	_I386_LINUX_LINUX_H_
 
 #include <i386/linux/linux_syscall.h>
 
-typedef unsigned short linux_uid_t;
-typedef unsigned short linux_gid_t;
-typedef unsigned short linux_dev_t;
-typedef unsigned long linux_ino_t;
-typedef unsigned short linux_mode_t;
-typedef unsigned short linux_nlink_t;
-typedef long linux_time_t;
-typedef long linux_clock_t;
-typedef char * linux_caddr_t;
-typedef long linux_off_t;
+#ifdef MALLOC_DECLARE
+MALLOC_DECLARE(M_LINUX);
+#endif
+
+/*
+ * Miscellaneous
+ */
+#define	LINUX_NAME_MAX		255
+#define	LINUX_MAX_UTSNAME	65
+
+/* Scheduling policies */
+#define	LINUX_SCHED_OTHER	0
+#define	LINUX_SCHED_FIFO	1
+#define	LINUX_SCHED_RR		2
+
+/* Resource limits */
+#define	LINUX_RLIMIT_CPU	0
+#define	LINUX_RLIMIT_FSIZE	1
+#define	LINUX_RLIMIT_DATA	2
+#define	LINUX_RLIMIT_STACK	3
+#define	LINUX_RLIMIT_CORE	4
+#define	LINUX_RLIMIT_RSS	5
+#define	LINUX_RLIMIT_NPROC	6
+#define	LINUX_RLIMIT_NOFILE	7
+#define	LINUX_RLIMIT_MEMLOCK	8
+#define	LINUX_RLIMIT_AS		9       /* address space limit */
+
+#define	LINUX_RLIM_NLIMITS	10
+
+/* mmap options */
+#define	LINUX_MAP_SHARED	0x0001
+#define	LINUX_MAP_PRIVATE	0x0002
+#define	LINUX_MAP_FIXED		0x0010
+#define	LINUX_MAP_ANON		0x0020
+#define	LINUX_MAP_GROWSDOWN	0x0100
+
+typedef char *	linux_caddr_t;
+typedef long	linux_clock_t;
+typedef u_short	linux_dev_t;
+typedef u_short	linux_gid_t;
+typedef u_long	linux_ino_t;
+typedef int	linux_key_t;	/* XXX */
+typedef u_short	linux_mode_t;
+typedef u_short	linux_nlink_t;
+typedef long	linux_off_t;
+typedef int	linux_pid_t;
+typedef u_int	linux_size_t;
+typedef long	linux_time_t;
+typedef u_short	linux_uid_t;
+
 typedef struct {
-	long val[2];
+	long	val[2];
 } linux_fsid_t;
-typedef int linux_pid_t;
-typedef int linux_key_t;
-typedef unsigned int linux_size_t;
+
+struct linux_new_utsname {
+	char	sysname[LINUX_MAX_UTSNAME];
+	char	nodename[LINUX_MAX_UTSNAME];
+	char	release[LINUX_MAX_UTSNAME];
+	char	version[LINUX_MAX_UTSNAME];
+	char	machine[LINUX_MAX_UTSNAME];
+	char	domainname[LINUX_MAX_UTSNAME];
+};
 
 /*
- * Signal stuff...
+ * Signalling
  */
-typedef void (*linux_handler_t)(int);
+#define	LINUX_SIGHUP		1
+#define	LINUX_SIGINT		2
+#define	LINUX_SIGQUIT		3
+#define	LINUX_SIGILL		4
+#define	LINUX_SIGTRAP		5
+#define	LINUX_SIGABRT		6
+#define	LINUX_SIGIOT		LINUX_SIGABRT
+#define	LINUX_SIGBUS		7
+#define	LINUX_SIGFPE		8
+#define	LINUX_SIGKILL		9
+#define	LINUX_SIGUSR1		10
+#define	LINUX_SIGSEGV		11
+#define	LINUX_SIGUSR2		12
+#define	LINUX_SIGPIPE		13
+#define	LINUX_SIGALRM		14
+#define	LINUX_SIGTERM		15
+#define	LINUX_SIGSTKFLT		16
+#define	LINUX_SIGCHLD		17
+#define	LINUX_SIGCONT		18
+#define	LINUX_SIGSTOP		19
+#define	LINUX_SIGTSTP		20
+#define	LINUX_SIGTTIN		21
+#define	LINUX_SIGTTOU		22
+#define	LINUX_SIGURG		23
+#define	LINUX_SIGXCPU		24
+#define	LINUX_SIGXFSZ		25
+#define	LINUX_SIGVTALRM		26
+#define	LINUX_SIGPROF		27
+#define	LINUX_SIGWINCH		28
+#define	LINUX_SIGIO		29
+#define	LINUX_SIGPOLL		LINUX_SIGIO
+#define	LINUX_SIGPWR		30
+#define	LINUX_SIGUNUSED		31
+
+#define	LINUX_NSIG		64
+#define	LINUX_SIGTBLSZ		31
 
-typedef unsigned long linux_osigset_t;
+/* sigaction flags */
+#define	LINUX_SA_NOCLDSTOP	0x00000001
+#define	LINUX_SA_NOCLDWAIT	0x00000002
+#define	LINUX_SA_SIGINFO	0x00000004
+#define	LINUX_SA_RESTORER	0x04000000
+#define	LINUX_SA_ONSTACK	0x08000000
+#define	LINUX_SA_RESTART	0x10000000
+#define	LINUX_SA_INTERRUPT	0x20000000
+#define	LINUX_SA_NOMASK		0x40000000
+#define	LINUX_SA_ONESHOT	0x80000000
+
+/* sigprocmask actions */
+#define	LINUX_SIG_BLOCK		0
+#define	LINUX_SIG_UNBLOCK	1
+#define	LINUX_SIG_SETMASK	2
+
+/* sigset_t macros */
+#define	LINUX_SIGEMPTYSET(set)		(set).__bits[0] = (set).__bits[1] = 0
+#define	LINUX_SIGISMEMBER(set, sig)	SIGISMEMBER(set, sig)
+#define	LINUX_SIGADDSET(set, sig)	SIGADDSET(set, sig)
+
+typedef void	(*linux_handler_t)(int);
+typedef u_long	linux_osigset_t;
 
 typedef struct {
-	unsigned int	__bits[2];
+	u_int	__bits[2];
 } linux_sigset_t;
 
 typedef struct {
-	void		(*lsa_handler)(int);
+	linux_handler_t lsa_handler;
 	linux_osigset_t	lsa_mask;
-	unsigned long	lsa_flags;
-	void		(*lsa_restorer)(void);
+	u_long	lsa_flags;
+	void	(*lsa_restorer)(void);
 } linux_osigaction_t;
 
 typedef struct {
-	void		(*lsa_handler)(int);
-	unsigned long	lsa_flags;
-	void		(*lsa_restorer)(void);
+	linux_handler_t lsa_handler;
+	u_long	lsa_flags;
+	void	(*lsa_restorer)(void);
 	linux_sigset_t	lsa_mask;
 } linux_sigaction_t;
 
-typedef struct 
-{
-	void *ss_sp;
-	int ss_flags;
+typedef struct {
+	void	*ss_sp;
+	int	ss_flags;
 	linux_size_t ss_size;
 } linux_stack_t;
 
-/*
- * The Linux sigcontext, pretty much a standard 386 trapframe.
- */
-
+/* The Linux sigcontext, pretty much a standard 386 trapframe. */
 struct linux_sigcontext {
 	int	sc_gs;
 	int	sc_fs;
@@ -117,400 +216,95 @@ struct linux_sigcontext {
  * This means that we need to pass the pointer to the handler too.
  * It is appended to the frame to not interfere with the rest of it.
  */
-
 struct linux_sigframe {
 	int	sf_sig;
 	struct	linux_sigcontext sf_sc;
-	void	(*sf_handler)(int);
+	linux_handler_t sf_handler;
 };
 
 extern int bsd_to_linux_signal[];
 extern int linux_to_bsd_signal[];
 
-/* signal numbers */
-#define LINUX_SIGHUP		 1
-#define LINUX_SIGINT		 2
-#define LINUX_SIGQUIT		 3
-#define LINUX_SIGILL		 4
-#define LINUX_SIGTRAP		 5
-#define LINUX_SIGABRT		 6
-#define LINUX_SIGIOT		 6
-#define LINUX_SIGBUS		 7
-#define LINUX_SIGFPE		 8
-#define LINUX_SIGKILL		 9
-#define LINUX_SIGUSR1		10
-#define LINUX_SIGSEGV		11
-#define LINUX_SIGUSR2		12
-#define LINUX_SIGPIPE		13
-#define LINUX_SIGALRM		14
-#define LINUX_SIGTERM		15
-#define LINUX_SIGSTKFLT		16
-#define LINUX_SIGCHLD		17
-#define LINUX_SIGCONT		18
-#define LINUX_SIGSTOP		19
-#define LINUX_SIGTSTP		20
-#define LINUX_SIGTTIN		21
-#define LINUX_SIGTTOU		22
-#define LINUX_SIGURG		23
-#define LINUX_SIGXCPU		24
-#define LINUX_SIGXFSZ		25
-#define LINUX_SIGVTALRM		26
-#define LINUX_SIGPROF		27
-#define LINUX_SIGWINCH		28
-#define LINUX_SIGIO		29
-#define LINUX_SIGPOLL		LINUX_SIGIO
-#define LINUX_SIGPWR		30
-#define LINUX_SIGUNUSED		31
-#define LINUX_NSIG		64
-#define LINUX_SIGTBLSZ		31
-
-/* sigaction flags */
-#define LINUX_SA_NOCLDSTOP	0x00000001
-#define LINUX_SA_NOCLDWAIT      0x00000002
-#define LINUX_SA_SIGINFO        0x00000004
-#define LINUX_SA_RESTORER       0x04000000
-#define LINUX_SA_ONSTACK	0x08000000
-#define LINUX_SA_RESTART	0x10000000
-#define LINUX_SA_INTERRUPT	0x20000000
-#define LINUX_SA_NOMASK		0x40000000
-#define LINUX_SA_ONESHOT	0x80000000
-
-/* sigprocmask actions */
-#define LINUX_SIG_BLOCK		0
-#define LINUX_SIG_UNBLOCK	1
-#define LINUX_SIG_SETMASK	2
-
-#define LINUX_SIGEMPTYSET(set)		(set).__bits[0] = (set).__bits[1] = 0
-#define LINUX_SIGISMEMBER(set, sig)	SIGISMEMBER(set, sig)
-#define LINUX_SIGADDSET(set, sig)	SIGADDSET(set, sig)
-
-extern char linux_sigcode[];
-extern int linux_szsigcode;
-extern const char linux_emul_path[];
-
-extern struct sysent linux_sysent[LINUX_SYS_MAXSYSCALL];
-extern struct sysentvec linux_sysvec;
-extern struct sysentvec elf_linux_sysvec;
+/*
+ * Pluggable ioctl handlers
+ */
+struct linker_set;
+struct linux_ioctl_args;
+struct proc;
 
-/* dummy struct definitions */
-struct image_params;
-struct trapframe;
+typedef int linux_ioctl_function_t(struct proc *, struct linux_ioctl_args *);
 
-#define LINUX_MAX_UTSNAME	65
-struct linux_new_utsname {
-    char sysname[LINUX_MAX_UTSNAME];
-    char nodename[LINUX_MAX_UTSNAME];
-    char release[LINUX_MAX_UTSNAME];
-    char version[LINUX_MAX_UTSNAME];
-    char machine[LINUX_MAX_UTSNAME];
-    char domainname[LINUX_MAX_UTSNAME];
+struct linux_ioctl_handler {
+	linux_ioctl_function_t *func;
+	int	low, high;
 };
 
-/* misc defines */
-#define LINUX_NAME_MAX		255
-
-/* resource limits */
-#define LINUX_RLIMIT_CPU        0
-#define LINUX_RLIMIT_FSIZE      1
-#define LINUX_RLIMIT_DATA       2
-#define LINUX_RLIMIT_STACK      3
-#define LINUX_RLIMIT_CORE       4
-#define LINUX_RLIMIT_RSS        5
-#define LINUX_RLIMIT_NPROC      6
-#define LINUX_RLIMIT_NOFILE     7
-#define LINUX_RLIMIT_MEMLOCK    8
-#define LINUX_RLIMIT_AS         9       /* address space limit */
-
-#define LINUX_RLIM_NLIMITS      10
-
-/* keyboard defines */
-#define LINUX_KIOCSOUND		0x4B2F
-#define LINUX_KDMKTONE		0x4B30
-#define LINUX_KDGETLED		0x4B31
-#define LINUX_KDSETLED		0x4B32
-#define LINUX_LED_SCR		0x01
-#define LINUX_LED_NUM		0x02
-#define LINUX_LED_CAP		0x04
-
-#define LINUX_KDGKBMODE         0x4B44
-#define LINUX_KDSKBMODE         0x4B45
-#define LINUX_KDSETMODE		0x4B3A
-#define LINUX_KDGETMODE		0x4B3B
-#define LINUX_KD_TEXT		0x0
-#define LINUX_KD_GRAPHICS	0x1
-#define LINUX_KD_TEXT0		0x2
-#define LINUX_KD_TEXT1		0x3
-
-#define LINUX_KBD_RAW           0
-#define LINUX_KBD_XLATE         1
-#define LINUX_KBD_MEDIUMRAW     2
-
-/* termio commands */
-#define LINUX_TCGETS		0x5401
-#define LINUX_TCSETS		0x5402
-#define LINUX_TCSETSW		0x5403
-#define LINUX_TCSETSF		0x5404
-#define LINUX_TCGETA		0x5405
-#define LINUX_TCSETA		0x5406
-#define LINUX_TCSETAW		0x5407
-#define LINUX_TCSETAF		0x5408
-#define LINUX_TCSBRK		0x5409
-#define LINUX_TCXONC		0x540A
-#define LINUX_TCFLSH		0x540B
-#define LINUX_TIOCEXCL		0x540C
-#define LINUX_TIOCNXCL		0x540D
-#define LINUX_TIOCSCTTY		0x540E
-#define LINUX_TIOCGPGRP		0x540F
-#define LINUX_TIOCSPGRP		0x5410
-#define LINUX_TIOCOUTQ		0x5411
-#define LINUX_TIOCSTI		0x5412
-#define LINUX_TIOCGWINSZ	0x5413
-#define LINUX_TIOCSWINSZ	0x5414
-#define LINUX_TIOCMGET		0x5415
-#define LINUX_TIOCMBIS		0x5416
-#define LINUX_TIOCMBIC		0x5417
-#define LINUX_TIOCMSET		0x5418
-#define LINUX_TIOCGSOFTCAR	0x5419
-#define LINUX_TIOCSSOFTCAR	0x541A
-#define LINUX_FIONREAD		0x541B
-#define LINUX_TIOCINQ		FIONREAD
-#define LINUX_TIOCLINUX		0x541C
-#define LINUX_TIOCCONS		0x541D
-#define LINUX_TIOCGSERIAL	0x541E
-#define LINUX_TIOCSSERIAL	0x541F
-#define LINUX_TIOCPKT		0x5420
-#define LINUX_FIONBIO		0x5421
-#define LINUX_TIOCNOTTY		0x5422
-#define LINUX_TIOCSETD		0x5423
-#define LINUX_TIOCGETD		0x5424
-#define LINUX_TCSBRKP		0x5425
-#define LINUX_TIOCTTYGSTRUCT	0x5426
-#define LINUX_FIONCLEX		0x5450
-#define LINUX_FIOCLEX		0x5451
-#define LINUX_FIOASYNC		0x5452
-#define LINUX_TIOCSERCONFIG	0x5453
-#define LINUX_TIOCSERGWILD	0x5454
-#define LINUX_TIOCSERSWILD	0x5455
-#define LINUX_TIOCGLCKTRMIOS	0x5456
-#define LINUX_TIOCSLCKTRMIOS	0x5457
-#define LINUX_VT_OPENQRY        0x5600
-#define LINUX_VT_GETMODE        0x5601
-#define LINUX_VT_SETMODE        0x5602
-#define LINUX_VT_GETSTATE       0x5603
-#define LINUX_VT_RELDISP        0x5605
-#define LINUX_VT_ACTIVATE       0x5606  
-#define LINUX_VT_WAITACTIVE     0x5607
-
-/* arguments for tcflow() and LINUX_TCXONC */
-#define LINUX_TCOOFF          0
-#define LINUX_TCOON           1
-#define LINUX_TCIOFF          2
-#define LINUX_TCION           3
-
-/* arguments for tcflush() and LINUX_TCFLSH */
-#define LINUX_TCIFLUSH        0
-#define LINUX_TCOFLUSH        1
-#define LINUX_TCIOFLUSH       2
-
-/* line disciplines */
-#define LINUX_N_TTY		0
-#define LINUX_N_SLIP		1
-#define LINUX_N_MOUSE		2
-#define LINUX_N_PPP		3
-
-/* Linux termio c_cc values */
-#define LINUX_VINTR		0
-#define LINUX_VQUIT		1
-#define LINUX_VERASE		2
-#define LINUX_VKILL		3
-#define LINUX_VEOF		4
-#define LINUX_VTIME		5
-#define LINUX_VMIN		6
-#define LINUX_VSWTC		7
-#define LINUX_NCC		8
-
-/* Linux termios c_cc values */
-#define LINUX_VSTART		8
-#define LINUX_VSTOP		9
-#define LINUX_VSUSP 		10
-#define LINUX_VEOL		11
-#define LINUX_VREPRINT		12
-#define LINUX_VDISCARD		13
-#define LINUX_VWERASE		14
-#define LINUX_VLNEXT		15
-#define LINUX_VEOL2		16
-#define LINUX_NCCS		19
-
-#define LINUX_POSIX_VDISABLE	'\0'
-
-/* Linux c_iflag masks */
-#define LINUX_IGNBRK		0x0000001
-#define LINUX_BRKINT		0x0000002
-#define LINUX_IGNPAR		0x0000004
-#define LINUX_PARMRK		0x0000008
-#define LINUX_INPCK		0x0000010
-#define LINUX_ISTRIP		0x0000020
-#define LINUX_INLCR		0x0000040
-#define LINUX_IGNCR		0x0000080
-#define LINUX_ICRNL		0x0000100
-#define LINUX_IUCLC		0x0000200
-#define LINUX_IXON		0x0000400
-#define LINUX_IXANY		0x0000800
-#define LINUX_IXOFF		0x0001000
-#define LINUX_IMAXBEL		0x0002000
-
-/* Linux c_oflag masks */
-#define LINUX_OPOST		0x0000001
-#define LINUX_OLCUC		0x0000002
-#define LINUX_ONLCR		0x0000004
-#define LINUX_OCRNL		0x0000008
-#define LINUX_ONOCR		0x0000010
-#define LINUX_ONLRET		0x0000020
-#define LINUX_OFILL		0x0000040
-#define LINUX_OFDEL		0x0000080
-#define LINUX_NLDLY		0x0000100
-
-#define LINUX_NL0		0x0000000
-#define LINUX_NL1		0x0000100
-#define LINUX_CRDLY		0x0000600
-#define LINUX_CR0		0x0000000
-#define LINUX_CR1		0x0000200
-#define LINUX_CR2		0x0000400
-#define LINUX_CR3		0x0000600
-#define LINUX_TABDLY		0x0001800
-#define LINUX_TAB0		0x0000000
-#define LINUX_TAB1		0x0000800
-#define LINUX_TAB2		0x0001000
-#define LINUX_TAB3		0x0001800
-#define LINUX_XTABS		0x0001800
-#define LINUX_BSDLY		0x0002000
-#define LINUX_BS0		0x0000000
-#define LINUX_BS1		0x0002000
-#define LINUX_VTDLY		0x0004000
-#define LINUX_VT0		0x0000000
-#define LINUX_VT1		0x0004000
-#define LINUX_FFDLY		0x0008000
-#define LINUX_FF0		0x0000000
-#define LINUX_FF1		0x0008000
-
-#define LINUX_CBAUD		0x0000100f
-#define LINUX_B0		0x00000000
-#define LINUX_B50		0x00000001
-#define LINUX_B75		0x00000002
-#define LINUX_B110		0x00000003
-#define LINUX_B134		0x00000004
-#define LINUX_B150		0x00000005
-#define LINUX_B200		0x00000006
-#define LINUX_B300		0x00000007
-#define LINUX_B600		0x00000008
-#define LINUX_B1200		0x00000009
-#define LINUX_B1800		0x0000000a
-#define LINUX_B2400		0x0000000b
-#define LINUX_B4800		0x0000000c
-#define LINUX_B9600		0x0000000d
-#define LINUX_B19200		0x0000000e
-#define LINUX_B38400		0x0000000f
-#define LINUX_EXTA		LINUX_B19200
-#define LINUX_EXTB		LINUX_B38400
-#define LINUX_CBAUDEX		0x00001000
-#define LINUX_B57600		0x00001001
-#define LINUX_B115200		0x00001002
-
-#define LINUX_CSIZE		0x00000030
-#define LINUX_CS5		0x00000000
-#define LINUX_CS6		0x00000010
-#define LINUX_CS7		0x00000020
-#define LINUX_CS8		0x00000030
-#define LINUX_CSTOPB		0x00000040
-#define LINUX_CREAD		0x00000080
-#define LINUX_PARENB		0x00000100
-#define LINUX_PARODD		0x00000200
-#define LINUX_HUPCL		0x00000400
-#define LINUX_CLOCAL		0x00000800
-#define LINUX_CRTSCTS		0x80000000
-
-/* Linux c_lflag masks */
-#define LINUX_ISIG		0x00000001
-#define LINUX_ICANON		0x00000002
-#define LINUX_XCASE		0x00000004
-#define LINUX_ECHO		0x00000008
-#define LINUX_ECHOE		0x00000010
-#define LINUX_ECHOK		0x00000020
-#define LINUX_ECHONL		0x00000040
-#define LINUX_NOFLSH		0x00000080
-#define LINUX_TOSTOP		0x00000100
-#define LINUX_ECHOCTL		0x00000200
-#define LINUX_ECHOPRT		0x00000400
-#define LINUX_ECHOKE		0x00000800
-#define LINUX_FLUSHO		0x00001000
-#define LINUX_PENDIN		0x00002000
-#define LINUX_IEXTEN		0x00008000
-
-/* open/fcntl flags */
-#define LINUX_O_RDONLY		00
-#define LINUX_O_WRONLY		01
-#define LINUX_O_RDWR		02
-#define LINUX_O_CREAT		0100
-#define LINUX_O_EXCL		0200
-#define LINUX_O_NOCTTY		0400
-#define LINUX_O_TRUNC		01000
-#define LINUX_O_APPEND		02000
-#define LINUX_O_NONBLOCK	04000
-#define LINUX_O_NDELAY		LINUX_O_NONBLOCK
-#define LINUX_O_SYNC		010000
-#define LINUX_FASYNC		020000
-
-/* fcntl flags */
-#define LINUX_F_DUPFD		0
-#define LINUX_F_GETFD		1
-#define LINUX_F_SETFD		2
-#define LINUX_F_GETFL		3
-#define LINUX_F_SETFL		4
-#define LINUX_F_GETLK		5
-#define LINUX_F_SETLK		6
-#define LINUX_F_SETLKW		7
-#define LINUX_F_SETOWN		8
-#define LINUX_F_GETOWN		9
-
-#define LINUX_F_RDLCK		0
-#define LINUX_F_WRLCK		1
-#define LINUX_F_UNLCK		2
+int	linux_ioctl_register_handler(struct linux_ioctl_handler *h);
+int	linux_ioctl_register_handlers(struct linker_set *s);
+int	linux_ioctl_unregister_handler(struct linux_ioctl_handler *h);
+int	linux_ioctl_unregister_handlers(struct linker_set *s);
 
-/* mmap options */
-#define LINUX_MAP_SHARED	0x0001
-#define LINUX_MAP_PRIVATE	0x0002
-#define LINUX_MAP_FIXED		0x0010
-#define LINUX_MAP_ANON		0x0020
-#define LINUX_MAP_GROWSDOWN     0x0100
-
-/* SystemV ipc defines */
-#define LINUX_SEMOP		1
-#define LINUX_SEMGET		2
-#define LINUX_SEMCTL		3
-#define LINUX_MSGSND		11
-#define LINUX_MSGRCV		12
-#define LINUX_MSGGET		13
-#define LINUX_MSGCTL		14
-#define LINUX_SHMAT		21
-#define LINUX_SHMDT		22
-#define LINUX_SHMGET		23
-#define LINUX_SHMCTL		24
-
-#define LINUX_IPC_RMID		0
-#define LINUX_IPC_SET		1
-#define LINUX_IPC_STAT		2
-#define LINUX_IPC_INFO		3
-
-#define LINUX_SHM_LOCK		11
-#define LINUX_SHM_UNLOCK	12
-#define LINUX_SHM_STAT		13
-#define LINUX_SHM_INFO		14
-
-#define LINUX_SHM_RDONLY	0x1000
-#define LINUX_SHM_RND		0x2000
-#define LINUX_SHM_REMAP		0x4000
-
-/* semctl Command Definitions. */
+/*
+ * open/fcntl flags
+ */
+#define	LINUX_O_RDONLY		00
+#define	LINUX_O_WRONLY		01
+#define	LINUX_O_RDWR		02
+#define	LINUX_O_CREAT		0100
+#define	LINUX_O_EXCL		0200
+#define	LINUX_O_NOCTTY		0400
+#define	LINUX_O_TRUNC		01000
+#define	LINUX_O_APPEND		02000
+#define	LINUX_O_NONBLOCK	04000
+#define	LINUX_O_NDELAY		LINUX_O_NONBLOCK
+#define	LINUX_O_SYNC		010000
+#define	LINUX_FASYNC		020000
+
+#define	LINUX_F_DUPFD		0
+#define	LINUX_F_GETFD		1
+#define	LINUX_F_SETFD		2
+#define	LINUX_F_GETFL		3
+#define	LINUX_F_SETFL		4
+#define	LINUX_F_GETLK		5
+#define	LINUX_F_SETLK		6
+#define	LINUX_F_SETLKW		7
+#define	LINUX_F_SETOWN		8
+#define	LINUX_F_GETOWN		9
+
+#define	LINUX_F_RDLCK		0
+#define	LINUX_F_WRLCK		1
+#define	LINUX_F_UNLCK		2
+
+/*
+ * SystemV IPC defines
+ */
+#define	LINUX_SEMOP		1
+#define	LINUX_SEMGET		2
+#define	LINUX_SEMCTL		3
+#define	LINUX_MSGSND		11
+#define	LINUX_MSGRCV		12
+#define	LINUX_MSGGET		13
+#define	LINUX_MSGCTL		14
+#define	LINUX_SHMAT		21
+#define	LINUX_SHMDT		22
+#define	LINUX_SHMGET		23
+#define	LINUX_SHMCTL		24
+
+#define	LINUX_IPC_RMID		0
+#define	LINUX_IPC_SET		1
+#define	LINUX_IPC_STAT		2
+#define	LINUX_IPC_INFO		3
+
+#define	LINUX_SHM_LOCK		11
+#define	LINUX_SHM_UNLOCK	12
+#define	LINUX_SHM_STAT		13
+#define	LINUX_SHM_INFO		14
+
+#define	LINUX_SHM_RDONLY	0x1000
+#define	LINUX_SHM_RND		0x2000
+#define	LINUX_SHM_REMAP		0x4000
+
+/* semctl commands */
 #define	LINUX_GETPID		11
 #define	LINUX_GETVAL		12
 #define	LINUX_GETALL		13
@@ -519,246 +313,104 @@ struct linux_new_utsname {
 #define	LINUX_SETVAL		16
 #define	LINUX_SETALL		17
 
-/* Socket defines */
-#define LINUX_SOCKET 		1
-#define LINUX_BIND		2
-#define LINUX_CONNECT 		3
-#define LINUX_LISTEN 		4
-#define LINUX_ACCEPT 		5
-#define LINUX_GETSOCKNAME	6
-#define LINUX_GETPEERNAME	7
-#define LINUX_SOCKETPAIR	8
-#define LINUX_SEND		9
-#define LINUX_RECV		10
-#define LINUX_SENDTO 		11
-#define LINUX_RECVFROM 		12
-#define LINUX_SHUTDOWN 		13
-#define LINUX_SETSOCKOPT	14
-#define LINUX_GETSOCKOPT	15
-#define LINUX_SENDMSG		16
-#define LINUX_RECVMSG		17
-
-#define LINUX_AF_UNSPEC		0
-#define LINUX_AF_UNIX		1
-#define LINUX_AF_INET		2
-#define LINUX_AF_AX25		3
-#define LINUX_AF_IPX		4
-#define LINUX_AF_APPLETALK	5
-
-#define LINUX_SOL_SOCKET	1
-#define LINUX_SOL_IP		0
-#define LINUX_SOL_IPX		256
-#define LINUX_SOL_AX25		257
-#define LINUX_SOL_TCP		6
-#define LINUX_SOL_UDP		17
-
-#define LINUX_SO_DEBUG		1
-#define LINUX_SO_REUSEADDR	2
-#define LINUX_SO_TYPE		3
-#define LINUX_SO_ERROR		4
-#define LINUX_SO_DONTROUTE	5
-#define LINUX_SO_BROADCAST	6
-#define LINUX_SO_SNDBUF		7
-#define LINUX_SO_RCVBUF		8
-#define LINUX_SO_KEEPALIVE	9
-#define LINUX_SO_OOBINLINE	10
-#define LINUX_SO_NO_CHECK	11
-#define LINUX_SO_PRIORITY	12
-#define LINUX_SO_LINGER		13
-
-#define LINUX_IP_TOS		1
-#define LINUX_IP_TTL		2
-#define LINUX_IP_HDRINCL	3
-#define LINUX_IP_OPTIONS	4
-
-#define LINUX_IP_MULTICAST_IF		32
-#define LINUX_IP_MULTICAST_TTL		33
-#define LINUX_IP_MULTICAST_LOOP		34
-#define LINUX_IP_ADD_MEMBERSHIP		35
-#define LINUX_IP_DROP_MEMBERSHIP	36
-
-/* Sound system defines */
-#define LINUX_SNDCTL_SEQ_RESET		0x5100
-#define LINUX_SNDCTL_SEQ_SYNC		0x5101
-#define LINUX_SNDCTL_SYNTH_INFO		0x5102
-#define LINUX_SNDCTL_SEQ_CTRLRATE	0x5103
-#define LINUX_SNDCTL_SEQ_GETOUTCOUNT	0x5104
-#define LINUX_SNDCTL_SEQ_GETINCOUNT	0x5105
-#define LINUX_SNDCTL_SEQ_PERCMODE	0x5106
-#define LINUX_SNDCTL_FM_LOAD_INSTR	0x5107
-#define LINUX_SNDCTL_SEQ_TESTMIDI	0x5108
-#define LINUX_SNDCTL_SEQ_RESETSAMPLES	0x5109
-#define LINUX_SNDCTL_SEQ_NRSYNTHS	0x510A
-#define LINUX_SNDCTL_SEQ_NRMIDIS	0x510B
-#define LINUX_SNDCTL_MIDI_INFO		0x510C
-#define LINUX_SNDCTL_SEQ_TRESHOLD	0x510D
-#define LINUX_SNDCTL_SYNTH_MEMAVL	0x510E
-#define LINUX_SNDCTL_DSP_RESET		0x5000
-#define LINUX_SNDCTL_DSP_SYNC		0x5001
-#define LINUX_SNDCTL_DSP_SPEED		0x5002
-#define LINUX_SNDCTL_DSP_STEREO		0x5003
-#define LINUX_SNDCTL_DSP_GETBLKSIZE	0x5004
-#define LINUX_SNDCTL_DSP_SETBLKSIZE	0x5004
-#define LINUX_SNDCTL_DSP_SETFMT		0x5005
-#define LINUX_SOUND_PCM_WRITE_CHANNELS	0x5006
-#define LINUX_SOUND_PCM_WRITE_FILTER	0x5007
-#define LINUX_SNDCTL_DSP_POST		0x5008
-#define LINUX_SNDCTL_DSP_SUBDIVIDE	0x5009
-#define LINUX_SNDCTL_DSP_SETFRAGMENT	0x500A
-#define LINUX_SNDCTL_DSP_GETFMTS	0x500B
-#define LINUX_SNDCTL_DSP_GETOSPACE	0x500C
-#define LINUX_SNDCTL_DSP_GETISPACE	0x500D
-#define LINUX_SNDCTL_DSP_NONBLOCK	0x500E
-#define LINUX_SNDCTL_DSP_GETCAPS	0x500F
-#define LINUX_SNDCTL_DSP_GETTRIGGER	0x5010
-#define LINUX_SNDCTL_DSP_SETTRIGGER	0x5010
-#define LINUX_SNDCTL_DSP_GETIPTR	0x5011
-#define LINUX_SNDCTL_DSP_GETOPTR	0x5012
-#define LINUX_SNDCTL_DSP_GETODELAY	0x5017
-#define LINUX_SOUND_MIXER_WRITE_VOLUME	0x4d00
-#define LINUX_SOUND_MIXER_WRITE_BASS	0x4d01
-#define LINUX_SOUND_MIXER_WRITE_TREBLE	0x4d02
-#define LINUX_SOUND_MIXER_WRITE_SYNTH	0x4d03
-#define LINUX_SOUND_MIXER_WRITE_PCM	0x4d04
-#define LINUX_SOUND_MIXER_WRITE_SPEAKER	0x4d05
-#define LINUX_SOUND_MIXER_WRITE_LINE	0x4d06
-#define LINUX_SOUND_MIXER_WRITE_MIC	0x4d07
-#define LINUX_SOUND_MIXER_WRITE_CD	0x4d08
-#define LINUX_SOUND_MIXER_WRITE_IMIX	0x4d09
-#define LINUX_SOUND_MIXER_WRITE_ALTPCM	0x4d0A
-#define LINUX_SOUND_MIXER_WRITE_RECLEV	0x4d0B
-#define LINUX_SOUND_MIXER_WRITE_IGAIN	0x4d0C
-#define LINUX_SOUND_MIXER_WRITE_OGAIN	0x4d0D
-#define LINUX_SOUND_MIXER_WRITE_LINE1	0x4d0E
-#define LINUX_SOUND_MIXER_WRITE_LINE2	0x4d0F
-#define LINUX_SOUND_MIXER_WRITE_LINE3	0x4d10
-#define LINUX_SOUND_MIXER_READ_DEVMASK	0x4dfe
-
-#define LINUX_OSS_GETVERSION		0x4d76
-
-/* Socket system defines */
-#define LINUX_FIOSETOWN			0x8901
-#define LINUX_SIOCSPGRP			0x8902
-#define LINUX_FIOGETOWN			0x8903
-#define LINUX_SIOCGPGRP			0x8904
-#define LINUX_SIOCATMARK		0x8905
-#define LINUX_SIOCGSTAMP		0x8906
-#define LINUX_SIOCGIFCONF		0x8912
-#define LINUX_SIOCGIFFLAGS		0x8913
-#define LINUX_SIOCGIFADDR		0x8915
-#define LINUX_SIOCGIFDSTADDR		0x8917
-#define LINUX_SIOCGIFBRDADDR		0x8919
-#define LINUX_SIOCGIFNETMASK		0x891b
-#define LINUX_SIOCGIFHWADDR		0x8927
-#define LINUX_SIOCADDMULTI		0x8931
-#define LINUX_SIOCDELMULTI		0x8932
-
-struct linux_sockaddr
-{
-    unsigned short	sa_family;
-    char		sa_data[14];
+/*
+ * Socket defines
+ */
+#define	LINUX_SOCKET 		1
+#define	LINUX_BIND		2
+#define	LINUX_CONNECT 		3
+#define	LINUX_LISTEN 		4
+#define	LINUX_ACCEPT 		5
+#define	LINUX_GETSOCKNAME	6
+#define	LINUX_GETPEERNAME	7
+#define	LINUX_SOCKETPAIR	8
+#define	LINUX_SEND		9
+#define	LINUX_RECV		10
+#define	LINUX_SENDTO 		11
+#define	LINUX_RECVFROM 		12
+#define	LINUX_SHUTDOWN 		13
+#define	LINUX_SETSOCKOPT	14
+#define	LINUX_GETSOCKOPT	15
+#define	LINUX_SENDMSG		16
+#define	LINUX_RECVMSG		17
+
+#define	LINUX_AF_UNSPEC		0
+#define	LINUX_AF_UNIX		1
+#define	LINUX_AF_INET		2
+#define	LINUX_AF_AX25		3
+#define	LINUX_AF_IPX		4
+#define	LINUX_AF_APPLETALK	5
+
+#define	LINUX_SOL_SOCKET	1
+#define	LINUX_SOL_IP		0
+#define	LINUX_SOL_IPX		256
+#define	LINUX_SOL_AX25		257
+#define	LINUX_SOL_TCP		6
+#define	LINUX_SOL_UDP		17
+
+#define	LINUX_SO_DEBUG		1
+#define	LINUX_SO_REUSEADDR	2
+#define	LINUX_SO_TYPE		3
+#define	LINUX_SO_ERROR		4
+#define	LINUX_SO_DONTROUTE	5
+#define	LINUX_SO_BROADCAST	6
+#define	LINUX_SO_SNDBUF		7
+#define	LINUX_SO_RCVBUF		8
+#define	LINUX_SO_KEEPALIVE	9
+#define	LINUX_SO_OOBINLINE	10
+#define	LINUX_SO_NO_CHECK	11
+#define	LINUX_SO_PRIORITY	12
+#define	LINUX_SO_LINGER		13
+
+#define	LINUX_IP_TOS		1
+#define	LINUX_IP_TTL		2
+#define	LINUX_IP_HDRINCL	3
+#define	LINUX_IP_OPTIONS	4
+
+#define	LINUX_IP_MULTICAST_IF		32
+#define	LINUX_IP_MULTICAST_TTL		33
+#define	LINUX_IP_MULTICAST_LOOP		34
+#define	LINUX_IP_ADD_MEMBERSHIP		35
+#define	LINUX_IP_DROP_MEMBERSHIP	36
+
+struct linux_sockaddr {
+	u_short	sa_family;
+	char	sa_data[14];
 };
 
-struct linux_ifmap 
-{
-    unsigned long	mem_start;
-    unsigned long	mem_end;
-    unsigned short	base_addr; 
-    unsigned char	irq;
-    unsigned char	dma;
-    unsigned char	port;
+struct linux_ifmap {
+	u_long	mem_start;
+	u_long	mem_end;
+	u_short	base_addr; 
+	u_char	irq;
+	u_char	dma;
+	u_char	port;
 };
 
-struct linux_ifreq 
-{
-#define LINUX_IFHWADDRLEN     6
-#define LINUX_IFNAMSIZ        16
-    union
-    {
-	char    ifrn_name[LINUX_IFNAMSIZ];		/* if name, e.g. "en0" */	
-    } ifr_ifrn;
-        
-    union {
-	struct linux_sockaddr	ifru_addr;
-	struct linux_sockaddr	ifru_dstaddr;
-	struct linux_sockaddr	ifru_broadaddr;
-	struct linux_sockaddr	ifru_netmask;
-	struct linux_sockaddr	ifru_hwaddr;
-	short			ifru_flags;
-	int			ifru_metric;
-	int			ifru_mtu;
-	struct linux_ifmap	ifru_map;
-	char			ifru_slave[LINUX_IFNAMSIZ];	/* Just fits the size */
-	caddr_t			ifru_data;
-    } ifr_ifru;
+#define	LINUX_IFHWADDRLEN	6
+#define	LINUX_IFNAMSIZ		16
+
+struct linux_ifreq {
+	union {
+		char	ifrn_name[LINUX_IFNAMSIZ];
+	} ifr_ifrn;
+
+	union {
+		struct	linux_sockaddr ifru_addr;
+		struct	linux_sockaddr ifru_dstaddr;
+		struct	linux_sockaddr ifru_broadaddr;
+		struct	linux_sockaddr ifru_netmask;
+		struct	linux_sockaddr ifru_hwaddr;
+		short	ifru_flags;
+		int	ifru_metric;
+		int	ifru_mtu;
+		struct	linux_ifmap ifru_map;
+		char	ifru_slave[LINUX_IFNAMSIZ]; /* Just fits the size */
+		linux_caddr_t ifru_data;
+	} ifr_ifru;
 };
 
-#define ifr_name	ifr_ifrn.ifrn_name		/* interface name       */
-#define ifr_hwaddr	ifr_ifru.ifru_hwaddr		/* MAC address          */
-
-
-/* serial_struct values for TIOC[GS]SERIAL ioctls */
-#define LINUX_ASYNC_CLOSING_WAIT_INF  0
-#define LINUX_ASYNC_CLOSING_WAIT_NONE 65535
-
-#define LINUX_PORT_UNKNOWN    0
-#define LINUX_PORT_8250       1
-#define LINUX_PORT_16450      2
-#define LINUX_PORT_16550      3
-#define LINUX_PORT_16550A     4
-#define LINUX_PORT_CIRRUS     5
-#define LINUX_PORT_16650      6
-#define LINUX_PORT_MAX        6
-
-#define LINUX_ASYNC_HUP_NOTIFY		0x0001
-#define LINUX_ASYNC_FOURPORT  		0x0002
-#define LINUX_ASYNC_SAK       		0x0004
-#define LINUX_ASYNC_SPLIT_TERMIOS 	0x0008
-#define LINUX_ASYNC_SPD_MASK  		0x0030
-#define LINUX_ASYNC_SPD_HI    		0x0010
-#define LINUX_ASYNC_SPD_VHI   		0x0020
-#define LINUX_ASYNC_SPD_CUST  		0x0030
-#define LINUX_ASYNC_SKIP_TEST 		0x0040
-#define LINUX_ASYNC_AUTO_IRQ  		0x0080
-#define LINUX_ASYNC_SESSION_LOCKOUT 	0x0100
-#define LINUX_ASYNC_PGRP_LOCKOUT    	0x0200
-#define LINUX_ASYNC_CALLOUT_NOHUP   	0x0400
-#define LINUX_ASYNC_FLAGS     		0x0FFF
-
-/* cdrom */
-#define LINUX_CDROMPAUSE		0x5301 
-#define LINUX_CDROMRESUME		0x5302
-#define LINUX_CDROMPLAYMSF		0x5303
-#define LINUX_CDROMPLAYTRKIND		0x5304
-#define LINUX_CDROMREADTOCHDR		0x5305
-#define LINUX_CDROMREADTOCENTRY		0x5306
-#define LINUX_CDROMSTOP			0x5307
-#define LINUX_CDROMSTART		0x5308
-#define LINUX_CDROMEJECT		0x5309
-#define LINUX_CDROMVOLCTRL		0x530a
-#define LINUX_CDROMSUBCHNL		0x530b
-#define LINUX_CDROMREADMODE2		0x530c
-#define LINUX_CDROMREADMODE1		0x530d
-#define LINUX_CDROMREADAUDIO		0x530e
-#define LINUX_CDROMEJECT_SW		0x530f
-#define LINUX_CDROMMULTISESSION		0x5310
-#define LINUX_CDROM_GET_UPC		0x5311
-#define LINUX_CDROMRESET		0x5312
-#define LINUX_CDROMVOLREAD		0x5313
-#define LINUX_CDROMREADRAW		0x5314
-#define LINUX_CDROMREADCOOKED		0x5315
-#define LINUX_CDROMSEEK			0x5316
-#define LINUX_CDROMPLAYBLK		0x5317
-#define LINUX_CDROMREADALL		0x5318
-#define LINUX_CDROMCLOSETRAY		0x5319
-#define LINUX_CDROMLOADFROMSLOT		0x531a
-
-#define LINUX_CDROM_LBA                 0x01
-#define LINUX_CDROM_MSF                 0x02
-
-/* Scheduling policies */
-#define LINUX_SCHED_OTHER		0
-#define LINUX_SCHED_FIFO		1
-#define LINUX_SCHED_RR			2
+#define	ifr_name	ifr_ifrn.ifrn_name	/* interface name */
+#define	ifr_hwaddr	ifr_ifru.ifru_hwaddr	/* MAC address */
 
 #endif /* !_I386_LINUX_LINUX_H_ */