From 00bea0a48f5e8c59260470bdc004734a87034d42 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 8 Jun 2017 16:06:30 +0200 Subject: added driver manager keyboard and mouse are now "derived" from driver_t reading and printing more PCI members --- src/Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 934ec7b..615c3b6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -13,10 +13,10 @@ all: image.bin kernel.sym # + M * 512 (M is currently 7) = 3144 for kernel.bin # + 1 * 512 = 512 for magic.bin # (M + N + 1 is the number of sectors to be read in stage 2, as stage 1 -# loads only the first sector, so adapt NOF_LOAD_SECTORS to 36) +# loads only the first sector, so adapt NOF_LOAD_SECTORS to 38) image.bin: boot.bin kernel.bin magic.bin cat boot.bin kernel.bin > image.tmp - truncate -s 18432 image.tmp + truncate -s 19456 image.tmp cat image.tmp magic.bin > image.bin boot.bin: boot.asm boot_gdt.asm stage1_functions.asm stage2_functions.asm stage2_switch_mode.asm stage2_a20.asm @@ -28,10 +28,11 @@ kernel.bin: kernel.elf kernel.sym: kernel.elf $(OBJCOPY) --only-keep-debug kernel.elf kernel.sym -kernel.elf: kernel.o kernel_asm.o console.o vga.o serial.o port.o port_asm.o interrupts.o interrupts_asm.o pci.o keyboard.o mouse.o string.o stdlib.o stdio.o setjmp.o +kernel.elf: kernel.o kernel_asm.o console.o vga.o serial.o port.o port_asm.o interrupts.o interrupts_asm.o driver.o pci.o keyboard.o mouse.o string.o stdlib.o stdio.o setjmp.o $(LD) -o kernel.elf -N -n -Ttext 0x8400 --oformat elf32-i386 \ kernel.o kernel_asm.o console.o vga.o serial.o \ - port.o port_asm.o interrupts.o interrupts_asm.o pci.o \ + port.o port_asm.o interrupts.o interrupts_asm.o \ + driver.o pci.o \ keyboard.o mouse.o \ string.o stdlib.o stdio.o setjmp.o @@ -65,6 +66,9 @@ interrupts.o: interrupts.c interrupts.h interrupts_asm.o: interrupts.asm $(NASM) interrupts.asm $(NASMFLAGS) -o interrupts_asm.o +driver.o: driver.c driver.h + $(CC) $(CFLAGS) -c -o driver.o driver.c + pci.o: pci.c pci.h $(CC) $(CFLAGS) -c -o pci.o pci.c -- cgit v1.2.3-54-g00ecf