summaryrefslogtreecommitdiff
path: root/kernel/Makefile
diff options
context:
space:
mode:
authorJake Mannens <jake72360@gmail.com>2018-07-14 03:42:12 +1000
committerJake Mannens <jake72360@gmail.com>2018-07-14 03:42:12 +1000
commit35685c20a5dc299edf6f3b76ed898a2e71d0e457 (patch)
tree0c4ef9eb71eedb2a3d414b6454f86529400a717e /kernel/Makefile
parentbe74842e37ad54f4fd18ae647e2bdf3e435a0fb8 (diff)
con_init() is now called during the kernel's boot sequence in kboot()
rather than in kmain() as some subsystems may now require early console I/O. Added 16-bit read/write I/O functions to asm/io.h. These functions are inw() and outw() respectively. Added the file kernel/fs.h which will contain definitions relating to filesystem functions. Defined the type off_t as a signed 32-bit value in sys/types.h. This type will be required for filesystem functionality. Added the directory 'kernel/fs' to the project's source tree. The kernel's makefile has been updated accordingly. This directory will contain any source files relating to filesystem functionality (both assembly and C files). Added the file 'fs/hd.c' to the kernel's source tree. This file currently contains three main functions (which are defined in kernel/hd.h). These functions are as follows; hd_init() to enumerate and initialize the hard disks, hd_read() to read sectors from the disk and hd_write() to write sectors to the disk. Currently, all transfers are done in ATA PIO mode using polling, however this will change in future. The function hd_init() is called during the kernel's boot sequence in kboot(). Added the file hd.img to the project's root directory. This is a 20MB raw image file that will be used by Qemu as a 20MB hard disk. The main makefile has been updated to tell Qemu to use this file on launch.
Diffstat (limited to 'kernel/Makefile')
-rw-r--r--kernel/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/Makefile b/kernel/Makefile
index 29b5566..f9e14e8 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -1,7 +1,7 @@
TARGET = kernel.o
-SRCS = $(wildcard *.c)
-ASMS = $(wildcard *.s)
+SRCS = $(wildcard *.c) $(wildcard fs/*.c)
+ASMS = $(wildcard *.s) $(wildcard fs/*.s)
OBJS = $(SRCS:.c=.o) $(ASMS:.s=.o)
CFLAGS = -m32 -I../include -ffreestanding -nostdinc -nostdlib -fno-stack-protector -fno-pie -gstabs+ -g