diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2017-07-20 09:31:30 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2017-07-20 09:31:30 +0200 |
| commit | 7eae4edb86fc65b2e99bf81757aeb00392d8a60d (patch) | |
| tree | 2ee5c92be2ca55dcd30dc3e9632bcfa4dfd9a095 /src/Makefile | |
| parent | 43fcc1ca57149c5a87502f0c23a2c85e4d28264a (diff) | |
| download | abaos-7eae4edb86fc65b2e99bf81757aeb00392d8a60d.tar.gz abaos-7eae4edb86fc65b2e99bf81757aeb00392d8a60d.tar.bz2 | |
added a virtual keyboard driver interface, made the PS/2 keyboard a specialization of it
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index 5b67063..1696e6c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -36,7 +36,7 @@ kernel.bin: kernel.elf kernel.sym: kernel.elf $(OBJCOPY) --only-keep-debug kernel.elf kernel.sym -kernel.elf: kernel/entry.o kernel/kernel.o kernel/kernel_asm.o kernel/console.o kernel/vgatext.o kernel/serial.o kernel/memorymanagement.o kernel/tasks.o hardware/port.o hardware/port_asm.o hardware/interrupts.o hardware/interrupts_asm.o hardware/pci.o drivers/driver.o drivers/hdi/mouse.o drivers/hdi/ps2/keyboard.o drivers/hdi/ps2/ps2mouse.o drivers/video/vga.o drivers/video/vga_font.o drivers/net/rtl8139.o gui/widget.o gui/composite_widget.o gui/window.o gui/desktop.o gui/text_widget.o libc/string.o libc/stdlib.o libc/stdio.o libc/setjmp.o +kernel.elf: kernel/entry.o kernel/kernel.o kernel/kernel_asm.o kernel/console.o kernel/vgatext.o kernel/serial.o kernel/memorymanagement.o kernel/tasks.o hardware/port.o hardware/port_asm.o hardware/interrupts.o hardware/interrupts_asm.o hardware/pci.o drivers/driver.o drivers/hdi/mouse.o drivers/hdi/keyboard.o drivers/hdi/ps2/ps2keyboard.o drivers/hdi/ps2/ps2mouse.o drivers/video/vga.o drivers/video/vga_font.o drivers/net/rtl8139.o gui/widget.o gui/composite_widget.o gui/window.o gui/desktop.o gui/text_widget.o libc/string.o libc/stdlib.o libc/stdio.o libc/setjmp.o $(LD) -o kernel.elf -N -n -Ttext 0x8800 -e kernel_entry --oformat elf32-i386 \ kernel/entry.o \ kernel/kernel.o kernel/kernel_asm.o \ @@ -46,7 +46,8 @@ kernel.elf: kernel/entry.o kernel/kernel.o kernel/kernel_asm.o kernel/console.o hardware/interrupts.o hardware/interrupts_asm.o \ hardware/pci.o \ drivers/driver.o drivers/hdi/mouse.o \ - drivers/hdi/ps2/keyboard.o drivers/hdi/ps2/ps2mouse.o \ + drivers/hdi/keyboard.o \ + drivers/hdi/ps2/ps2keyboard.o drivers/hdi/ps2/ps2mouse.o \ drivers/video/vga.o drivers/video/vga_font.o \ drivers/net/rtl8139.o \ libc/string.o libc/stdlib.o libc/stdio.o libc/setjmp.o \ @@ -101,8 +102,11 @@ drivers/driver.o: drivers/driver.c drivers/driver.h drivers/hdi/mouse.o: drivers/hdi/mouse.c drivers/hdi/mouse.h $(CC) $(CFLAGS) -c -o drivers/hdi/mouse.o drivers/hdi/mouse.c -drivers/hdi/ps2/keyboard.o: drivers/hdi/ps2/keyboard.c drivers/hdi/ps2/keyboard.h - $(CC) $(CFLAGS) -c -o drivers/hdi/ps2/keyboard.o drivers/hdi/ps2/keyboard.c +drivers/hdi/keyboard.o: drivers/hdi/keyboard.c drivers/hdi/keyboard.h + $(CC) $(CFLAGS) -c -o drivers/hdi/keyboard.o drivers/hdi/keyboard.c + +drivers/hdi/ps2/ps2keyboard.o: drivers/hdi/ps2/ps2keyboard.c drivers/hdi/ps2/ps2keyboard.h + $(CC) $(CFLAGS) -c -o drivers/hdi/ps2/ps2keyboard.o drivers/hdi/ps2/ps2keyboard.c drivers/hdi/ps2/ps2mouse.o: drivers/hdi/ps2/ps2mouse.c drivers/hdi/ps2/ps2mouse.h $(CC) $(CFLAGS) -c -o drivers/hdi/ps2/ps2mouse.o drivers/hdi/ps2/ps2mouse.c |