From 734e21cb562b8b63dd5bc2faeed77cc495d4e816 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 10 May 2017 21:55:04 -0600 Subject: [PATCH] Use pcid.toml from drivers --- filesystem.toml | 48 ------------------------------------------------ initfs.toml | 37 ------------------------------------- 2 files changed, 85 deletions(-) diff --git a/filesystem.toml b/filesystem.toml index d876abe..f3f85d3 100644 --- a/filesystem.toml +++ b/filesystem.toml @@ -12,7 +12,6 @@ acid = {} binutils = {} contain = {} coreutils = {} -drivers = {} extrautils = {} games = {} init = {} @@ -52,7 +51,6 @@ path = "/etc/init.d/00_base" data = """ randd ptyd -pcid /etc/pcid.toml """ [[files]] @@ -127,49 +125,3 @@ data = """ Welcome to Redox OS! """ - -[[files]] -path = "/etc/pcid.toml" -data = """ -[[drivers]] -name = "82543GC NIC" -class = 2 -vendor = 32902 -device = 4100 -command = ["e1000d", "$NAME", "$BAR0", "$IRQ"] - -[[drivers]] -name = "82540EM NIC" -class = 2 -vendor = 32902 -device = 4110 -command = ["e1000d", "$NAME", "$BAR0", "$IRQ"] - -[[drivers]] -name = "82545EM NIC" -class = 2 -vendor = 32902 -device = 4111 -command = ["e1000d", "$NAME", "$BAR0", "$IRQ"] - -[[drivers]] -name = "82579V NIC" -class = 2 -vendor = 32902 -device = 5379 -command = ["e1000d", "$NAME", "$BAR0", "$IRQ"] - -[[drivers]] -name = "RTL8168 NIC" -class = 2 -vendor = 4332 -device = 33128 -command = ["rtl8168d", "$NAME", "$BAR2", "$IRQ"] - -[[drivers]] -name = "XHCI" -class = 12 -subclass = 3 -interface = 48 -command = ["xhcid", "$NAME", "$BAR0", "$IRQ"] -""" diff --git a/initfs.toml b/initfs.toml index c64b788..dcb005b 100644 --- a/initfs.toml +++ b/initfs.toml @@ -25,40 +25,3 @@ cd file: export PATH file:/bin run.d /etc/init.d """ - -[[files]] -path="/etc/pcid.toml" -data=""" -[[drivers]] -name = "AHCI storage" -class = 1 -subclass = 6 -command = ["ahcid", "$NAME", "$BAR5", "$IRQ"] - -[[drivers]] -name = "NVME storage" -class = 1 -subclass = 8 -command = ["nvmed", "$NAME", "$BAR0", "$IRQ"] - -[[drivers]] -name = "QEMU Graphics Array" -class = 3 -vendor = 4660 -device = 4369 -command = ["bgad", "$NAME", "$BAR0"] - -[[drivers]] -name = "VirtualBox Graphics Array" -class = 3 -vendor = 33006 -device = 48879 -command = ["bgad", "$NAME", "$BAR0"] - -[[drivers]] -name = "VirtualBox Guest Device" -class = 8 -vendor = 33006 -device = 51966 -command = ["vboxd", "$NAME", "$BAR0", "$BAR1", "$IRQ"] -"""