updated to Minix 1.3 version

lib/minixST/include/minix/callnr.h

@@ -1,4 +1,4 @@
-#define NCALLS            69  	/* number of system calls allowed */
+#define NCALLS            70  	/* number of system calls allowed */
 
 #define EXIT	           1 
 #define FORK	           2 
@@ -48,3 +48,6 @@
 #define BRK2	          66	/* to MM: used to say how big FS & INIT are */
 #define REVIVE            67	/* to FS: revive a sleeping process */
 #define TASK_REPLY        68	/* to FS: reply code from tty task */
+
+/* The following IS a system call for amoeba transactions */
+#define	AM_SYSCALL	  69

lib/minixST/include/minix/com.h

@@ -5,7 +5,71 @@
 #define ANY   (NR_PROCS+100)	/* receive(ANY, buf) accepts from any source */
 
 /* Task numbers, function codes and reply codes. */
-#define HARDWARE          -1	/* used as source on interrupt generated msgs */
+
+#define TTY         -NR_TASKS	/* terminal I/O class */
+#	define TTY_CHAR_INT 1	/* fcn code for tty input interrupt */
+#	define TTY_O_DONE   2	/* fcn code for tty output done */
+#	define TTY_READ	    3	/* fcn code for reading from tty */
+#	define TTY_WRITE    4	/* fcn code for writing to tty */
+#	define TTY_IOCTL    5	/* fcn code for ioctl */
+#	define TTY_SETPGRP  6	/* fcn code for setpgrp */
+#	define SUSPEND	 -998	/* used in interrupts when tty has no data */
+
+#ifdef AM_KERNEL
+#define	AMOEBA
+#endif
+
+#ifdef AMOEBA
+
+/* there are AM_NTASK copies of the amoeba kernel task.
+** If you change AM_NTASKS be sure to adjust kernel/table.c and fs/table.c
+*/
+#define AM_NTASKS	   4	/* number of kernel tasks of this class */
+
+#define	AMINT_CLASS	    (TTY+1)	/* Amoeba event handler */
+#define AMOEBA_CLASS 	    (AMINT_CLASS+AM_NTASKS) /* transaction handlers */
+#	define ETHER_ARRIV   1	/* fcn code for packet arrival */
+#	define AM_TRANS      2	/* amoeba transaction */		
+#	define AM_GETREQ     3	/* amoeba getrequest */
+#	define AM_PUTREP     4	/* amoeba putrep */
+#	define AM_REVIVE     6	/* used by kernel task to revive luser task */
+#	define AM_TIMEOUT    8	/* used to talk to clock task */
+#	define AM_PUTSIG     9	/* when the luser hits the DEL ! */
+#	define AM_TASK_DIED 10  /* sent if task died during a transaction */
+
+#else
+
+#define	AMOEBA_CLASS	TTY
+
+#endif AMOEBA
+
+/*
+** New class definitions should go here and should be defined relative
+** to AMOEBA_CLASS  (ie. as AMOEBA_CLASS+n, for the nth task added).
+*/
+
+#define PRINTER           -7		/* printer  I/O class */
+/* the printer uses the same commands as TTY */
+
+#define WINCHESTER        -6	/* winchester (hard) disk class */
+#define FLOPPY            -5	/* floppy disk class */
+#	define DISKINT     1	/* fcn code for disk interrupt */
+#	define DISK_READ   3	/* fcn code to DISK (must equal TTY_READ) */
+#	define DISK_WRITE  4	/* fcn code to DISK (must equal TTY_WRITE) */
+#	define DISK_IOCTL  5	/* fcn code for setting up RAM disk */
+
+#define MEM               -4	/* /dev/ram, /dev/(k)mem and /dev/null class */
+#	define RAM_DEV     0	/* minor device for /dev/ram */
+#	define MEM_DEV     1	/* minor device for /dev/mem */
+#	define KMEM_DEV    2	/* minor device for /dev/kmem */
+#	define NULL_DEV    3	/* minor device for /dev/null */
+
+#define CLOCK             -3	/* clock class */
+#	define SET_ALARM   1	/* fcn code to CLOCK, set up alarm */
+#	define CLOCK_TICK  2	/* fcn code for clock tick */
+#	define GET_TIME	   3	/* fcn code to CLOCK, get real time */
+#	define SET_TIME	   4	/* fcn code to CLOCK, set real time */
+#	define REAL_TIME   1	/* reply from CLOCK: here is real time */
 
 #define SYSTASK           -2	/* internal functions */
 #	define SYS_XIT     1	/* fcn code for sys_xit(parent, proc) */
