diff options
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | kernel/drivers/net.c | 63 | ||||
| -rw-r--r-- | kernel/drivers/pci.c | 2 | ||||
| -rwxr-xr-x | run | 3 |
4 files changed, 53 insertions, 16 deletions
@@ -66,6 +66,7 @@ Knowledge: - [James Molloy's tutorials](http://jamesmolloy.co.uk/tutorial_html/) - [virtix - tasking inspiration](https://github.com/16Bitt/virtix/) - [MIT License](https://github.com/16Bitt/virtix/blob/85a3c58f3d3b8932354e85a996a79c377139c201/LICENSE) - [studix - FS inspiration](https://github.com/orodley/studix) - [MIT License](https://github.com/orodley/studix/blob/d1b1d006010120551df58ff3faaf97484dfa9806/LICENSE) +- [ToAruOS - PCI and network driver inspiration](https://github.com/klange/toaruos) - [NCSA License](https://github.com/klange/toaruos/blob/351d5d38f22b570459931475d36468bf4e37f45a/LICENSE) Resources: diff --git a/kernel/drivers/net.c b/kernel/drivers/net.c index dfc3cd5..284b749 100644 --- a/kernel/drivers/net.c +++ b/kernel/drivers/net.c @@ -1,4 +1,6 @@ // MIT License, Copyright (c) 2020 Marvin Borner +// Uses parts of the ToAruOS Project, released under the terms of the NCSA +// Copyright (C) 2011-2018 K. Lange #include <cpu.h> #include <def.h> @@ -8,11 +10,13 @@ #include <pci.h> #include <print.h> -int rtl_irq = 0; -u8 mac[6]; -u8 *rtl_rx_buffer; -u32 rtl_device_pci = 0; -u32 rtl_iobase = 0; +static int rtl_irq = 0; +static u8 mac[6]; +static u8 *last_packet = NULL; +static u8 *rtl_rx_buffer; +static u32 rtl_device_pci = 0; +static u32 rtl_iobase = 0; +static u32 cur_rx = 0; void rtl8139_find(u32 device, u16 vendor_id, u16 device_id, void *extra) { @@ -24,16 +28,44 @@ void rtl8139_find(u32 device, u16 vendor_id, u16 device_id, void *extra) void rtl8139_irq_handler() { print("RTL INT!\n"); - u16 status = inw((u16)(rtl_iobase + 0x3E)); + u16 status = inw(rtl_iobase + 0x3E); if (!status) return; - outw((u16)(rtl_iobase + 0x3E), status); + outw(rtl_iobase + 0x3E, status); if (status & 0x01 || status & 0x02) { - print("RECEIVE\n"); - /* while ((inw((u16)(rtl_iobase + 0x37)) & 0x01) == 0) { */ - // RECEIVE - /* } */ + while ((inb(rtl_iobase + 0x37) & 0x01) == 0) { + print("RECEIVE\n"); + + int offset = cur_rx % 0x2000; + + u32 *buf_start = (u32 *)((u32)rtl_rx_buffer + offset); + u32 rx_status = buf_start[0]; + u32 rx_size = rx_status >> 16; + + if (rx_status & (0x0020 | 0x0010 | 0x0004 | 0x0002)) { + print("RX Error\n"); + } else { + u8 *buf_8 = (u8 *)&(buf_start[1]); + + last_packet = malloc(rx_size); + + u32 packet_end = (u32)buf_8 + rx_size; + if (packet_end > (u32)rtl_rx_buffer + 0x2000) { + u32 s = ((u32)rtl_rx_buffer + 0x2000) - (u32)buf_8; + memcpy(last_packet, buf_8, s); + memcpy((void *)((u32)last_packet + s), rtl_rx_buffer, + rx_size - s); + } else { + memcpy(last_packet, buf_8, rx_size); + } + + /* rtl_enqueue(last_packet); */ + } + + cur_rx = (cur_rx + rx_size + 4 + 3) & ~3; + outw(rtl_iobase + 0x3A, cur_rx - 16); + } } } @@ -71,7 +103,8 @@ void rtl8139_init() ; // Set receive buffer - rtl_rx_buffer = (u8 *)malloc(8192 + 16); + rtl_rx_buffer = (u8 *)malloc(0x3000); + memset(rtl_rx_buffer, 0x00, 0x3000); outl((u16)(rtl_iobase + 0x30), (u32)rtl_rx_buffer); // Enable ISR @@ -88,8 +121,8 @@ void net_install() { pci_scan(&rtl8139_find, -1, &rtl_device_pci); - if (rtl_device_pci) + if (rtl_device_pci) { print("Found rtl8139 card\n"); - - rtl8139_init(); + rtl8139_init(); + } } diff --git a/kernel/drivers/pci.c b/kernel/drivers/pci.c index 9c16601..6130cd0 100644 --- a/kernel/drivers/pci.c +++ b/kernel/drivers/pci.c @@ -1,4 +1,6 @@ // MIT License, Copyright (c) 2020 Marvin Borner +// Uses parts of the ToAruOS Project, released under the terms of the NCSA +// Copyright (C) 2011-2018 K. Lange #include <cpu.h> #include <def.h> @@ -11,7 +11,7 @@ network="rtl8139" # TODO: Support q35 chipset ('-machine q35') - loops in ide_wait qemu_with_flags() { - SDL_VIDEO_X11_DGAMOUSE=0 qemu-system-i386 -cpu max -no-reboot -vga std -rtc base=localtime -m 256M -smp 4 -net nic,model=${network},macaddr=42:42:42:42:42:42 -net user "$@" + SDL_VIDEO_X11_DGAMOUSE=0 qemu-system-i386 -cpu max -no-reboot -vga std -rtc base=localtime -m 256M -smp 4 -net nic,model=${network},macaddr=42:42:42:42:42:42 -net bridge,br=br0 "$@" } make_cross() { @@ -117,6 +117,7 @@ make_build() { } make_test() { + brctl show br0 >/dev/null || sudo brctl addbr br0 if [ "$mode" = "test" ]; then qemu_with_flags -serial file:test.log -nographic -drive file=build/disk.img,format=raw,index=1,media=disk & sleep 2 |