diff options
author | Andreas Baumann <mail@andreasbaumann.cc> | 2017-07-15 17:38:09 +0200 |
---|---|---|
committer | Andreas Baumann <mail@andreasbaumann.cc> | 2017-07-15 17:38:09 +0200 |
commit | 76b381c5d30f32c3018a134d96f8a5c3ad677cfa (patch) | |
tree | bc151c2f2a8e07e0b08f4827ff24202088c20c0b /src/Makefile | |
parent | 5631e68852081bb4e4eaa6e3bb3a53a4d024dff2 (diff) | |
download | abaos-76b381c5d30f32c3018a134d96f8a5c3ad677cfa.tar.gz abaos-76b381c5d30f32c3018a134d96f8a5c3ad677cfa.tar.bz2 |
added a dummy RTL8139 network driver
added register interrupt handler methods to drivers (but I'm pretty
unsure about them)
setting network in qemu startup and using RTL8139 emulation drivers
Diffstat (limited to 'src/Makefile')
-rw-r--r-- | src/Makefile | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile index 3c2849e..75d6948 100644 --- a/src/Makefile +++ b/src/Makefile @@ -35,7 +35,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/ps2/keyboard.o drivers/hdi/ps2/mouse.o drivers/video/vga.o drivers/video/vga_font.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/ps2/keyboard.o drivers/hdi/ps2/mouse.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 \ @@ -47,6 +47,7 @@ kernel.elf: kernel/entry.o kernel/kernel.o kernel/kernel_asm.o kernel/console.o drivers/driver.o \ drivers/hdi/ps2/keyboard.o drivers/hdi/ps2/mouse.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 \ gui/widget.o gui/composite_widget.o gui/window.o \ gui/desktop.o gui/text_widget.o @@ -105,6 +106,9 @@ drivers/hdi/ps2/mouse.o: drivers/hdi/ps2/mouse.c drivers/hdi/ps2/mouse.h drivers/video/vga.o: drivers/video/vga.c drivers/video/vga.h $(CC) $(CFLAGS) -c -o drivers/video/vga.o drivers/video/vga.c +drivers/network/rtl8139.o: drivers/network/rtl8139.c drivers/network/rtl8139.h + $(CC) $(CFLAGS) -c -o drivers/network/rtl8139.o drivers/network/rtl8139.c + libc/string.o: libc/string.c libc/string.h $(CC) $(CFLAGS) -c -o libc/string.o libc/string.c @@ -139,19 +143,19 @@ clean: drivers/*.o drivers/*/*.o drivers/*/*/*.o gui/*.o run-qemu-hd: image.bin - qemu-system-i386 -cpu 486 -net nic,model=ne2k_pci -d guest_errors -m 32 -drive "file=image.bin,if=ide,format=raw" \ + qemu-system-i386 -cpu 486 -netdev user,id=net0,net=10.0.0.0/24,host=10.0.0.2,dhcpstart=10.0.0.16 -device rtl8139,netdev=net0-d guest_errors -m 32 -drive "file=image.bin,if=ide,format=raw" \ -serial file:serial.log run-qemu-usb: image.bin - qemu-system-i386 -cpu 486 -net nic,model=ne2k_pci -d guest_errors -m 32 -usb -usbdevice disk:/dev/sde \ + qemu-system-i386 -cpu 486 -netdev user,id=net0,net=10.0.0.0/24,host=10.0.0.2,dhcpstart=10.0.0.16 -device rtl8139,netdev=net0-d guest_errors -m 32 -usb -usbdevice disk:/dev/sde \ -serial file:serial.log run-qemu: image.bin - qemu-system-i386 -cpu 486 -net nic,model=ne2k_pci -d guest_errors -m 32 -drive "file=image.bin,if=floppy,format=raw" \ + qemu-system-i386 -cpu 486 -netdev user,id=net0,net=10.0.0.0/24,host=10.0.0.2,dhcpstart=10.0.0.16 -device rtl8139,netdev=net0 -d guest_errors -m 32 -drive "file=image.bin,if=floppy,format=raw" \ -serial file:serial.log run-qemu-debug: image.bin - qemu-system-i386 -cpu 486 -net nic,model=ne2k_pci -S -s -d guest_errors -m 32 -drive "file=image.bin,if=floppy,format=raw" \ + qemu-system-i386 -cpu 486 -netdev user,id=net0,net=10.0.0.0/24,host=10.0.0.2,dhcpstart=10.0.0.16 -device rtl8139,netdev=net0 -S -s -d guest_errors -m 32 -drive "file=image.bin,if=floppy,format=raw" \ -serial file:serial.log run-bochs: |