diff --git a/Makefile b/Makefile index 63d7061..8b1717d 100644 --- a/Makefile +++ b/Makefile @@ -30,6 +30,7 @@ clean: cargo clean --manifest-path drivers/e1000d/Cargo.toml cargo clean --manifest-path drivers/ps2d/Cargo.toml cargo clean --manifest-path drivers/pcid/Cargo.toml + cargo clean --manifest-path drivers/rtl8168d/Cargo.toml cargo clean --manifest-path drivers/vesad/Cargo.toml cargo clean --manifest-path programs/init/Cargo.toml cargo clean --manifest-path programs/ion/Cargo.toml @@ -77,6 +78,7 @@ update: cargo update --manifest-path drivers/e1000d/Cargo.toml cargo update --manifest-path drivers/ps2d/Cargo.toml cargo update --manifest-path drivers/pcid/Cargo.toml + cargo update --manifest-path drivers/rtl8168d/Cargo.toml cargo update --manifest-path drivers/vesad/Cargo.toml cargo update --manifest-path programs/init/Cargo.toml cargo update --manifest-path programs/ion/Cargo.toml @@ -320,6 +322,7 @@ filesystem/bin/%: schemes/%/Cargo.toml schemes/%/src/** $(BUILD)/libstd.rlib drivers: \ filesystem/bin/e1000d \ filesystem/bin/ps2d \ + filesystem/bin/rtl8168d \ filesystem/bin/vesad coreutils: \ diff --git a/bootloader/x86_64/config.asm b/bootloader/x86_64/config.asm index 8e3b220..a0fee01 100644 --- a/bootloader/x86_64/config.asm +++ b/bootloader/x86_64/config.asm @@ -4,8 +4,8 @@ USE16 align 512, db 0 config: - .xres: dw 0 - .yres: dw 0 + .xres: dw 1024 + .yres: dw 768 times 512 - ($ - config) db 0 diff --git a/filesystem/etc/init.rc b/filesystem/etc/init.rc index 75581a1..91ac88b 100644 --- a/filesystem/etc/init.rc +++ b/filesystem/etc/init.rc @@ -1,12 +1,12 @@ -vesad T T G T +vesad T T T G +stdio display:1 ps2d -stdio display:4 initfs:bin/pcid /etc/pcid.toml ethernetd #arpd ipd tcpd udpd -getty display:1 getty display:2 -#orbital display:3 +getty display:3 +#orbital display:4 diff --git a/filesystem/etc/net/dns b/filesystem/etc/net/dns index 4396cda..ddc18da 100644 --- a/filesystem/etc/net/dns +++ b/filesystem/etc/net/dns @@ -1 +1 @@ -10.0.2.3 +10.85.85.1 diff --git a/filesystem/etc/net/ip b/filesystem/etc/net/ip index b86c8a7..e3be50b 100644 --- a/filesystem/etc/net/ip +++ b/filesystem/etc/net/ip @@ -1 +1 @@ -10.0.2.15 +10.85.85.2 diff --git a/filesystem/etc/net/ip_router b/filesystem/etc/net/ip_router index 2e66646..ddc18da 100644 --- a/filesystem/etc/net/ip_router +++ b/filesystem/etc/net/ip_router @@ -1 +1 @@ -10.0.2.2 +10.85.85.1 diff --git a/filesystem/etc/net/mac b/filesystem/etc/net/mac index 9fb01a8..6d2055d 100644 --- a/filesystem/etc/net/mac +++ b/filesystem/etc/net/mac @@ -1 +1 @@ -52.54.00.12.34.56 +08.9E.01.DD.45.AF diff --git a/filesystem/etc/pcid.toml b/filesystem/etc/pcid.toml index 2aee667..2192fe8 100644 --- a/filesystem/etc/pcid.toml +++ b/filesystem/etc/pcid.toml @@ -4,3 +4,10 @@ class = 2 vendor = 32902 device = 4110 command = ["file:bin/e1000d", "$BAR0", "$IRQ"] + +[[drivers]] +name = "RTL8168 NIC" +class = 2 +vendor = 4332 +device = 33128 +command = ["file:bin/rtl8168d", "$BAR2", "$IRQ"]