Index: trunk/minix/include/sys/asynchio.h
===================================================================
--- trunk/minix/include/sys/asynchio.h	(revision 9)
+++ 	(revision )
@@ -1,39 +1,0 @@
-/*	asynchio.h - Asynchronous I/O			Author: Kees J. Bot
- *								26 Jan 1995
- * This is just a fake async I/O library to be used for programs
- * written for Minix-vmd that must also run under standard Minix.
- * This limits the number of ugly #ifdefs somewhat.  The programs must
- * be restricted to performing just one service, of course.
- */
-#ifndef _SYS__ASYNCHIO_H
-#define _SYS__ASYNCHIO_H
-
-#ifndef _ANSI_H
-#include <ansi.h>
-#endif
-
-#include <sys/time.h>
-
-typedef struct {
-	char	state;
-	char	op;
-	char	fd;
-	char	req;
-	void	*data;
-	ssize_t	count;
-	int	errno;
-} asynchio_t;
-
-#define ASYN_NONBLOCK	0x01
-
-#define ASYN_INPROGRESS	EINPROGRESS
-
-void asyn_init(asynchio_t *_asyn);
-ssize_t asyn_read(asynchio_t *_asyn, int _fd, void *_buf, size_t _len);
-ssize_t asyn_write(asynchio_t *_asyn, int _fd, const void *_buf, size_t _len);
-int asyn_ioctl(asynchio_t *_asyn, int _fd, unsigned long _request, void *_data);
-int asyn_wait(asynchio_t *_asyn, int _flags, struct timeval *to);
-int asyn_synch(asynchio_t *_asyn, int _fd);
-int asyn_close(asynchio_t *_asyn, int _fd);
-
-#endif /* _SYS__ASYNCHIO_H */
Index: trunk/minix/include/sys/dir.h
===================================================================
--- trunk/minix/include/sys/dir.h	(revision 9)
+++ 	(revision )
@@ -1,19 +1,0 @@
-/* The <dir.h> header gives the layout of a directory. */
-
-#ifndef _DIR_H
-#define _DIR_H
-
-#include <sys/types.h>
-
-#define	DIRBLKSIZ	512	/* size of directory block */
-
-#ifndef DIRSIZ
-#define DIRSIZ	60
-#endif
-
-struct direct {
-  ino_t d_ino;
-  char d_name[DIRSIZ];
-};
-
-#endif /* _DIR_H */
Index: trunk/minix/include/sys/ioc_cmos.h
===================================================================
--- trunk/minix/include/sys/ioc_cmos.h	(revision 9)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/*	sys/ioc_cmos.h - CMOS ioctl() command codes.
- */
-
-#ifndef _S_I_CMOS_H
-#define _S_I_CMOS_H
-
-#include <minix/ioctl.h>
-
-#define CIOCGETTIME	_IOR('c', 1, u32_t)
-#define CIOCGETTIMEY2K	_IOR('c', 2, u32_t)
-#define CIOCSETTIME	_IOW('c', 3, u32_t)
-#define CIOCSETTIMEY2K	_IOW('c', 4, u32_t)
-
-#endif /* _S_I_CMOS_H */
-
Index: trunk/minix/include/sys/ioc_disk.h
===================================================================
--- trunk/minix/include/sys/ioc_disk.h	(revision 9)
+++ 	(revision )
@@ -1,17 +1,0 @@
-/*	sys/ioc_disk.h - Disk ioctl() command codes.	Author: Kees J. Bot
- *								23 Nov 2002
- *
- */
-
-#ifndef _S_I_DISK_H
-#define _S_I_DISK_H
-
-#include <minix/ioctl.h>
-
-#define DIOCSETP	_IOW('d', 3, struct partition)
-#define DIOCGETP	_IOR('d', 4, struct partition)
-#define DIOCEJECT	_IO ('d', 5)
-#define DIOCTIMEOUT	_IOW('d', 6, int)
-#define DIOCOPENCT	_IOR('d', 7, int)
-
-#endif /* _S_I_DISK_H */
Index: trunk/minix/include/sys/ioc_file.h
===================================================================
--- trunk/minix/include/sys/ioc_file.h	(revision 9)
+++ 	(revision )
@@ -1,11 +1,0 @@
-/*	sys/ioc_file.h - File ioctl() command codes.
- */
-
-#ifndef _SYS_IOC_FILE_H
-#define _SYS_IOC_FILE_H
-
-#include <minix/ioctl.h>
-
-#define FIONREAD	_IOR('f', 1, int)
-
-#endif /* _SYS_IOC_FILE_H */
Index: trunk/minix/include/sys/ioc_memory.h
===================================================================
--- trunk/minix/include/sys/ioc_memory.h	(revision 9)
+++ 	(revision )
@@ -1,16 +1,0 @@
-/*	sys/ioc_memory.h - Memory ioctl() command codes.
- *							Author: Kees J. Bot
- *								23 Nov 2002
- *
- */
-
-#ifndef _S_I_MEMORY_H
-#define _S_I_MEMORY_H
-
-#include <minix/ioctl.h>
-
-#define MIOCRAMSIZE	_IOW('m', 3, u32_t)
-#define MIOCMAP		_IOR('m', 4, struct mapreq)
-#define MIOCUNMAP	_IOR('m', 5, struct mapreq)
-
-#endif /* _S_I_MEMORY_H */
Index: trunk/minix/include/sys/ioc_scsi.h
===================================================================
--- trunk/minix/include/sys/ioc_scsi.h	(revision 9)
+++ 	(revision )
@@ -1,13 +1,0 @@
-/*	sys/ioc_scsi.h - SCSI ioctl() command codes.	Author: Kees J. Bot
- *								23 Nov 2002
- *
- */
-
-#ifndef _S_I_SCSI_H
-#define _S_I_SCSI_H
-
-#include <minix/ioctl.h>
-
-#define SCIOCCMD	_IOW('S', 1, struct scsicmd)
-
-#endif /* _S_I_SCSI_H */
Index: trunk/minix/include/sys/ioc_sound.h
===================================================================
--- trunk/minix/include/sys/ioc_sound.h	(revision 9)
+++ 	(revision )
@@ -1,30 +1,0 @@
-/*	sys/ioc_sound.h - Sound ioctl() command codes.	Author: Kees J. Bot
- *								23 Nov 2002
- *
- */
-
-#ifndef _S_I_SOUND_H
-#define _S_I_SOUND_H
-
-#include <minix/ioctl.h>
-
-/* Soundcard DSP ioctls. */
-#define	DSPIORATE	_IOR('s', 1, unsigned int)
-#define DSPIOSTEREO	_IOR('s', 2, unsigned int)
-#define DSPIOSIZE	_IOR('s', 3, unsigned int)
-#define DSPIOBITS	_IOR('s', 4, unsigned int)
-#define DSPIOSIGN	_IOR('s', 5, unsigned int)
-#define DSPIOMAX	_IOW('s', 6, unsigned int)
-#define DSPIORESET	_IO ('s', 7)
-
-/* Soundcard mixer ioctls. */
-#define MIXIOGETVOLUME		_IORW('s', 10, struct volume_level)
-#define MIXIOGETINPUTLEFT	_IORW('s', 11, struct inout_ctrl)
-#define MIXIOGETINPUTRIGHT	_IORW('s', 12, struct inout_ctrl)
-#define MIXIOGETOUTPUT		_IORW('s', 13, struct inout_ctrl)
-#define MIXIOSETVOLUME		_IORW('s', 20, struct volume_level)
-#define MIXIOSETINPUTLEFT	_IORW('s', 21, struct inout_ctrl)
-#define MIXIOSETINPUTRIGHT	_IORW('s', 22, struct inout_ctrl)
-#define MIXIOSETOUTPUT		_IORW('s', 23, struct inout_ctrl)
-
-#endif /* _S_I_SOUND_H */
Index: trunk/minix/include/sys/ioc_tape.h
===================================================================
--- trunk/minix/include/sys/ioc_tape.h	(revision 9)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/*	sys/ioc_tape.h - Magnetic Tape ioctl() command codes.
- *							Author: Kees J. Bot
- *								23 Nov 2002
- *
- */
-
-#ifndef _S_I_TAPE_H
-#define _S_I_TAPE_H
-
-#include <minix/ioctl.h>
-
-#define MTIOCTOP	_IOW('M', 1, struct mtop)
-#define MTIOCGET	_IOR('M', 2, struct mtget)
-
-#endif /* _S_I_TAPE_H */
Index: trunk/minix/include/sys/ioc_tty.h
===================================================================
--- trunk/minix/include/sys/ioc_tty.h	(revision 9)
+++ 	(revision )
@@ -1,38 +1,0 @@
-/*	sys/ioc_tty.h - Terminal ioctl() command codes.
- *							Author: Kees J. Bot
- *								23 Nov 2002
- *
- */
-
-#ifndef _S_I_TTY_H
-#define _S_I_TTY_H
-
-#include <minix/ioctl.h>
-
-/* Terminal ioctls. */
-#define TCGETS		_IOR('T',  8, struct termios) /* tcgetattr */
-#define TCSETS		_IOW('T',  9, struct termios) /* tcsetattr, TCSANOW */
-#define TCSETSW		_IOW('T', 10, struct termios) /* tcsetattr, TCSADRAIN */
-#define TCSETSF		_IOW('T', 11, struct termios) /* tcsetattr, TCSAFLUSH */
-#define TCSBRK		_IOW('T', 12, int)	      /* tcsendbreak */
-#define TCDRAIN		_IO ('T', 13)		      /* tcdrain */
-#define TCFLOW		_IOW('T', 14, int)	      /* tcflow */
-#define TCFLSH		_IOW('T', 15, int)	      /* tcflush */
-#define	TIOCGWINSZ	_IOR('T', 16, struct winsize)
-#define	TIOCSWINSZ	_IOW('T', 17, struct winsize)
-#define	TIOCGPGRP	_IOW('T', 18, int)
-#define	TIOCSPGRP	_IOW('T', 19, int)
-#define TIOCSFON	_IOW('T', 20, u8_t [8192])
-
-/* Legacy <sgtty.h> */
-#define TIOCGETP	_IOR('t',  1, struct sgttyb)
-#define TIOCSETP	_IOW('t',  2, struct sgttyb)
-#define TIOCGETC	_IOR('t',  3, struct tchars)
-#define TIOCSETC	_IOW('t',  4, struct tchars)
-
-/* Keyboard ioctls. */
-#define KIOCBELL        _IOW('k', 1, struct kio_bell)
-#define KIOCSLEDS       _IOW('k', 2, struct kio_leds)
-#define KIOCSMAP	_IOW('k', 3, keymap_t)
-
-#endif /* _S_I_TTY_H */
Index: trunk/minix/include/sys/ioctl.h
===================================================================
--- trunk/minix/include/sys/ioctl.h	(revision 9)
+++ 	(revision )
@@ -1,26 +1,0 @@
-/*	sys/ioctl.h - All ioctl() command codes.	Author: Kees J. Bot
- *								23 Nov 2002
- *
- * This header file includes all other ioctl command code headers.
- */
-
-#ifndef _S_IOCTL_H
-#define _S_IOCTL_H
-
-/* A driver that uses ioctls claims a character for its series of commands.
- * For instance:  #define TCGETS  _IOR('T',  8, struct termios)
- * This is a terminal ioctl that uses the character 'T'.  The character(s)
- * used in each header file are shown in the comment following.
- */
-
-#include <sys/ioc_tty.h>	/* 'T' 't' 'k'		*/
-#include <net/ioctl.h>		/* 'n'			*/
-#include <sys/ioc_disk.h>	/* 'd'			*/
-#include <sys/ioc_file.h>	/* 'f'			*/
-#include <sys/ioc_memory.h>	/* 'm'			*/
-#include <sys/ioc_cmos.h>	/* 'c'			*/
-#include <sys/ioc_tape.h>	/* 'M'			*/
-#include <sys/ioc_scsi.h>	/* 'S'			*/
-#include <sys/ioc_sound.h>	/* 's'			*/
-
-#endif /* _S_IOCTL_H */
Index: trunk/minix/include/sys/kbdio.h
===================================================================
--- trunk/minix/include/sys/kbdio.h	(revision 9)
+++ 	(revision )
@@ -1,22 +1,0 @@
-#ifndef _SYS__KBDIO_H
-#define _SYS__KBDIO_H
-
-#include <sys/time.h>
-
-typedef struct kio_bell
-{
-	unsigned kb_pitch;		/* Bell frequency in HZ */
-	unsigned long kb_volume;	/* Volume in micro volts */
-	struct timeval kb_duration;
-} kio_bell_t;
-
-typedef struct kio_leds
-{
-	unsigned kl_bits;
-} kio_leds_t;
-
-#define KBD_LEDS_NUM	0x1
-#define KBD_LEDS_CAPS	0x2
-#define KBD_LEDS_SCROLL	0x4
-
-#endif /* _SYS__KBDIO_H */
Index: trunk/minix/include/sys/mtio.h
===================================================================
--- trunk/minix/include/sys/mtio.h	(revision 9)
+++ 	(revision )
@@ -1,45 +1,0 @@
-/* <sys/mtio.h> magnetic tape commands			Author: Kees J. Bot
- */
-
-#ifndef _SYS__MTIO_H
-#define _SYS__MTIO_H
-
-/* Tape operations: ioctl(fd, MTIOCTOP, &struct mtop) */
-
-struct mtop {
-	short	mt_op;		/* Operation (MTWEOF, etc.) */
-	int	mt_count;	/* Repeat count. */
-};
-
-#define MTWEOF	 0	/* Write End-Of-File Marker */
-#define MTFSF	 1	/* Forward Space File mark */
-#define MTBSF	 2	/* Backward Space File mark */
-#define MTFSR	 3	/* Forward Space Record */
-#define MTBSR	 4	/* Backward Space Record */
-#define MTREW	 5	/* Rewind tape */
-#define MTOFFL	 6	/* Rewind and take Offline */
-#define MTNOP	 7	/* No-Operation, set status only */
-#define MTRETEN	 8	/* Retension (completely wind and rewind) */
-#define MTERASE	 9	/* Erase the tape and rewind */
-#define MTEOM	10	/* Position at End-Of-Media */
-#define MTMODE	11	/* Select tape density */
-#define MTBLKZ	12	/* Select tape block size */
-
-/* Tape status: ioctl(fd, MTIOCGET, &struct mtget) */
-
-struct mtget {
-	short	mt_type;	/* Type of tape device. */
-
-	/* Device dependent "registers". */
-	short	mt_dsreg;	/* Drive status register. */
-	short	mt_erreg;	/* Error register. */
-	short	dummy;		/* (alignment) */
-
-	/* Misc info. */
-	off_t	mt_resid;	/* Residual count. */
-	off_t	mt_fileno;	/* Current File Number. */
-	off_t	mt_blkno;	/* Current Block Number within file. */
-	off_t	mt_blksize;	/* Current block size. */
-};
-
-#endif /* _SYS__MTIO_H */
Index: trunk/minix/include/sys/param.h
===================================================================
--- trunk/minix/include/sys/param.h	(revision 9)
+++ 	(revision )
@@ -1,5 +1,0 @@
-/*
-sys/param.h
-*/
-
-#define MAXHOSTNAMELEN  256	/* max hostname size */
Index: trunk/minix/include/sys/ptrace.h
===================================================================
--- trunk/minix/include/sys/ptrace.h	(revision 9)
+++ 	(revision )
@@ -1,27 +1,0 @@
-/* <sys/ptrace.h>
- * definitions for ptrace(2) 
- */
-
-#ifndef _PTRACE_H
-#define _PTRACE_H
-
-#define T_STOP	       -1	/* stop the process */
-#define T_OK		0	/* enable tracing by parent for this process */
-#define T_GETINS	1	/* return value from instruction space */
-#define T_GETDATA	2	/* return value from data space */
-#define T_GETUSER	3	/* return value from user process table */
-#define	T_SETINS	4	/* set value from instruction space */
-#define T_SETDATA	5	/* set value from data space */
-#define T_SETUSER	6	/* set value in user process table */
-#define T_RESUME	7	/* resume execution */
-#define T_EXIT		8	/* exit */
-#define T_STEP		9	/* set trace bit */
-
-/* Function Prototypes. */
-#ifndef _ANSI_H
-#include <ansi.h>
-#endif
-
-_PROTOTYPE( long ptrace, (int _req, pid_t _pid, long _addr, long _data) );
-
-#endif /* _PTRACE_H */
Index: trunk/minix/include/sys/resource.h
===================================================================
--- trunk/minix/include/sys/resource.h	(revision 9)
+++ 	(revision )
@@ -1,21 +1,0 @@
-#ifndef _SYS_RESOURCE_H
-#define _SYS_RESOURCE_H
-
-/* Priority range for the get/setpriority() interface.
- * It isn't a mapping on the internal minix scheduling
- * priority.
- */
-#define PRIO_MIN	-20
-#define PRIO_MAX	 20
-
-/* Magic, invalid priority to stop the process. */
-#define PRIO_STOP	 76
-
-#define PRIO_PROCESS	0
-#define PRIO_PGRP	1
-#define PRIO_USER	2
-
-int getpriority(int, int);
-int setpriority(int, int, int);
-
-#endif
Index: trunk/minix/include/sys/select.h
===================================================================
--- trunk/minix/include/sys/select.h	(revision 9)
+++ 	(revision )
@@ -1,50 +1,0 @@
-#ifndef _SYS_SELECT_H
-#define _SYS_SELECT_H 1
-
-#ifndef _POSIX_SOURCE
-#define _POSIX_SOURCE 1
-#endif
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <limits.h>
-#include <string.h>
-
-/* Use this datatype as basic storage unit in fd_set */
-typedef u32_t fd_mask;	
-
-/* This many bits fit in an fd_set word. */
-#define _FDSETBITSPERWORD	(sizeof(fd_mask)*8)
-
-/* Bit manipulation macros */
-#define _FD_BITMASK(b)	(1L << ((b) % _FDSETBITSPERWORD))
-#define _FD_BITWORD(b)	((b)/_FDSETBITSPERWORD)
-
-/* Default FD_SETSIZE is OPEN_MAX. */
-#ifndef FD_SETSIZE
-#define FD_SETSIZE		OPEN_MAX
-#endif
-
-/* We want to store FD_SETSIZE bits. */
-#define _FDSETWORDS	((FD_SETSIZE+_FDSETBITSPERWORD-1)/_FDSETBITSPERWORD)
-
-typedef struct {
-	fd_mask	fds_bits[_FDSETWORDS];
-} fd_set;
-
-_PROTOTYPE( int select, (int nfds, fd_set *readfds, fd_set *writefds, fd_set *errorfds, struct timeval *timeout) );
-
-#define FD_ZERO(s) do { int _i; for(_i = 0; _i < _FDSETWORDS; _i++) { (s)->fds_bits[_i] = 0; } } while(0)
-#define FD_SET(f, s) do { (s)->fds_bits[_FD_BITWORD(f)] |= _FD_BITMASK(f); } while(0)
-#define FD_CLR(f, s) do { (s)->fds_bits[_FD_BITWORD(f)] &= ~(_FD_BITMASK(f)); } while(0)
-#define FD_ISSET(f, s) ((s)->fds_bits[_FD_BITWORD(f)] & _FD_BITMASK(f))
-
-/* possible select() operation types; read, write, errors */
-/* (FS/driver internal use only) */
-#define SEL_RD		(1 << 0)
-#define SEL_WR		(1 << 1)
-#define SEL_ERR		(1 << 2)
-#define SEL_NOTIFY	(1 << 3) /* not a real select operation */
-
-#endif /* _SYS_SELECT_H */
-
Index: trunk/minix/include/sys/sigcontext.h
===================================================================
--- trunk/minix/include/sys/sigcontext.h	(revision 9)
+++ 	(revision )
@@ -1,146 +1,0 @@
-#ifndef _SIGCONTEXT_H
-#define _SIGCONTEXT_H
-
-/* The sigcontext structure is used by the sigreturn(2) system call.
- * sigreturn() is seldom called by user programs, but it is used internally
- * by the signal catching mechanism.
- */
-
-#ifndef _ANSI_H
-#include <ansi.h>
-#endif
-
-#ifndef _MINIX_SYS_CONFIG_H
-#include <minix/sys_config.h>
-#endif
-
-#if !defined(_MINIX_CHIP)
-#include "error, configuration is not known"
-#endif
-
-/* The following structure should match the stackframe_s structure used
- * by the kernel's context switching code.  Floating point registers should
- * be added in a different struct.
- */
-#if (_MINIX_CHIP == _CHIP_INTEL)
-struct sigregs {  
-#if _WORD_SIZE == 4
-  short sr_gs;
-  short sr_fs;
-#endif /* _WORD_SIZE == 4 */
-  short sr_es;
-  short sr_ds;
-  int sr_di;
-  int sr_si;
-  int sr_bp;
-  int sr_st;			/* stack top -- used in kernel */
-  int sr_bx;
-  int sr_dx;
-  int sr_cx;
-  int sr_retreg;
-  int sr_retadr;		/* return address to caller of save -- used
-  				 * in kernel */
-  int sr_pc;
-  int sr_cs;
-  int sr_psw;
-  int sr_sp;
-  int sr_ss;
-};
-
-struct sigframe {		/* stack frame created for signalled process */
-  _PROTOTYPE( void (*sf_retadr), (void) );
-  int sf_signo;
-  int sf_code;
-  struct sigcontext *sf_scp;
-  int sf_fp;
-  _PROTOTYPE( void (*sf_retadr2), (void) );
-  struct sigcontext *sf_scpcopy;
-};
-
-#else
-#if (_MINIX_CHIP == _CHIP_M68000)
-struct sigregs {  
-  long sr_retreg;			/* d0 */
-  long sr_d1;
-  long sr_d2;
-  long sr_d3;
-  long sr_d4;
-  long sr_d5;
-  long sr_d6;
-  long sr_d7;
-  long sr_a0;
-  long sr_a1;
-  long sr_a2;
-  long sr_a3;
-  long sr_a4;
-  long sr_a5;
-  long sr_a6;
-  long sr_sp;			/* also known as a7 */
-  long sr_pc;
-  short sr_psw;
-  short sr_dummy;		/* make size multiple of 4 for system.c */
-};
-#else
-#include "error, _MINIX_CHIP is not supported"
-#endif
-#endif /* _MINIX_CHIP == _CHIP_INTEL */
-
-struct sigcontext {
-  int sc_flags;			/* sigstack state to restore */
-  long sc_mask;			/* signal mask to restore */
-  struct sigregs sc_regs;	/* register set to restore */
-};
-
-#if (_MINIX_CHIP == _CHIP_INTEL)
-#if _WORD_SIZE == 4
-#define sc_gs sc_regs.sr_gs
-#define sc_fs sc_regs.sr_fs
-#endif /* _WORD_SIZE == 4 */
-#define sc_es sc_regs.sr_es
-#define sc_ds sc_regs.sr_ds
-#define sc_di sc_regs.sr_di
-#define sc_si sc_regs.sr_si 
-#define sc_fp sc_regs.sr_bp
-#define sc_st sc_regs.sr_st		/* stack top -- used in kernel */
-#define sc_bx sc_regs.sr_bx
-#define sc_dx sc_regs.sr_dx
-#define sc_cx sc_regs.sr_cx
-#define sc_retreg sc_regs.sr_retreg
-#define sc_retadr sc_regs.sr_retadr	/* return address to caller of 
-					save -- used in kernel */
-#define sc_pc sc_regs.sr_pc
-#define sc_cs sc_regs.sr_cs
-#define sc_psw sc_regs.sr_psw
-#define sc_sp sc_regs.sr_sp
-#define sc_ss sc_regs.sr_ss
-#endif /* _MINIX_CHIP == _CHIP_INTEL */
-
-#if (_MINIX_CHIP == M68000)
-#define sc_retreg sc_regs.sr_retreg
-#define sc_d1 sc_regs.sr_d1
-#define sc_d2 sc_regs.sr_d2
-#define sc_d3 sc_regs.sr_d3
-#define sc_d4 sc_regs.sr_d4
-#define sc_d5 sc_regs.sr_d5
-#define sc_d6 sc_regs.sr_d6
-#define sc_d7 sc_regs.sr_d7
-#define sc_a0 sc_regs.sr_a0
-#define sc_a1 sc_regs.sr_a1
-#define sc_a2 sc_regs.sr_a2
-#define sc_a3 sc_regs.sr_a3
-#define sc_a4 sc_regs.sr_a4
-#define sc_a5 sc_regs.sr_a5
-#define sc_fp sc_regs.sr_a6
-#define sc_sp sc_regs.sr_sp
-#define sc_pc sc_regs.sr_pc
-#define sc_psw sc_regs.sr_psw
-#endif /* _MINIX_CHIP == M68000 */
-
-/* Values for sc_flags.  Must agree with <minix/jmp_buf.h>. */
-#define SC_SIGCONTEXT	2	/* nonzero when signal context is included */
-#define SC_NOREGLOCALS	4	/* nonzero when registers are not to be
-					saved and restored */
-
-_PROTOTYPE( int sigreturn, (struct sigcontext *_scp)			);
-
-#endif /* _SIGCONTEXT_H */
Index: trunk/minix/include/sys/socket.h
===================================================================
--- trunk/minix/include/sys/socket.h	(revision 9)
+++ 	(revision )
@@ -1,77 +1,0 @@
-/*
-sys/socket.h
-*/
-
-#ifndef SYS_SOCKET_H
-#define SYS_SOCKET_H
-
-/* Can we include <stdint.h> here or do we need an additional header that is
- * safe to include?
- */
-#include <stdint.h>
-
-/* Open Group Base Specifications Issue 6 (not complete) */
-#include <net/gen/socket.h>
-
-#define SOCK_STREAM	1
-#define SOCK_DGRAM	2
-#define SOCK_RAW	3
-#define SOCK_RDM	4
-#define SOCK_SEQPACKET	5
-
-#define SOL_SOCKET	0xFFFF
-
-#define SO_DEBUG	0x0001
-#define SO_REUSEADDR	0x0004
-#define SO_KEEPALIVE	0x0008
-
-#define SO_SNDBUF	0x1001	/* send buffer size */
-#define SO_RCVBUF	0x1002	/* receive buffer size */
-#define SO_ERROR	0x1007	/* get and clear error status */
-
-/* The how argument to shutdown */
-#define SHUT_RD		0	/* No further reads */
-#define SHUT_WR		1	/* No further writes */
-#define SHUT_RDWR	2	/* No further reads and writes */
-
-#ifndef _SA_FAMILY_T
-#define _SA_FAMILY_T
-typedef uint8_t		sa_family_t;
-#endif /* _SA_FAMILY_T */
-
-typedef int32_t socklen_t;
-
-struct sockaddr
-{
-	sa_family_t	sa_family;
-	char		sa_data[8];	/* Big enough for sockaddr_in */
-};
-
-_PROTOTYPE( int accept, (int _socket,
-				struct sockaddr *_RESTRICT _address,
-				socklen_t *_RESTRICT _address_len)	);
-_PROTOTYPE( int bind, (int _socket, const struct sockaddr *_address,
-						socklen_t _address_len)	);
-_PROTOTYPE( int connect, (int _socket, const struct sockaddr *_address,
-						socklen_t _address_len)	);
-_PROTOTYPE( int getpeername, (int _socket,
-				struct sockaddr *_RESTRICT _address,
-				socklen_t *_RESTRICT _address_len)	);
-_PROTOTYPE( int getsockname, (int _socket,
-				struct sockaddr *_RESTRICT _address,
-				socklen_t *_RESTRICT _address_len)	);
-_PROTOTYPE( int setsockopt,(int _socket, int _level, int _option_name,
-		const void *_option_value, socklen_t _option_len)	);
-_PROTOTYPE( int getsockopt, (int _socket, int _level, int _option_name,
-        void *_RESTRICT _option_value, socklen_t *_RESTRICT _option_len));
-_PROTOTYPE( int listen, (int _socket, int _backlog)			);
-_PROTOTYPE( ssize_t recvfrom, (int _socket, void *_RESTRICT _buffer,
-	size_t _length, int _flags, struct sockaddr *_RESTRICT _address,
-				socklen_t *_RESTRICT _address_len)	);
-_PROTOTYPE( ssize_t sendto, (int _socket, const void *_message,
-	size_t _length, int _flags, const struct sockaddr *_dest_addr,
-						socklen_t _dest_len)	);
-_PROTOTYPE( int shutdown, (int _socket, int _how)			);
-_PROTOTYPE( int socket, (int _domain, int _type, int _protocol)		);
-
-#endif /* SYS_SOCKET_H */
Index: trunk/minix/include/sys/stat.h
===================================================================
--- trunk/minix/include/sys/stat.h	(revision 9)
+++ 	(revision )
@@ -1,80 +1,0 @@
-/* The <sys/stat.h> header defines a struct that is used in the stat() and
- * fstat functions.  The information in this struct comes from the i-node of
- * some file.  These calls are the only approved way to inspect i-nodes.
- */
-
-#ifndef _STAT_H
-#define _STAT_H
-
-#ifndef _TYPES_H
-#include <sys/types.h>
-#endif
-
-struct stat {
-  dev_t st_dev;			/* major/minor device number */
-  ino_t st_ino;			/* i-node number */
-  mode_t st_mode;		/* file mode, protection bits, etc. */
-  short int st_nlink;		/* # links; TEMPORARY HACK: should be nlink_t*/
-  uid_t st_uid;			/* uid of the file's owner */
-  short int st_gid;		/* gid; TEMPORARY HACK: should be gid_t */
-  dev_t st_rdev;
-  off_t st_size;		/* file size */
-  time_t st_atime;		/* time of last access */
-  time_t st_mtime;		/* time of last data modification */
-  time_t st_ctime;		/* time of last file status change */
-};
-
-/* Traditional mask definitions for st_mode. */
-#define S_IFMT  0170000	/* type of file */
-#define S_IFLNK 0120000	/* symbolic link */
-#define S_IFREG 0100000	/* regular */
-#define S_IFBLK 0060000	/* block special */
-#define S_IFDIR 0040000	/* directory */
-#define S_IFCHR 0020000	/* character special */
-#define S_IFIFO 0010000	/* this is a FIFO */
-#define S_ISUID 0004000	/* set user id on execution */
-#define S_ISGID 0002000	/* set group id on execution */
-				/* next is reserved for future use */
-#define S_ISVTX   01000		/* save swapped text even after use */
-
-/* POSIX masks for st_mode. */
-#define S_IRWXU   00700		/* owner:  rwx------ */
-#define S_IRUSR   00400		/* owner:  r-------- */
-#define S_IWUSR   00200		/* owner:  -w------- */
-#define S_IXUSR   00100		/* owner:  --x------ */
-
-#define S_IRWXG   00070		/* group:  ---rwx--- */
-#define S_IRGRP   00040		/* group:  ---r----- */
-#define S_IWGRP   00020		/* group:  ----w---- */
-#define S_IXGRP   00010		/* group:  -----x--- */
-
-#define S_IRWXO   00007		/* others: ------rwx */
-#define S_IROTH   00004		/* others: ------r-- */ 
-#define S_IWOTH   00002		/* others: -------w- */
-#define S_IXOTH   00001		/* others: --------x */
-
-/* Synonyms for above. */
-#define S_IEXEC		S_IXUSR
-#define S_IWRITE	S_IWUSR
-#define S_IREAD		S_IRUSR
-
-/* The following macros test st_mode (from POSIX Sec. 5.6.1.1). */
-#define S_ISREG(m)	(((m) & S_IFMT) == S_IFREG)	/* is a reg file */
-#define S_ISDIR(m)	(((m) & S_IFMT) == S_IFDIR)	/* is a directory */
-#define S_ISCHR(m)	(((m) & S_IFMT) == S_IFCHR)	/* is a char spec */
-#define S_ISBLK(m)	(((m) & S_IFMT) == S_IFBLK)	/* is a block spec */
-#define S_ISLNK(m)	(((m) & S_IFMT) == S_IFLNK)	/* is a symlink */
-#define S_ISFIFO(m)	(((m) & S_IFMT) == S_IFIFO)	/* is a pipe/FIFO */
-
-/* Function Prototypes. */
-_PROTOTYPE( int chmod, (const char *_path, _mnx_Mode_t _mode)		);
-_PROTOTYPE( int fstat, (int _fildes, struct stat *_buf)			);
-_PROTOTYPE( int mkdir, (const char *_path, _mnx_Mode_t _mode)		);
-_PROTOTYPE( int mkfifo, (const char *_path, _mnx_Mode_t _mode)		);
-_PROTOTYPE( int stat, (const char *_path, struct stat *_buf)		);
-_PROTOTYPE( mode_t umask, (_mnx_Mode_t _cmask)				);
-
-/* Open Group Base Specifications Issue 6 (not complete) */
-_PROTOTYPE( int lstat, (const char *_path, struct stat *_buf)		);
-
-#endif /* _STAT_H */
Index: trunk/minix/include/sys/statfs.h
===================================================================
--- trunk/minix/include/sys/statfs.h	(revision 9)
+++ 	(revision )
@@ -1,16 +1,0 @@
-/* Data for fstatfs() call. */
-
-#ifndef _STATFS_H
-#define _STATFS_H
-
-#ifndef _TYPES_H
-#include <sys/types.h>
-#endif
-
-struct statfs {
-  off_t f_bsize;		/* file system block size */
-};
-
-_PROTOTYPE( int fstatfs, (int fd, struct statfs *st)		);
-
-#endif /* _STATFS_H */
Index: trunk/minix/include/sys/svrctl.h
===================================================================
--- trunk/minix/include/sys/svrctl.h	(revision 9)
+++ 	(revision )
@@ -1,71 +1,0 @@
-/*
-sys/svrctl.h
-
-Created:	Feb 15, 1994 by Philip Homburg <philip@cs.vu.nl>
-*/
-
-#ifndef _SYS__SVRCTL_H
-#define _SYS__SVRCTL_H
-
-#ifndef _TYPES_H
-#include <sys/types.h>
-#endif
-
-/* Server control commands have the same encoding as the commands for ioctls. */
-#include <minix/ioctl.h>
-
-/* MM controls. */
-#define MMSIGNON	_IO ('M',  4)
-#define MMSWAPON	_IOW('M',  5, struct mmswapon)
-#define MMSWAPOFF	_IO ('M',  6)
-#define MMGETPARAM	_IOW('M',  5, struct sysgetenv)
-#define MMSETPARAM	_IOR('M',  7, struct sysgetenv)
-
-/* FS controls. */
-#define FSSIGNON	_IOW('F',  2, struct fssignon)
-#define FSDEVMAP	_IORW('F', 5, struct fsdevmap)
-#define FSDEVUNMAP	_IOW('F',  6, struct fsdevunmap)
-
-/* Kernel controls. */
-#define SYSSENDMASK	_IO ('S',  4)
-#define SYSSIGNON	_IOR('S',  2, struct systaskinfo)
-#define SYSGETENV	_IOW('S',  1, struct sysgetenv)
-
-struct mmswapon {
-	u32_t		offset;		/* Starting offset within file. */
-	u32_t		size;		/* Size of swap area. */
-	char		file[128];	/* Name of swap file/device. */
-};
-
-struct svrqueryparam {
-	char		*param;		/* Names of parameters to query. */
-	size_t		psize;		/* Length of param[]. */
-	char		*value;		/* To return values. */
-	size_t		vsize;
-};
-
-/* A proper system call must be created later. */
-#include <minix/dmap.h>
-struct fssignon {
-	dev_t		dev;		/* Device to manage. */
-	enum dev_style	style;		/* Management style. */
-};
-
-struct fsdevunmap {
-	dev_t		dev;		/* Device to unmap. */
-};
-
-struct systaskinfo {
-	int		proc_nr;	/* Process number of caller. */
-};
-
-struct sysgetenv {
-	char		*key;		/* Name requested. */
-	size_t		keylen;		/* Length of name including \0. */
-	char		*val;		/* Buffer for returned data. */
-	size_t		vallen;		/* Size of return data buffer. */
-};
-
-_PROTOTYPE( int svrctl, (int _request, void *_data)			);
-
-#endif /* _SYS__SVRCTL_H */
Index: trunk/minix/include/sys/time.h
===================================================================
--- trunk/minix/include/sys/time.h	(revision 9)
+++ 	(revision )
@@ -1,22 +1,0 @@
-/*
-sys/time.h
-*/
-
-#ifndef _SYS__TIME_H
-#define _SYS__TIME_H
-
-#include <ansi.h>
-
-/* Open Group Base Specifications Issue 6 (not complete) */
-struct timeval
-{
-	long /*time_t*/ tv_sec;
-	long /*useconds_t*/ tv_usec;
-};
-
-int gettimeofday(struct timeval *_RESTRICT tp, void *_RESTRICT tzp);
-
-/* Compatibility with other Unix systems */
-int settimeofday(const struct timeval *tp, const void *tzp);
-
-#endif /* _SYS__TIME_H */
Index: trunk/minix/include/sys/times.h
===================================================================
--- trunk/minix/include/sys/times.h	(revision 9)
+++ 	(revision )
@@ -1,25 +1,0 @@
-/* The <times.h> header is for time times() system call. */
-
-#ifndef _TIMES_H
-#define _TIMES_H
-
-#ifndef _CLOCK_T
-#define _CLOCK_T
-typedef long clock_t;		/* unit for system accounting */
-#endif
-
-struct tms {
-  clock_t tms_utime;
-  clock_t tms_stime;
-  clock_t tms_cutime;
-  clock_t tms_cstime;
-};
-
-/* Function Prototypes. */
-#ifndef _ANSI_H
-#include <ansi.h>
-#endif
-
-_PROTOTYPE( clock_t times, (struct tms *_buffer)			);
-
-#endif /* _TIMES_H */
Index: trunk/minix/include/sys/types.h
===================================================================
--- trunk/minix/include/sys/types.h	(revision 9)
+++ 	(revision )
@@ -1,146 +1,0 @@
-/* The <sys/types.h> header contains important data type definitions.
- * It is considered good programming practice to use these definitions, 
- * instead of the underlying base type.  By convention, all type names end 
- * with _t.
- */
-
-#ifndef _TYPES_H
-#define _TYPES_H
-
-#ifndef _ANSI_H
-#include <ansi.h>
-#endif
-
-/* The type size_t holds all results of the sizeof operator.  At first glance,
- * it seems obvious that it should be an unsigned int, but this is not always 
- * the case. For example, MINIX-ST (68000) has 32-bit pointers and 16-bit
- * integers. When one asks for the size of a 70K struct or array, the result 
- * requires 17 bits to express, so size_t must be a long type.  The type 
- * ssize_t is the signed version of size_t.
- */
-#ifndef _SIZE_T
-#define _SIZE_T
-typedef unsigned int size_t;
-#endif
-
-#ifndef _SSIZE_T
-#define _SSIZE_T
-typedef int ssize_t;
-#endif
-
-#ifndef _TIME_T
-#define _TIME_T
-typedef long time_t;		   /* time in sec since 1 Jan 1970 0000 GMT */
-#endif
-
-#ifndef _CLOCK_T
-#define _CLOCK_T
-typedef long clock_t;		   /* unit for system accounting */
-#endif
-
-#ifndef _SIGSET_T
-#define _SIGSET_T
-typedef unsigned long sigset_t;
-#endif
-
-/* Open Group Base Specifications Issue 6 (not complete) */
-typedef long useconds_t;	/* Time in microseconds */
-
-/* Types used in disk, inode, etc. data structures. */
-typedef short          dev_t;	   /* holds (major|minor) device pair */
-typedef char           gid_t;	   /* group id */
-typedef unsigned long  ino_t; 	   /* i-node number (V3 filesystem) */
-typedef unsigned short mode_t;	   /* file type and permissions bits */
-typedef short        nlink_t;	   /* number of links to a file */
-typedef unsigned long  off_t;	   /* offset within a file */
-typedef int            pid_t;	   /* process id (must be signed) */
-typedef short          uid_t;	   /* user id */
-typedef unsigned long zone_t;	   /* zone number */
-typedef unsigned long block_t;	   /* block number */
-typedef unsigned long  bit_t;	   /* bit number in a bit map */
-typedef unsigned short zone1_t;	   /* zone number for V1 file systems */
-typedef unsigned short bitchunk_t; /* collection of bits in a bitmap */
-
-typedef unsigned char   u8_t;	   /* 8 bit type */
-typedef unsigned short u16_t;	   /* 16 bit type */
-typedef unsigned long  u32_t;	   /* 32 bit type */
-
-typedef char            i8_t;      /* 8 bit signed type */
-typedef short          i16_t;      /* 16 bit signed type */
-typedef long           i32_t;      /* 32 bit signed type */
-
-typedef struct { u32_t _[2]; } u64_t;
-
-/* The following types are needed because MINIX uses K&R style function
- * definitions (for maximum portability).  When a short, such as dev_t, is
- * passed to a function with a K&R definition, the compiler automatically
- * promotes it to an int.  The prototype must contain an int as the parameter,
- * not a short, because an int is what an old-style function definition
- * expects.  Thus using dev_t in a prototype would be incorrect.  It would be
- * sufficient to just use int instead of dev_t in the prototypes, but Dev_t
- * is clearer.
- */
-typedef int            Dev_t;
-typedef int 	  _mnx_Gid_t;
-typedef int 	     Nlink_t;
-typedef int 	  _mnx_Uid_t;
-typedef int             U8_t;
-typedef unsigned long  U32_t;
-typedef int             I8_t;
-typedef int            I16_t;
-typedef long           I32_t;
-
-/* ANSI C makes writing down the promotion of unsigned types very messy.  When
- * sizeof(short) == sizeof(int), there is no promotion, so the type stays
- * unsigned.  When the compiler is not ANSI, there is usually no loss of
- * unsignedness, and there are usually no prototypes so the promoted type
- * doesn't matter.  The use of types like Ino_t is an attempt to use ints
- * (which are not promoted) while providing information to the reader.
- */
-
-typedef unsigned long  Ino_t;
-
-#if _EM_WSIZE == 2
-/*typedef unsigned int      Ino_t; Ino_t is now 32 bits */
-typedef unsigned int    Zone1_t;
-typedef unsigned int Bitchunk_t;
-typedef unsigned int      U16_t;
-typedef unsigned int  _mnx_Mode_t;
-
-#else /* _EM_WSIZE == 4, or _EM_WSIZE undefined */
-/*typedef int	          Ino_t; Ino_t is now 32 bits */
-typedef int 	        Zone1_t;
-typedef int	     Bitchunk_t;
-typedef int	          U16_t;
-typedef int         _mnx_Mode_t;
-
-#endif /* _EM_WSIZE == 2, etc */
- 
-/* Signal handler type, e.g. SIG_IGN */
-typedef void _PROTOTYPE( (*sighandler_t), (int) );
-
-/* Compatibility with other systems */
-typedef unsigned char	u_char;
-typedef unsigned short	u_short;
-typedef unsigned int	u_int;
-typedef unsigned long	u_long;
-typedef char		*caddr_t;
-
-/* Devices. */   
-#define MAJOR              8    /* major device = (dev>>MAJOR) & 0377 */
-#define MINOR              0    /* minor device = (dev>>MINOR) & 0377 */
-
-#ifndef minor
-#define minor(dev)      (((dev) >> MINOR) & 0xff)
-#endif
-
-#ifndef major
-#define major(dev)      (((dev) >> MAJOR) & 0xff)
-#endif
-
-#ifndef makedev
-#define makedev(major, minor)   \
-                        ((dev_t) (((major) << MAJOR) | ((minor) << MINOR)))
-#endif
-
-#endif /* _TYPES_H */
Index: trunk/minix/include/sys/uio.h
===================================================================
--- trunk/minix/include/sys/uio.h	(revision 9)
+++ 	(revision )
@@ -1,23 +1,0 @@
-/*
-sys/uio.h
-
-definitions for vector I/O operations
-*/
-
-#ifndef _SYS_UIO_H
-#define _SYS_UIO_H
-
-/* Open Group Base Specifications Issue 6 (not complete) */
-
-struct iovec
-{
-	void	*iov_base;
-	size_t	iov_len;
-};
-
-_PROTOTYPE(ssize_t readv, (int _fildes, const struct iovec *_iov,
-							int _iovcnt)	);
-_PROTOTYPE(ssize_t writev, (int _fildes, const struct iovec *_iov,
-							int iovcnt)	);
-
-#endif /* _SYS_UIO_H */
Index: trunk/minix/include/sys/un.h
===================================================================
--- trunk/minix/include/sys/un.h	(revision 9)
+++ 	(revision )
@@ -1,19 +1,0 @@
-/*
-sys/un.h
-*/
-
-/* Open Group Base Specifications Issue 6 */
-
-#ifndef _SA_FAMILY_T
-#define _SA_FAMILY_T
-/* Should match corresponding typedef in <sys/socket.h> */
-typedef uint8_t		sa_family_t;
-#endif /* _SA_FAMILY_T */
-
-struct sockaddr_un
-{
-	sa_family_t	sun_family;
-	char		sun_path[127];
-};
-
-/* Note: UNIX domain sockets are not implemented! */
Index: trunk/minix/include/sys/utsname.h
===================================================================
--- trunk/minix/include/sys/utsname.h	(revision 9)
+++ 	(revision )
@@ -1,22 +1,0 @@
-/* The <sys/utsname.h> header gives the system name. */
-
-#ifndef _UTSNAME_H
-#define _UTSNAME_H
-
-#ifndef _ANSI_H
-#include <ansi.h>
-#endif
-
-struct utsname {
-  char sysname[15+1];
-  char nodename[255+1];
-  char release[11+1];
-  char version[7+1];
-  char machine[11+1];
-  char arch[11+1];
-};
-
-/* Function Prototypes. */
-_PROTOTYPE( int uname, (struct utsname *_name)				);
-
-#endif /* _UTSNAME_H */
Index: trunk/minix/include/sys/vm.h
===================================================================
--- trunk/minix/include/sys/vm.h	(revision 9)
+++ 	(revision )
@@ -1,30 +1,0 @@
-/*
-sys/vm.h
-*/
-
-#define PAGE_SIZE	4096
-
-/* MIOCMAP */
-struct mapreq
-{
-	void *base;
-	size_t size;
-	off_t offset;
-	int readonly;
-};
-
-/* i386 paging constants */
-#define I386_VM_PRESENT	0x001	/* Page is present */
-#define I386_VM_WRITE	0x002	/* Read/write access allowed */
-#define I386_VM_USER	0x004	/* User access allowed */
-#define I386_VM_PWT	0x008	/* Write through */
-#define I386_VM_PCD	0x010	/* Cache disable */
-#define I386_VM_ADDR_MASK 0xFFFFF000 /* physical address */
-
-#define I386_VM_PT_ENT_SIZE	4	/* Size of a page table entry */
-#define I386_VM_DIR_ENTRIES	1024	/* Number of entries in a page dir */
-#define I386_VM_DIR_ENT_SHIFT	22	/* Shift to get entry in page dir. */
-#define I386_VM_PT_ENT_SHIFT	12	/* Shift to get entry in page table */
-#define I386_VM_PT_ENT_MASK	0x3FF	/* Mask to get entry in page table */
-
-#define I386_CR0_PG		0x80000000	/* Enable paging */		
Index: trunk/minix/include/sys/wait.h
===================================================================
--- trunk/minix/include/sys/wait.h	(revision 9)
+++ 	(revision )
@@ -1,40 +1,0 @@
-/* The <sys/wait.h> header contains macros related to wait(). The value
- * returned by wait() and waitpid() depends on whether the process 
- * terminated by an exit() call, was killed by a signal, or was stopped
- * due to job control, as follows:
- *
- *				 High byte   Low byte
- *				+---------------------+
- *	exit(status)		|  status  |    0     |
- *				+---------------------+
- *      killed by signal	|    0     |  signal  |
- *				+---------------------+
- *	stopped (job control)	|  signal  |   0177   |
- *				+---------------------+
- */
-
-#ifndef _WAIT_H
-#define _WAIT_H
-
-#ifndef _TYPES_H
-#include <sys/types.h>
-#endif
-
-#define _LOW(v)		( (v) & 0377)
-#define _HIGH(v)	( ((v) >> 8) & 0377)
-
-#define WNOHANG         1	/* do not wait for child to exit */
-#define WUNTRACED       2	/* for job control; not implemented */
-
-#define WIFEXITED(s)	(_LOW(s) == 0)			    /* normal exit */
-#define WEXITSTATUS(s)	(_HIGH(s))			    /* exit status */
-#define WTERMSIG(s)	(_LOW(s) & 0177)		    /* sig value */
-#define WIFSIGNALED(s)	(((unsigned int)(s)-1 & 0xFFFF) < 0xFF) /* signaled */
-#define WIFSTOPPED(s)	(_LOW(s) == 0177)		    /* stopped */
-#define WSTOPSIG(s)	(_HIGH(s) & 0377)		    /* stop signal */
-
-/* Function Prototypes. */
-_PROTOTYPE( pid_t wait, (int *_stat_loc)			   	   );
-_PROTOTYPE( pid_t waitpid, (pid_t _pid, int *_stat_loc, int _options)	   );
-
-#endif /* _WAIT_H */
