*** empty log message ***

This commit is contained in:
Jorrit Herder 2005-06-17 09:15:39 +00:00
parent 37a1e3f8e3
commit 36c3091342
7 changed files with 11 additions and 9 deletions

View file

@ -119,7 +119,8 @@ int main(int argc, char **argv)
n -= r; 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"); printf("Done.\n");
return(0); return(0);

View file

@ -312,7 +312,7 @@
# define GET_KENV 5 /* get kernel environment string */ # define GET_KENV 5 /* get kernel environment string */
# define GET_IRQHOOKS 6 /* get the IRQ table */ # define GET_IRQHOOKS 6 /* get the IRQ table */
# define GET_KMESSAGES 7 /* get kernel messages */ # 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_KADDRESSES 9 /* get various kernel addresses */
# define GET_SCHEDINFO 10 /* get scheduling queues */ # define GET_SCHEDINFO 10 /* get scheduling queues */
# define GET_PROC 11 /* get process slot if given process */ # define GET_PROC 11 /* get process slot if given process */

View file

@ -3,7 +3,7 @@
/* Minix release and version numbers. */ /* Minix release and version numbers. */
#define OS_RELEASE "3" #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. /* This file sets configuration parameters for the MINIX kernel, FS, and PM.
* It is divided up into two main sections. The first section contains * It is divided up into two main sections. The first section contains
@ -68,7 +68,7 @@
#define ENABLE_K_DEBUGGING 0 /* kernel debugging calls */ #define ENABLE_K_DEBUGGING 0 /* kernel debugging calls */
/* Include or exclude an image of /dev/boot in the boot image. */ /* 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. */ /* Include or exclude device drivers. Set to 1 to include, 0 to exclude. */
#define ENABLE_BIOS_WINI 0 /* enable BIOS winchester driver */ #define ENABLE_BIOS_WINI 0 /* enable BIOS winchester driver */

View file

@ -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_getrandomness(dst) sys_getinfo(GET_RANDOMNESS, dst, 0,0,0)
#define sys_getimage(dst) sys_getinfo(GET_IMAGE, 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_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_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_getschedinfo(v1,v2) sys_getinfo(GET_SCHEDINFO, v1,0, v2,0)
#define sys_getlocktimings(dst) sys_getinfo(GET_LOCKTIMING, dst, 0,0,0) #define sys_getlocktimings(dst) sys_getinfo(GET_LOCKTIMING, dst, 0,0,0)

View file

@ -99,11 +99,13 @@ struct kinfo {
phys_bytes kmem_size; phys_bytes kmem_size;
phys_bytes bootdev_base; /* boot device from boot image (/dev/boot) */ phys_bytes bootdev_base; /* boot device from boot image (/dev/boot) */
phys_bytes bootdev_size; phys_bytes bootdev_size;
phys_bytes bootdev_mem;
phys_bytes params_base; /* parameters passed by boot monitor */ phys_bytes params_base; /* parameters passed by boot monitor */
phys_bytes params_size; phys_bytes params_size;
int nr_procs; /* number of user processes */ int nr_procs; /* number of user processes */
int nr_tasks; /* number of kernel tasks */ 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 { struct machine {

View file

@ -27,7 +27,7 @@ Created: Feb 15, 1994 by Philip Homburg <philip@cs.vu.nl>
/* Kernel controls. */ /* Kernel controls. */
#define SYSSENDMASK _IO ('S', 4) #define SYSSENDMASK _IO ('S', 4)
#define SYSSIGNON _IOR('S', 2, struct systaskinfo) #define SYSSIGNON _IOR('S', 2, struct systaskinfo)
#define SYSGETENV _IOW('S', 5, struct sysgetenv) #define SYSGETENV _IOW('S', 1, struct sysgetenv)
struct mmswapon { struct mmswapon {
u32_t offset; /* Starting offset within file. */ u32_t offset; /* Starting offset within file. */
@ -35,7 +35,7 @@ struct mmswapon {
char file[128]; /* Name of swap file/device. */ 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" #include "/usr/src/servers/fs/dmap.h"
struct fssignon { struct fssignon {
dev_t dev; /* Device to manage. */ dev_t dev; /* Device to manage. */

View file

@ -19,7 +19,7 @@ PROGRAMS= ../kernel/kernel \
../drivers/rtl8139/rtl8139 \ ../drivers/rtl8139/rtl8139 \
../drivers/fxp/fxp \ ../drivers/fxp/fxp \
../servers/init/init \ ../servers/init/init \
#bootfs.img # bootdev.img
usage: usage:
@echo " " >&2 @echo " " >&2