@@ -17,38 +81,10 @@
 #	define SYS_EXEC    7	/* fcn code for sys_exec(procno, new_sp) */
 #	define SYS_TIMES   8	/* fcn code for sys_times(procno, bufptr) */
 #	define SYS_ABORT   9	/* fcn code for sys_abort() */
-#ifdef ATARI_ST
-#	define SYS_FRESH  10	/* fcn code for sys_fresh() */
-#endif
+#	define SYS_FRESH  10	/* fcn code for sys_fresh()  (Atari only) */
+#	define SYS_KILL   11	/* fcn code for sys_kill(proc, sig) */
 
-#define CLOCK             -3	/* clock class */
-#	define SET_ALARM   1	/* fcn code to CLOCK, set up alarm */
-#	define CLOCK_TICK  2	/* fcn code for clock tick */
-#	define GET_TIME	   3	/* fcn code to CLOCK, get real time */
-#	define SET_TIME	   4	/* fcn code to CLOCK, set real time */
-#	define REAL_TIME   1	/* reply from CLOCK: here is real time */
-
-#define MEM               -4	/* /dev/ram, /dev/(k)mem and /dev/null class */
-#	define RAM_DEV     0	/* minor device for /dev/ram */
-#	define MEM_DEV     1	/* minor device for /dev/mem */
-#	define KMEM_DEV    2	/* minor device for /dev/kmem */
-#	define NULL_DEV    3	/* minor device for /dev/null */
-
-#define FLOPPY            -5	/* floppy disk class */
-#define WINCHESTER        -6	/* winchester (hard) disk class */
-#	define DISKINT     1	/* fcn code for disk interupt */
-#	define DISK_READ   3	/* fcn code to DISK (must equal TTY_READ) */
-#	define DISK_WRITE  4	/* fcn code to DISK (must equal TTY_WRITE) */
-#	define DISK_IOCTL  5	/* fcn code for setting up RAM disk */
-
-#define TTY               -7	/* terminal I/O class */
-#define PRINTER           -8	/* printer  I/O class */
-#	define TTY_CHAR_INT 1	/* fcn code for tty input interrupt */
-#	define TTY_O_DONE  2	/* fcn code for tty output done */
-#	define TTY_READ	   3	/* fcn code for reading from tty */
-#	define TTY_WRITE   4	/* fcn code for writing to tty */
-#	define TTY_IOCTL   5	/* fcn code for ioctl */
-#	define SUSPEND	-998	/* used in interrupts when tty has no data */
+#define HARDWARE          -1	/* used as source on interrupt generated msgs */
 
 /* Names of message fields for messages to CLOCK task. */
 #define DELTA_TICKS    m6_l1	/* alarm interval in clock ticks */
@@ -66,9 +102,11 @@
 
 /* Names of message fields for messages to TTY task. */
 #define TTY_LINE       m2_i1	/* message parameter: terminal line */
+#define TTY_SPEED      m2_i2	/* low byte = input speed, next byte = output*/
 #define TTY_REQUEST    m2_i3	/* message parameter: ioctl request code */
 #define TTY_SPEK       m2_l1	/* message parameter: ioctl speed, erasing */
 #define TTY_FLAGS      m2_l2	/* message parameter: ioctl tty mode */
+#define TTY_PGRP       m2_i3    /* message parameter: process group */
 
 /* Names of messages fields used in reply messages from tasks. */
 #define REP_PROC_NR    m2_i1	/* # of proc on whose behalf I/O was done */
