# Compiler and assembler options.
DEFINES += -DKERNEL
-CPPFLAGS = -nostdinc -I../.. -I- -I../../lib -I../../lib/kernel \
- -include constants.h
+CPPFLAGS = -nostdinc -I../.. -I- -I../../lib -I../../lib/kernel
# Core kernel.
threads_SRC = threads/init.c # Main program.
devices_SRC += devices/serial.c # Serial port device.
devices_SRC += devices/disk.c # IDE disk device.
devices_SRC += devices/intq.c # Interrupt queue.
+devices_SRC += devices/pci.c # PCI device.
+devices_SRC += devices/usb.c # USB device.
# Library code shared between kernel and user programs.
-lib_SRC = lib/debug.c # Debug helpers.
-lib_SRC += lib/random.c # Pseudo-random numbers.
-lib_SRC += lib/stdio.c # I/O library.
-lib_SRC += lib/stdlib.c # Utility functions.
-lib_SRC += lib/string.c # String functions.
+lib_SRC = lib/debug.c # Debug helpers.
+lib_SRC += lib/random.c # Pseudo-random numbers.
+lib_SRC += lib/stdio.c # I/O library.
+lib_SRC += lib/stdlib.c # Utility functions.
+lib_SRC += lib/string.c # String functions.
# Kernel-specific library code.
lib_kernel_SRC += lib/kernel/list.c # Doubly-linked lists.
lib_kernel_SRC += lib/kernel/hash.c # Hash tables.
lib_kernel_SRC += lib/kernel/console.c # printf(), putchar().
-# Filesystem code.
-filesys_SRC = filesys/filesys.c # Filesystem core.
-filesys_SRC += filesys/file.c # Files.
-filesys_SRC += filesys/directory.c # Directories.
-filesys_SRC += filesys/inode.c # File headers.
-filesys_SRC += filesys/fsutil.c # Utilities.
-
# User process code.
-userprog_SRC = userprog/addrspace.c # Address spaces.
+userprog_SRC = userprog/process.c # Process loading.
userprog_SRC += userprog/pagedir.c # Page directories.
userprog_SRC += userprog/exception.c # User exception handler.
userprog_SRC += userprog/syscall.c # System call handler.
userprog_SRC += userprog/gdt.c # GDT initialization.
userprog_SRC += userprog/tss.c # TSS management.
+# No virtual memory code yet.
+#vm_SRC = vm/filename.c # Some file.
+
+# Filesystem code.
+filesys_SRC = filesys/filesys.c # Filesystem core.
+filesys_SRC += filesys/file.c # Files.
+filesys_SRC += filesys/directory.c # Directories.
+filesys_SRC += filesys/inode.c # File headers.
+filesys_SRC += filesys/fsutil.c # Utilities.
+
SOURCES = $(foreach dir,$(SUBDIRS),$($(subst /,_,$(dir))_SRC))
OBJECTS = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(SOURCES)))
DEPENDS = $(patsubst %.o,%.d,$(OBJECTS))
all: os.dsk
-threads/intr-stubs.S: threads/intr-stubs.pl threads/loader.h
- $< > $@
-
-threads/kernel.lds.s: CPPFLAGS += -P -C
+threads/kernel.lds.s: CPPFLAGS += -P
threads/kernel.lds.s: threads/kernel.lds.S threads/loader.h
kernel.o: threads/kernel.lds.s $(OBJECTS)
clean:
$(RM) -f $(OBJECTS) $(DEPENDS)
- $(RM) -f threads/intr-stubs.S threads/loader.o
+ $(RM) -f threads/loader.o
$(RM) -f kernel.o kernel.lds.s
$(RM) -f kernel.bin loader.bin