From e70bdc838ae9d555911f81f14d84025192a3dbd5 Mon Sep 17 00:00:00 2001
From: Simon Ellmann <simon.ellmann@tum.de>
Date: Tue, 2 Jul 2019 14:38:57 +0200
Subject: [PATCH] Split filesystem.toml into separate config.toml for each
 driver

---
 e1000d/config.toml   |  6 +++++
 filesystem.toml      | 52 --------------------------------------------
 ihdad/config.toml    |  6 +++++
 ixgbed               |  2 +-
 rtl8168d/config.toml |  6 +++++
 5 files changed, 19 insertions(+), 53 deletions(-)
 create mode 100644 e1000d/config.toml
 create mode 100644 ihdad/config.toml
 create mode 100644 rtl8168d/config.toml

diff --git a/e1000d/config.toml b/e1000d/config.toml
new file mode 100644
index 0000000000..0f5f3339b3
--- /dev/null
+++ b/e1000d/config.toml
@@ -0,0 +1,6 @@
+[[drivers]]
+name = "E1000 NIC"
+class = 2
+ids = { 0x8086 = [0x1004, 0x100e, 0x100f, 0x1503] }
+command = ["e1000d", "$NAME", "$BAR0", "$IRQ"]
+
diff --git a/filesystem.toml b/filesystem.toml
index 8362313d0f..20871a0272 100644
--- a/filesystem.toml
+++ b/filesystem.toml
@@ -1,57 +1,5 @@
 ## Drivers for FS ##
 
-# ixgbed
-[[drivers]]
-name = "Intel 10G X550T NIC"
-class = 2
-vendor = 32902
-device = 5475
-command = ["ixgbed", "$NAME", "$BAR0", "$IRQ"]
-
-# e1000d
-[[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"]
-
-# ihdad
-[[drivers]]
-name = "Intel HD Audio"
-class = 4
-subclass = 3
-command = ["ihdad", "$NAME", "$BAR0", "$IRQ", "$VENID", "$DEVID"]
-
-# rtl8168d
-[[drivers]]
-name = "RTL8168 NIC"
-class = 2
-vendor = 4332
-device = 33128
-command = ["rtl8168d", "$NAME", "$BAR2", "$IRQ"]
-
 # xhcid
 # [[drivers]]
 # name = "XHCI"
diff --git a/ihdad/config.toml b/ihdad/config.toml
new file mode 100644
index 0000000000..2bee08c1f4
--- /dev/null
+++ b/ihdad/config.toml
@@ -0,0 +1,6 @@
+[[drivers]]
+name = "Intel HD Audio"
+class = 4
+subclass = 3
+command = ["ihdad", "$NAME", "$BAR0", "$IRQ", "$VENID", "$DEVID"]
+
diff --git a/ixgbed b/ixgbed
index 50154bdbde..26c0142179 160000
--- a/ixgbed
+++ b/ixgbed
@@ -1 +1 @@
-Subproject commit 50154bdbde634e9ca872fa8edf413af076e31053
+Subproject commit 26c0142179a8fbcae22d1d48979681fe029c04e3
diff --git a/rtl8168d/config.toml b/rtl8168d/config.toml
new file mode 100644
index 0000000000..04a3626044
--- /dev/null
+++ b/rtl8168d/config.toml
@@ -0,0 +1,6 @@
+[[drivers]]
+name = "RTL8168 NIC"
+class = 2
+ids = { 0x10ec = [0x8168] }
+command = ["rtl8168d", "$NAME", "$BAR2", "$IRQ"]
+