@@ -87,7 +125,7 @@
 #define USER_TIME      m4_l1	/* user time consumed by process */
 #define SYSTEM_TIME    m4_l2	/* system time consumed by process */
 #define CHILD_UTIME    m4_l3	/* user time consumed by process' children */
-#define CHILD_STIME    m4_l4	/* system time consumed by proces children */
+#define CHILD_STIME    m4_l4	/* sys time consumed by process' children */
 
 #define PROC1          m1_i1	/* indicates a process */
 #define PROC2          m1_i2	/* indicates a process */
@@ -99,3 +137,18 @@
 #define MEM_PTR        m1_p1	/* tells where memory map is for sys_newmap */
 #define CANCEL             0    /* general request to force a task to cancel */
 #define SIG_MAP        m1_i2	/* used by kernel for passing signal bit map */
+
+#ifdef AMOEBA
+
+/* names of message fields for amoeba tasks */
+#define	AM_OP		m2_i1	/* one of the above operators */
+#define	AM_PROC_NR	m2_i2	/* process # of proc doing operation */
+#define	AM_COUNT	m2_i3	/* size of buffer for operation */
+#define	AM_ADDRESS	m2_p1	/* address of buffer for operation */
+/* for communication between MM and AMOEBA_CLASS kernel tasks */
+#define	AM_STATUS	m2_i3	/* same use as REP_STATUS but for amoeba */
+#define	AM_FREE_IT	m2_l1	/* 1=not a getreq, 0=is a getreq */
+/* and a special for passing a physical address from the ethernet driver */
+#define	AM_PADDR	m2_l1	/* to the transaction layer */
+
+#endif AMOEBA

lib/minixST/include/minix/const.h

@@ -7,10 +7,16 @@
  * subject to a few conditions.
  */
 
+#ifndef i8088
+#ifndef ATARI_ST
+#error Either i8088 or ATARI ST must be defined
+#endif
+#endif
+
 #define EXTERN        extern	/* used in *.h files */
 #define PRIVATE       static	/* PRIVATE x limits the scope of x */
 #define PUBLIC			/* PUBLIC is the opposite of PRIVATE */
-#define FORWARD       static	/* some compilers require this to be 'static' */
+#define FORWARD       		/* some compilers require this to be 'static' */
 
 #define TRUE               1	/* used for turning integers into Booleans */
 #define FALSE              0	/* used for turning integers into Booleans */
@@ -22,7 +28,11 @@
 #define MAJOR	           8	/* major device = (dev>>MAJOR) & 0377 */
 #define MINOR	           0	/* minor device = (dev>>MINOR) & 0377 */
 
+#ifdef AM_KERNEL
+#define NR_TASKS	  13	/* must be 5 more than without amoeba */
+#else
 #define NR_TASKS           8	/* number of tasks in the transfer vector */
+#endif
 #define NR_PROCS          16	/* number of slots in proc table */
 #define NR_SEGS            3	/* # segments per process */
 #define T                  0	/* proc[i].mem_map[T] is for text */
@@ -64,7 +74,7 @@
 #define NO_NUM           0x8000	/* used as numerical argument to panic() */
 #define MAX_PATH            128	/* max length of path names */
 #define SIG_PUSH_BYTES	      8	/* how many bytes pushed by signal */
-#define MAX_ISTACK_BYTES   1024	/* maximum initial stack size for EXEC */
+#define MAX_ISTACK_BYTES   2048	/* maximum initial stack size for EXEC */
 
 /* Device numbers of root (RAM) and boot (fd0) devices. */
 #define ROOT_DEV (dev_nr)   256	/* major-minor device number of root dev */

lib/minixST/include/minix/type.h

@@ -27,7 +27,7 @@ typedef unshort dev_nr;		/* major | minor device number */
 typedef char links;		/* number of links to an inode */
 #define MAX_LINKS 	0177
 
-typedef long real_time;		/* real time in seconds since Jan 1, 1980 */
+typedef long real_time;		/* real time in seconds since Jan 1, 1970 */
 typedef long file_pos;		/* position in, or length of, a file */
 #define MAX_FILE_POS 017777777777L
 typedef short int uid;		/* user id */