*** empty log message ***

diff --git a/boot/addaout.c b/boot/addaout.c
index d6b775f6a88e68df6e8b875f2bf0f73187c3ccfb..c38a1bbb2fc55600d7180740425a424013c84e42 100644 (file)
--- a/boot/addaout.c
+++ b/boot/addaout.c
@@ -119,7 +119,8 @@ int main(int argc, char **argv)
        n -= r;
   }
 
-  printf("Prepended data file (%u bytes) with a.out header.\n", total_size);
+  printf("Prepended data file (%u bytes) with a.out header (%u bytes).\n", 
+       total_size, sizeof(aout));
   printf("Done.\n");
 
   return(0);

diff --git a/include/minix/com.h b/include/minix/com.h
index dea79cd655cda7eb93dd4106c5d55602fcebe0e6..666610eaddc6c736a09585dd37c13655881554ab 100755 (executable)
--- a/include/minix/com.h
+++ b/include/minix/com.h
@@ -312,7 +312,7 @@
 #   define GET_KENV       5    /* get kernel environment string */
 #   define GET_IRQHOOKS           6    /* get the IRQ table */
 #   define GET_KMESSAGES   7   /* get kernel messages */
-#   define GET_MEMCHUNKS   8   /* get base+size of mem chunks */
+
 #   define GET_KADDRESSES  9   /* get various kernel addresses */
 #   define GET_SCHEDINFO  10   /* get scheduling queues */
 #   define GET_PROC      11    /* get process slot if given process */

diff --git a/include/minix/config.h b/include/minix/config.h
index 0c86c14c484e4e0596e9d2878859a410306db51c..55c8bd94a63f2b7e8420263993f3e9dc68791ff1 100755 (executable)
--- a/include/minix/config.h
+++ b/include/minix/config.h
@@ -3,7 +3,7 @@
 
 /* Minix release and version numbers. */
 #define OS_RELEASE "3"
-#define OS_VERSION "0.5"
+#define OS_VERSION "0.6"
 
 /* This file sets configuration parameters for the MINIX kernel, FS, and PM.
  * It is divided up into two main sections.  The first section contains
@@ -68,7 +68,7 @@
 #define ENABLE_K_DEBUGGING 0   /* kernel debugging calls */
 
 /* Include or exclude an image of /dev/boot in the boot image. */
-#define ENABLE_BOOTDEV 1
+#define ENABLE_BOOTDEV    0
 
 /* Include or exclude device drivers.  Set to 1 to include, 0 to exclude. */
 #define ENABLE_BIOS_WINI   0   /* enable BIOS winchester driver */

diff --git a/include/minix/syslib.h b/include/minix/syslib.h
index 6340cfb6f5393e37eec3adb69241861a6e16beb8..9f60a3cf831db47bea5878faba8e7856508f23b1 100755 (executable)
--- a/include/minix/syslib.h
+++ b/include/minix/syslib.h
@@ -119,7 +119,6 @@ _PROTOTYPE(int sys_enable_iop, (int proc_nr)                                );
 #define sys_getrandomness(dst) sys_getinfo(GET_RANDOMNESS, dst, 0,0,0)
 #define sys_getimage(dst)      sys_getinfo(GET_IMAGE, dst, 0,0,0)
 #define sys_getirqhooks(dst)   sys_getinfo(GET_IRQHOOKS, dst, 0,0,0)
-#define sys_getmemchunks(dst)  sys_getinfo(GET_MEMCHUNKS, dst, 0,0,0)
 #define sys_getmonparams(v,vl) sys_getinfo(GET_MONPARAMS, v,vl, 0,0)
 #define sys_getschedinfo(v1,v2)        sys_getinfo(GET_SCHEDINFO, v1,0, v2,0)
 #define sys_getlocktimings(dst)        sys_getinfo(GET_LOCKTIMING, dst, 0,0,0)

diff --git a/include/minix/type.h b/include/minix/type.h
index b81a97d49e9fea3d9358a1b8aae247a326332b11..695945fc4673bf9066fea3c3ad4053f6caf86351 100755 (executable)
--- a/include/minix/type.h
+++ b/include/minix/type.h
@@ -99,11 +99,13 @@ struct kinfo {
   phys_bytes kmem_size;
   phys_bytes bootdev_base;     /* boot device from boot image (/dev/boot) */
   phys_bytes bootdev_size;
+  phys_bytes bootdev_mem;
   phys_bytes params_base;      /* parameters passed by boot monitor */
   phys_bytes params_size;
   int nr_procs;                        /* number of user processes */
   int nr_tasks;                        /* number of kernel tasks */
-  char version[8];             /* kernel version number */
+  char release[4];             /* kernel release number */
+  char version[4];             /* kernel version number */
 };
 
 struct machine {

diff --git a/include/sys/svrctl.h b/include/sys/svrctl.h
index 94d1cc04b8090779a87f61f277bf32cf5976cb25..bf8746b92fbce51b62c2a8d50fab6100e8ab24da 100755 (executable)
--- a/include/sys/svrctl.h
+++ b/include/sys/svrctl.h
@@ -27,7 +27,7 @@ Created:      Feb 15, 1994 by Philip Homburg <philip@cs.vu.nl>
 /* Kernel controls. */
 #define SYSSENDMASK    _IO ('S',  4)
 #define SYSSIGNON      _IOR('S',  2, struct systaskinfo)
-#define SYSGETENV      _IOW('S',  5, struct sysgetenv)
+#define SYSGETENV      _IOW('S',  1, struct sysgetenv)
 
 struct mmswapon {
        u32_t           offset;         /* Starting offset within file. */
@@ -35,7 +35,7 @@ struct mmswapon {
        char            file[128];      /* Name of swap file/device. */
 };
 
-/* TEMP!!! A proper system call must be created later. */
+/* A proper system call must be created later. */
 #include "/usr/src/servers/fs/dmap.h"
 struct fssignon {
        dev_t           dev;            /* Device to manage. */

diff --git a/tools/Makefile b/tools/Makefile
index 25c0c59e00078e3f673336baa10fe1acb2a54977..096ecd2f629243e37d6e2dd975fbafb2ef420c33 100755 (executable)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -19,7 +19,7 @@ PROGRAMS=     ../kernel/kernel \
        ../drivers/rtl8139/rtl8139 \
        ../drivers/fxp/fxp \
        ../servers/init/init \
-       #bootfs.img
+#      bootdev.img
 
 usage: 
        @echo " " >&2