/shark/trunk/kernel/modules/makefile |
---|
4,6 → 4,7 |
BASE=../.. |
endif |
include $(BASE)/config/config.mk |
OSLIB=$(BASE)/oslib |
LIBRARY = mod |
/shark/trunk/kernel/mem/makefile |
---|
3,6 → 3,8 |
ifndef BASE |
BASE=../.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
LIBRARY = mem |
/shark/trunk/kernel/kern.c |
---|
18,11 → 18,11 |
/** |
------------ |
CVS : $Id: kern.c,v 1.3 2003-01-07 17:07:49 pj Exp $ |
CVS : $Id: kern.c,v 1.4 2003-01-30 09:56:51 pj Exp $ |
File: $File$ |
Revision: $Revision: 1.3 $ |
Last update: $Date: 2003-01-07 17:07:49 $ |
Revision: $Revision: 1.4 $ |
Last update: $Date: 2003-01-30 09:56:51 $ |
------------ |
This file contains: |
369,7 → 369,7 |
the system's structures (queues, tables) , & the two task main & |
dummy, that are always present |
+*/ |
void __kernel_init__(struct multiboot_info *multiboot) |
void __kernel_init__(/* struct multiboot_info *multiboot */ void) |
{ |
int i,j; /* counters */ |
378,10 → 378,10 |
// extern void C8042_restore(void); /* an exit function */ |
int aborting; /* it is set if we are aborting the system */ |
struct multiboot_info *multiboot=mbi_address(); |
/* |
* Runlevel 0: kernel startup |
* |
/shark/trunk/kernel/makefile |
---|
3,6 → 3,8 |
ifndef BASE |
BASE=.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
LIBRARY = gkern |
/shark/trunk/include/ll/assert.h |
---|
File deleted |
/shark/trunk/include/ll/stdlib.h |
---|
File deleted |
/shark/trunk/include/ll/limits.h |
---|
File deleted |
/shark/trunk/include/ll/stdio.h |
---|
File deleted |
/shark/trunk/include/ll/i386/float.h |
---|
File deleted |
/shark/trunk/include/ll/i386/tss-ctx.h |
---|
File deleted |
/shark/trunk/include/ll/i386/string.h |
---|
File deleted |
/shark/trunk/include/ll/i386/hw-func.h |
---|
File deleted |
/shark/trunk/include/ll/i386/mb-hdr.h |
---|
File deleted |
/shark/trunk/include/ll/i386/linkage.h |
---|
File deleted |
/shark/trunk/include/ll/i386/pic.h |
---|
File deleted |
/shark/trunk/include/ll/i386/hw-instr.h |
---|
File deleted |
/shark/trunk/include/ll/i386/mem.h |
---|
File deleted |
/shark/trunk/include/ll/i386/defs.h |
---|
File deleted |
/shark/trunk/include/ll/i386/stdlib.h |
---|
File deleted |
/shark/trunk/include/ll/i386/stdio.h |
---|
File deleted |
/shark/trunk/include/ll/i386/hw-io.h |
---|
File deleted |
/shark/trunk/include/ll/i386/sel.h |
---|
File deleted |
/shark/trunk/include/ll/i386/hw-data.h |
---|
File deleted |
/shark/trunk/include/ll/i386/mb-info.h |
---|
File deleted |
/shark/trunk/include/ll/i386/hw-arch.h |
---|
File deleted |
/shark/trunk/include/ll/i386/error.h |
---|
File deleted |
/shark/trunk/include/ll/i386/x-dosmem.h |
---|
File deleted |
/shark/trunk/include/ll/i386/int.h |
---|
File deleted |
/shark/trunk/include/ll/i386/x-dos.h |
---|
File deleted |
/shark/trunk/include/ll/i386/pit.h |
---|
File deleted |
/shark/trunk/include/ll/i386/farptr.h |
---|
File deleted |
/shark/trunk/include/ll/i386/x-bios.h |
---|
File deleted |
/shark/trunk/include/ll/i386/limits.h |
---|
File deleted |
/shark/trunk/include/ll/i386/cons.h |
---|
File deleted |
/shark/trunk/include/ll/ctype.h |
---|
File deleted |
/shark/trunk/include/ll/stdarg.h |
---|
File deleted |
/shark/trunk/include/ll/errno.h |
---|
File deleted |
/shark/trunk/include/ll/float.h |
---|
File deleted |
/shark/trunk/include/ll/string.h |
---|
File deleted |
/shark/trunk/include/ll/unistd.h |
---|
File deleted |
/shark/trunk/include/ll/ll.h |
---|
File deleted |
/shark/trunk/include/ll/sys/ll/time.h |
---|
File deleted |
/shark/trunk/include/ll/sys/ll/ll-data.h |
---|
File deleted |
/shark/trunk/include/ll/sys/ll/exc.h |
---|
File deleted |
/shark/trunk/include/ll/sys/ll/ll-func.h |
---|
File deleted |
/shark/trunk/include/ll/sys/ll/event.h |
---|
File deleted |
/shark/trunk/include/ll/sys/ll/ll-mem.h |
---|
File deleted |
/shark/trunk/include/ll/sys/ll/ll-instr.h |
---|
File deleted |
/shark/trunk/include/ll/sys/ll/aspace.h |
---|
File deleted |
/shark/trunk/include/ll/sys/types.h |
---|
File deleted |
/shark/trunk/include/ll/sys/cdefs.h |
---|
File deleted |
/shark/trunk/include/ll/math.h |
---|
File deleted |
/shark/trunk/include/ll/time.h |
---|
File deleted |
/shark/trunk/include/kernel/func.h |
---|
21,11 → 21,11 |
/** |
------------ |
CVS : $Id: func.h,v 1.3 2003-01-07 17:12:19 pj Exp $ |
CVS : $Id: func.h,v 1.4 2003-01-30 09:59:59 pj Exp $ |
File: $File$ |
Revision: $Revision: 1.3 $ |
Last update: $Date: 2003-01-07 17:12:19 $ |
Revision: $Revision: 1.4 $ |
Last update: $Date: 2003-01-30 09:59:59 $ |
------------ |
Kernel functions: |
267,7 → 267,7 |
extern __inline__ TIME kern_gettime(struct timespec *t) |
{ |
return ll_gettime(TIME_EXACT, t); |
return ll_gettime(TIME_NEW, t); |
} |
/shark/trunk/config/example.mk |
---|
5,6 → 5,9 |
.PHONY: test all install depend clean cleanall |
.PHONY: $(PROGS) |
#ifndef OSLIB |
OSLIB= |
#endif |
SUBMAKE:=$(BASE)/config/example2.mk |
test: $(PROGS) |
/shark/trunk/config/example2.mk |
---|
2,6 → 2,10 |
ifndef BASE |
BASE=../.. |
endif |
ifndef OSLIB |
OSLIB=$(BASE)/oslib |
endif |
include $(BASE)/config/config.mk |
include $(BASE)/config/libdep.mk |
/shark/trunk/config/libdep.mk |
---|
2,13 → 2,13 |
# this file contains the library dependencies |
# |
OSLIB_LIB=$(OSLIB)/lib |
LINK_STARTUP = $(LIB_PATH)/x0.o |
LINK_STARTUP = $(OSLIB_LIB)/x0.o |
LINK_LIB = |
LIB_DEP = |
# -------------------------------------------------------------------------- |
# Library File names |
80,29 → 80,35 |
endif |
# kl |
ifeq ($(LIB_PATH)/libkl.a,$(wildcard $(LIB_PATH)/libkl.a)) |
ifeq ($(OSLIB_LIB)/libkl.a,$(wildcard $(OSLIB_LIB)/libkl.a)) |
LINK_LIB += -lkl |
LIB_DEP += $(LIB_PATH)/libkl.a |
LIB_DEP += $(OSLIB_LIB)/libkl.a |
endif |
# hx |
ifeq ($(LIB_PATH)/libhx.a,$(wildcard $(LIB_PATH)/libhx.a)) |
ifeq ($(OSLIB_LIB)/libhx.a,$(wildcard $(OSLIB_LIB)/libhx.a)) |
LINK_LIB += -lhx |
LIB_DEP += $(LIB_PATH)/libhx.a |
LIB_DEP += $(OSLIB_LIB)/libhx.a |
endif |
# hc |
ifeq ($(LIB_PATH)/libhc.a,$(wildcard $(LIB_PATH)/libhc.a)) |
ifeq ($(OSLIB_LIB)/libhc.a,$(wildcard $(OSLIB_LIB)/libhc.a)) |
LINK_LIB += -lhc |
LIB_DEP += $(LIB_PATH)/libhc.a |
LIB_DEP += $(OSLIB_LIB)/libhc.a |
endif |
# hm |
ifeq ($(LIB_PATH)/libhm.a,$(wildcard $(LIB_PATH)/libhm.a)) |
ifeq ($(OSLIB_LIB)/libhm.a,$(wildcard $(OSLIB_LIB)/libhm.a)) |
LINK_LIB += -lhm |
LIB_DEP += $(LIB_PATH)/libhm.a |
LIB_DEP += $(OSLIB_LIB)/libhm.a |
endif |
# cons |
ifeq ($(LIB_PATH)/libcons.a,$(wildcard $(LIB_PATH)/libcons.a)) |
LINK_LIB += -lcons |
LIB_DEP += $(LIB_PATH)/libcons.a |
endif |
# blk |
ifeq ($(LIB_PATH)/libblk.a,$(wildcard $(LIB_PATH)/libblk.a)) |
LINK_LIB += -lblk |
/shark/trunk/config/mk/gnu.mk |
---|
6,8 → 6,11 |
INCL = $(BASE)/include |
LIB_PATH = $(BASE)/lib |
OSLIB_PATH = $(OSLIB)/lib |
LIB_DIR = $(BASE)/lib |
OSLIBINCL = $(OSLIB) |
LIBRARYPATHNAME= $(LIB_PATH)/lib$(LIBRARY).a |
LIBRARYDIR= $(LIB_PATH) |
LIBRARYOBJS= $(LIB_OBJS) |
20,7 → 23,7 |
C_WARN = -Wimplicit-function-declaration -Wall |
C_FLAGS = -O -finline-functions -fno-builtin -nostdinc |
C_INC = -I$(INCL) $(OTHERINCL) |
C_INC = -I$(INCL) $(OTHERINCL) -I$(OSLIBINC) |
C_MAC = -D__GNU__ |
ASM_WARN = |
28,7 → 31,7 |
ASM_INC = -I$(INCL) |
ASM_MAC = -D__GNU__ |
LINK_OPT = -Bstatic -Ttext 0x1720000 -oformat coff-go32 -s -nostartfiles -nostdlib -L$(LIB_PATH) |
LINK_OPT = -Bstatic -Ttext 0x1720000 -oformat coff-go32 -s -nostartfiles -nostdlib -L$(LIB_PATH) -L$(OSLIB_PATH) |
C_OPT = $(C_DEF) $(C_WARN) $(C_INC) $(C_MAC) $(C_FLAGS) |
C_OUTPUT = -o $*.o |
/shark/trunk/config/mk/linux.mk |
---|
5,8 → 5,11 |
INCL = $(BASE)/include |
LIB_PATH = $(BASE)/lib/ |
LIB_PATH = $(BASE)/lib |
OSLIB_PATH = $(OSLIB)/lib |
LIB_DIR = $(BASE)/lib |
OSLIBINCL = $(OSLIB) |
OTHERINCL = |
LIBRARYPATHNAME= $(LIB_PATH)/lib$(LIBRARY).a |
LIBRARYDIR= $(LIB_PATH) |
15,15 → 18,15 |
C_WARN = -Wimplicit-function-declaration -Wall |
C_FLAGS = -O -finline-functions -fno-builtin -nostdinc |
C_INC = -I$(INCL) $(OTHERINCL) |
C_INC = -I$(INCL) $(OTHERINCL) -I$(OSLIBINCL) |
C_MAC = -D__LINUX__ |
ASM_WARN = |
ASM_FLAGS = -x assembler-with-cpp |
ASM_INC = -I$(INCL) |
ASM_INC = -I$(INCL) $(OTHERINCL) -I$(OSLIBINC) |
ASM_MAC = -D__LINUX__ |
LINK_OPT = -Bstatic -Ttext 0x220000 -s -nostartfiles -nostdlib -L$(LIB_PATH) |
LINK_OPT = -Bstatic -Ttext 0x220000 -s -nostartfiles -nostdlib -L$(LIB_PATH) -L$(OSLIB_PATH) |
C_OPT = $(C_DEF) $(C_WARN) $(C_INC) $(C_MAC) $(C_FLAGS) |
C_OUTPUT = -o $*.o |
/shark/trunk/fs/msdos/makefile |
---|
5,6 → 5,8 |
ifndef BASE |
BASE=../.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
LIBRARY = fs |
/shark/trunk/fs/makefile |
---|
5,6 → 5,8 |
ifndef BASE |
BASE=.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
LIBRARY = fs |
/shark/trunk/libc/assert/makefile |
---|
5,6 → 5,8 |
ifndef BASE |
BASE=../.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
LIBRARY = c |
/shark/trunk/libc/stdlib/makefile |
---|
5,6 → 5,8 |
ifndef BASE |
BASE=../.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
LIBRARY = c |
/shark/trunk/libc/stdio/makefile |
---|
5,6 → 5,8 |
ifndef BASE |
BASE=../.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
LIBRARY = c |
/shark/trunk/libc/ctype/makefile |
---|
5,6 → 5,8 |
ifndef BASE |
BASE=../.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
LIBRARY = c |
/shark/trunk/libc/string/makefile |
---|
5,6 → 5,7 |
ifndef BASE |
BASE=../.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
LIBRARY = c |
/shark/trunk/libc/unistd/makefile |
---|
5,6 → 5,8 |
ifndef BASE |
BASE=../.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
LIBRARY = c |
/shark/trunk/libc/quad/makefile |
---|
5,6 → 5,7 |
ifndef BASE |
BASE=../.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
LIBRARY = c |
/shark/trunk/libc/utsname/makefile |
---|
5,6 → 5,7 |
ifndef BASE |
BASE=../.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
LIBRARY = c |
/shark/trunk/libc/makefile |
---|
5,6 → 5,7 |
ifndef BASE |
BASE=.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
/shark/trunk/libc/libio/makefile |
---|
5,6 → 5,8 |
ifndef BASE |
BASE=../.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
LIBRARY = c |
/shark/trunk/makefile |
---|
5,7 → 5,7 |
ifndef BASE |
BASE=. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
# |
13,8 → 13,8 |
.PHONY: install all clean cleanall depend |
install all clean cleanall depend: |
make -C oslib $@ |
make -C kernel $@ |
make -C $(OSLIB) $@ |
make -C kernel $@ |
make -C drivers $@ |
make -C fs $@ |
make -C libc $@ |
/shark/trunk/drivers/grx/makefile |
---|
3,6 → 3,8 |
ifndef BASE |
BASE=../.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
#C_OPT += -DVM86 |
/shark/trunk/drivers/oldsnd/makefile |
---|
3,6 → 3,8 |
ifndef BASE |
BASE=../.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
LIBRARY = hsnd |
/shark/trunk/drivers/net/makefile |
---|
3,6 → 3,8 |
ifndef BASE |
BASE=../.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
LIBRARY = hnet |
/shark/trunk/drivers/parport/makefile |
---|
3,6 → 3,8 |
ifndef BASE |
BASE=../.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
LIBRARY = pport |
/shark/trunk/drivers/block/makefile |
---|
5,6 → 5,8 |
ifndef BASE |
BASE=../.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
LIBRARY = blk |
/shark/trunk/drivers/pxc/makefile |
---|
3,6 → 3,8 |
ifndef BASE |
BASE=../.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
LIBRARY = hpxc |
/shark/trunk/drivers/pci/makefile |
---|
3,6 → 3,8 |
ifndef BASE |
BASE=../.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
LIBRARY = hpci |
/shark/trunk/drivers/char/makefile |
---|
3,6 → 3,8 |
ifndef BASE |
BASE=../.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
LIBRARY = hdev |
/shark/trunk/drivers/makefile |
---|
17,7 → 17,7 |
cleanall: $(p_cleanall) |
depend: $(p_depend) |
depend: $(pdepend) |
prefixinstall_%: |
make -C $* install |
/shark/trunk/drivers/pci6025e/makefile |
---|
3,6 → 3,8 |
ifndef BASE |
BASE=../.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
LIBRARY = 6025e |
/shark/trunk/drivers/linuxcom/makefile |
---|
3,6 → 3,7 |
ifndef BASE |
BASE=../.. |
endif |
OSLIB=$(BASE)/oslib |
include $(BASE)/config/config.mk |
LIBRARY = comp |