Changes from tags/minix3.1.2a-orig/minix/kernel/table.c at r13 to trunk/minix/kernel/table.c at r9

File:

• trunk/minix/kernel/table.c (modified) (4 diffs)

trunk/minix/kernel/table.c

@@ -69 +69 @@
 #define SRV_M   (~0)
 #define SYS_M   (~0)
-#define USR_M (s(PM_PROC_NR) | s(FS_PROC_NR) | s(RS_PROC_NR) | s(SS_PROC_NR) | s(SYSTEM))
+#define USR_M (s(PM_PROC_NR) | s(FS_PROC_NR) | s(RS_PROC_NR) | s(SYSTEM))
 #define DRV_M (USR_M | s(SYSTEM) | s(CLOCK) | s(DS_PROC_NR) | s(LOG_PROC_NR) | s(TTY_PROC_NR))
 
@@ -80 +80 @@
 #define RS_C    ~0      
 #define DS_C    ~0      
-#define SS_C    ~0      
 #define PM_C    ~(c(SYS_DEVIO) | c(SYS_SDEVIO) | c(SYS_VDEVIO) | c(SYS_IRQCTL) | c(SYS_INT86))
 #define FS_C    (c(SYS_KILL) | c(SYS_VIRCOPY) | c(SYS_VIRVCOPY) | c(SYS_UMAP) | c(SYS_GETINFO) | c(SYS_EXIT) | c(SYS_TIMES) | c(SYS_SETALARM))
@@ -98 +97 @@
  * Note: the quantum size must be positive in all cases! 
  */
-/* Attenzione! Minix bug! L'ordine nella bootimage deve coincidere con quello 
- * della tabella (vedi commento precedente). Ne deriva che tre file devono
- * essere coerenti:
- * 1. include/minix/com.h (l'ordine delle macro *_NR)
- * 2. kernel/table.c      (l'ordine in boot_image)
- * 3. tools/Makefile      (l'ordine di concatenamento nella boot image) 
- * altrimenti la ipc_to mask non corrisponde
- */
 PUBLIC struct boot_image image[] = {
 /* process nr,   pc, flags, qs,  queue, stack, traps, ipcto, call,  name */ 
@@ -115 +106 @@
  { FS_PROC_NR,    0, SRV_F, 32,      4, 0,     SRV_T, SRV_M,  FS_C, "fs"    },
  { RS_PROC_NR,    0, SRV_F,  4,      3, 0,     SRV_T, SYS_M,  RS_C, "rs"    },
+ { DS_PROC_NR,    0, SRV_F,  4,      3, 0,     SRV_T, SYS_M,  DS_C, "ds"    },
  { TTY_PROC_NR,   0, SRV_F,  4,      1, 0,     SRV_T, SYS_M, TTY_C, "tty"   },
- { DS_PROC_NR,    0, SRV_F,  4,      3, 0,     SRV_T, SYS_M,  DS_C, "ds"    },
- { SS_PROC_NR,    0, SRV_F,  4,      3, 0,     SRV_T, SYS_M,  SS_C, "ss"    },
  { MEM_PROC_NR,   0, SRV_F,  4,      2, 0,     SRV_T, SYS_M, MEM_C, "mem"   },
  { LOG_PROC_NR,   0, SRV_F,  4,      2, 0,     SRV_T, SYS_M, DRV_C, "log"   },