Fixed bug relating to FS and MEMORY during startup;
Relocated some syslib functions to utils library; Changed location of 'Multiuser startup ..." echo in /etc/rc
This commit is contained in:
@@ -7,9 +7,6 @@ LIBSYS = ../libsys.a
|
||||
all: $(LIBSYS)
|
||||
|
||||
OBJECTS = \
|
||||
$(LIBSYS)(kmalloc.o) \
|
||||
$(LIBSYS)(kprintf.o) \
|
||||
$(LIBSYS)(kputc.o) \
|
||||
$(LIBSYS)(sys_times.o) \
|
||||
$(LIBSYS)(sys_getuptm.o) \
|
||||
$(LIBSYS)(sys_abort.o) \
|
||||
@@ -50,15 +47,6 @@ $(LIBSYS): $(OBJECTS)
|
||||
aal cr $@ *.o
|
||||
rm *.o
|
||||
|
||||
$(LIBSYS)(kmalloc.o): kmalloc.c
|
||||
$(CC1) kmalloc.c
|
||||
|
||||
$(LIBSYS)(kprintf.o): kprintf.c
|
||||
$(CC1) kprintf.c
|
||||
|
||||
$(LIBSYS)(kputc.o): kputc.c
|
||||
$(CC1) kputc.c
|
||||
|
||||
$(LIBSYS)(sys_times.o): sys_times.c
|
||||
$(CC1) sys_times.c
|
||||
|
||||
|
||||
@@ -7,6 +7,9 @@ LIBUTILS = ../libutils.a
|
||||
all: $(LIBUTILS)
|
||||
|
||||
OBJECTS = \
|
||||
$(LIBSYS)(kmalloc.o) \
|
||||
$(LIBSYS)(kprintf.o) \
|
||||
$(LIBSYS)(kputc.o) \
|
||||
$(LIBUTILS)(tickdelay.o) \
|
||||
$(LIBUTILS)(getuptime.o) \
|
||||
$(LIBUTILS)(get_mon_prm.o) \
|
||||
@@ -14,7 +17,6 @@ OBJECTS = \
|
||||
$(LIBUTILS)(env_panic.o) \
|
||||
$(LIBUTILS)(env_prefix.o) \
|
||||
$(LIBUTILS)(fkey_ctl.o) \
|
||||
$(LIBUTILS)(get_proc_nr.o) \
|
||||
$(LIBUTILS)(panic.o) \
|
||||
$(LIBUTILS)(report.o) \
|
||||
$(LIBUTILS)(taskcall.o) \
|
||||
@@ -24,6 +26,15 @@ $(LIBUTILS): $(OBJECTS)
|
||||
aal cr $@ *.o
|
||||
rm *.o
|
||||
|
||||
$(LIBSYS)(kmalloc.o): kmalloc.c
|
||||
$(CC1) kmalloc.c
|
||||
|
||||
$(LIBSYS)(kprintf.o): kprintf.c
|
||||
$(CC1) kprintf.c
|
||||
|
||||
$(LIBSYS)(kputc.o): kputc.c
|
||||
$(CC1) kputc.c
|
||||
|
||||
$(LIBUTILS)(getuptime.o): getuptime.c
|
||||
$(CC1) getuptime.c
|
||||
|
||||
@@ -45,9 +56,6 @@ $(LIBUTILS)(env_panic.o): env_panic.c
|
||||
$(LIBUTILS)(fkey_ctl.o): fkey_ctl.c
|
||||
$(CC1) fkey_ctl.c
|
||||
|
||||
$(LIBUTILS)(get_proc_nr.o): get_proc_nr.c
|
||||
$(CC1) get_proc_nr.c
|
||||
|
||||
$(LIBUTILS)(panic.o): panic.c
|
||||
$(CC1) panic.c
|
||||
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
#include "utils.h"
|
||||
#include <minix/config.h>
|
||||
#include <timers.h>
|
||||
#include "../../kernel/const.h"
|
||||
#include "../../kernel/type.h"
|
||||
#include "../../kernel/proc.h"
|
||||
|
||||
/*===========================================================================*
|
||||
* get_proc_nr *
|
||||
*===========================================================================*/
|
||||
PUBLIC int get_proc_nr(proc_nr, proc_name)
|
||||
int *proc_nr; /* store process number here */
|
||||
char *proc_name; /* lookup process by name */
|
||||
{
|
||||
static struct proc proc;
|
||||
message m;
|
||||
int s;
|
||||
if (proc_name != NULL) { /* lookup by name */
|
||||
|
||||
} else { /* get own process number */
|
||||
m.m_type = SYS_GETINFO;
|
||||
m.I_REQUEST = GET_PROC;
|
||||
m.I_PROC_NR = SELF;
|
||||
m.I_KEY_LEN = SELF;
|
||||
m.I_VAL_LEN = 0;
|
||||
m.I_VAL_PTR = (char *) &proc;
|
||||
m.I_VAL_LEN = 0;
|
||||
if ((s=_taskcall(SYSTASK, SYS_GETINFO, &m)) != OK)
|
||||
return(s);
|
||||
*proc_nr = proc.p_nr;
|
||||
}
|
||||
return(OK);
|
||||
}
|
||||
|
||||
|
||||
@@ -10,9 +10,7 @@
|
||||
* to pollute the kernel message buffer with its debug dumps.
|
||||
*/
|
||||
|
||||
#include "syslib.h"
|
||||
#include <minix/callnr.h>
|
||||
#include <minix/minlib.h>
|
||||
#include "utils.h"
|
||||
|
||||
/*===========================================================================*
|
||||
* kputc *
|
||||
Reference in New Issue
Block a user