From 8d3e390bdac5f7d7380d75db2eab685d27186138 Mon Sep 17 00:00:00 2001 From: Jorrit Herder Date: Thu, 21 Jul 2005 18:32:49 +0000 Subject: [PATCH] Added new BASE_MEM_TOP to restrict sys_vircopy() calls from BIOS. Updated comments at PRINTF_PROC --- it works again. --- include/ibm/memory.h | 2 ++ include/minix/com.h | 4 ++-- include/minix/config.h | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/ibm/memory.h b/include/ibm/memory.h index 740bdbc4f..303f3864c 100644 --- a/include/ibm/memory.h +++ b/include/ibm/memory.h @@ -18,6 +18,7 @@ /* Physical memory layout. Design decisions made for the earliest PCs, caused * memory to be broken broken into the following four basic pieces: * - Conventional or base memory: first 640 KB (incl. BIOS data, see below); + * The top of conventional memory is often used by the BIOS to store data. * - Upper Memory Area (UMA): upper 384 KB of the first megabyte of memory; * - High Memory Area (HMA): ~ first 64 KB of the second megabyte of memory; * - Extended Memory: all the memory above first megabyte of memory. @@ -26,6 +27,7 @@ * when the processor is in real mode. */ #define BASE_MEM_BEGIN 0x000000 +#define BASE_MEM_TOP 0x090000 #define BASE_MEM_END 0x09FFFF #define UPPER_MEM_BEGIN 0x0A0000 diff --git a/include/minix/com.h b/include/minix/com.h index 33d09e71f..dae605417 100755 --- a/include/minix/com.h +++ b/include/minix/com.h @@ -224,7 +224,7 @@ # define SYS_SETALARM 16 /* sys_setalarm(proc_nr,exp_time,abs_time) */ # define SYS_PHYSVCOPY 18 /* sys_physvcopy(vec_ptr, vec_size) */ -# define SYS_SVRCTL 19 /* sys_svrctl(proc_nr, req, argp) */ +# define SYS_PRIVCTL 19 /* sys_privctl(proc_nr, ...) */ # define SYS_SDEVIO 20 /* sys_sdevio(port, proc_nr, buf, count) */ # define SYS_SIGRETURN 21 /* sys_sigreturn(proc_nr, ctxt_ptr, flags) */ # define SYS_GETINFO 22 /* sys_getinfo(what, whereto) */ @@ -244,7 +244,7 @@ /* Field names for SYS_MEMSET, SYS_SEGCTL. */ #define MEM_PTR m1_p1 /* base */ #define MEM_COUNT m1_i1 /* count */ -#define MEM_CHAR m1_i2 /* char to write */ +#define MEM_PATTERN m1_i2 /* pattern to write */ #define MEM_CHUNK_BASE m4_l1 /* physical base address */ #define MEM_CHUNK_SIZE m4_l2 /* size of mem chunk */ #define MEM_TOT_SIZE m4_l3 /* total memory size */ diff --git a/include/minix/config.h b/include/minix/config.h index deae4289b..6a0db76fe 100755 --- a/include/minix/config.h +++ b/include/minix/config.h @@ -102,8 +102,11 @@ #define ENABLE_BINCOMPAT 0 /* for binaries using obsolete calls */ #define ENABLE_SRCCOMPAT 0 /* for sources using obsolete calls */ -/* Which process should receive diagnostics from the kernel and system? */ -#define PRINTF_PROC TTY +/* Which process should receive diagnostics from the kernel and system? + * Directly sending it to TTY only displays the output. Sending it to the + * log driver will cause the diagnostics to be buffered and displayed. + */ +#define PRINTF_PROC LOG_PROC_NR /* TTY or LOG_PROC_NR */ /* NR_CONS, NR_RS_LINES, and NR_PTYS determine the number of terminals the * system can handle.