From e36b0a8e944b08aae1d25b56407a4376137e74dd Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Wed, 28 Feb 2024 20:53:16 +0100
Subject: [PATCH] Move all network drivers to net/

---
 Cargo.toml                                        | 15 ++++++++-------
 {alxd => net/alxd}/Cargo.toml                     |  2 +-
 {alxd => net/alxd}/src/device/mod.rs              |  0
 {alxd => net/alxd}/src/device/regs.rs             |  0
 {alxd => net/alxd}/src/main.rs                    |  0
 {driver-network => net/driver-network}/Cargo.toml |  0
 {driver-network => net/driver-network}/src/lib.rs |  0
 {e1000d => net/e1000d}/Cargo.toml                 |  4 ++--
 {e1000d => net/e1000d}/config.toml                |  0
 {e1000d => net/e1000d}/src/device.rs              |  0
 {e1000d => net/e1000d}/src/main.rs                |  0
 {ixgbed => net/ixgbed}/Cargo.toml                 |  4 ++--
 {ixgbed => net/ixgbed}/LICENSE                    |  0
 {ixgbed => net/ixgbed}/README.md                  |  0
 {ixgbed => net/ixgbed}/config.toml                |  0
 {ixgbed => net/ixgbed}/src/device.rs              |  0
 {ixgbed => net/ixgbed}/src/ixgbe.rs               |  0
 {ixgbed => net/ixgbed}/src/main.rs                |  0
 {rtl8139d => net/rtl8139d}/Cargo.toml             |  4 ++--
 {rtl8139d => net/rtl8139d}/config.toml            |  0
 {rtl8139d => net/rtl8139d}/src/device.rs          |  0
 {rtl8139d => net/rtl8139d}/src/main.rs            |  0
 {rtl8168d => net/rtl8168d}/Cargo.toml             |  4 ++--
 {rtl8168d => net/rtl8168d}/config.toml            |  0
 {rtl8168d => net/rtl8168d}/src/device.rs          |  0
 {rtl8168d => net/rtl8168d}/src/main.rs            |  0
 {virtio-netd => net/virtio-netd}/Cargo.toml       |  6 +++---
 {virtio-netd => net/virtio-netd}/config.toml      |  0
 {virtio-netd => net/virtio-netd}/src/main.rs      |  0
 {virtio-netd => net/virtio-netd}/src/scheme.rs    |  0
 30 files changed, 20 insertions(+), 19 deletions(-)
 rename {alxd => net/alxd}/Cargo.toml (85%)
 rename {alxd => net/alxd}/src/device/mod.rs (100%)
 rename {alxd => net/alxd}/src/device/regs.rs (100%)
 rename {alxd => net/alxd}/src/main.rs (100%)
 rename {driver-network => net/driver-network}/Cargo.toml (100%)
 rename {driver-network => net/driver-network}/src/lib.rs (100%)
 rename {e1000d => net/e1000d}/Cargo.toml (79%)
 rename {e1000d => net/e1000d}/config.toml (100%)
 rename {e1000d => net/e1000d}/src/device.rs (100%)
 rename {e1000d => net/e1000d}/src/main.rs (100%)
 rename {ixgbed => net/ixgbed}/Cargo.toml (79%)
 rename {ixgbed => net/ixgbed}/LICENSE (100%)
 rename {ixgbed => net/ixgbed}/README.md (100%)
 rename {ixgbed => net/ixgbed}/config.toml (100%)
 rename {ixgbed => net/ixgbed}/src/device.rs (100%)
 rename {ixgbed => net/ixgbed}/src/ixgbe.rs (100%)
 rename {ixgbed => net/ixgbed}/src/main.rs (100%)
 rename {rtl8139d => net/rtl8139d}/Cargo.toml (81%)
 rename {rtl8139d => net/rtl8139d}/config.toml (100%)
 rename {rtl8139d => net/rtl8139d}/src/device.rs (100%)
 rename {rtl8139d => net/rtl8139d}/src/main.rs (100%)
 rename {rtl8168d => net/rtl8168d}/Cargo.toml (81%)
 rename {rtl8168d => net/rtl8168d}/config.toml (100%)
 rename {rtl8168d => net/rtl8168d}/src/device.rs (100%)
 rename {rtl8168d => net/rtl8168d}/src/main.rs (100%)
 rename {virtio-netd => net/virtio-netd}/Cargo.toml (71%)
 rename {virtio-netd => net/virtio-netd}/config.toml (100%)
 rename {virtio-netd => net/virtio-netd}/src/main.rs (100%)
 rename {virtio-netd => net/virtio-netd}/src/scheme.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 2d7456de34..8982e528b9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,23 +3,17 @@ members = [
     "ac97d",
     "acpid",
     "ahcid",
-    "alxd",
     "bgad",
     "block-io-wrapper",
     "common",
-    "driver-network",
-    "e1000d",
     "fbcond",
     "ided",
     "ihdad",
-    "ixgbed",
     "nvmed",
     "lived", # TODO: not really a driver...
     "pcid",
     "pcspkrd",
     "ps2d",
-    "rtl8139d",
-    "rtl8168d",
     "sb16d",
     "vboxd",
     "vesad",
@@ -30,10 +24,17 @@ members = [
     "inputd",
 
     "virtio-blkd",
-    "virtio-netd",
     "virtio-gpud",
     "virtio-core",
 
+    "net/alxd",
+    "net/driver-network",
+    "net/e1000d",
+    "net/ixgbed",
+    "net/rtl8139d",
+    "net/rtl8168d",
+    "net/virtio-netd",
+
     "bcm2835-sdhcid",
 ]
 
diff --git a/alxd/Cargo.toml b/net/alxd/Cargo.toml
similarity index 85%
rename from alxd/Cargo.toml
rename to net/alxd/Cargo.toml
index 3b509dbf64..4a3ed09f03 100644
--- a/alxd/Cargo.toml
+++ b/net/alxd/Cargo.toml
@@ -9,4 +9,4 @@ redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git" }
 redox_syscall = "0.4"
 redox-daemon = "0.1"
 
-common = { path = "../common" }
+common = { path = "../../common" }
diff --git a/alxd/src/device/mod.rs b/net/alxd/src/device/mod.rs
similarity index 100%
rename from alxd/src/device/mod.rs
rename to net/alxd/src/device/mod.rs
diff --git a/alxd/src/device/regs.rs b/net/alxd/src/device/regs.rs
similarity index 100%
rename from alxd/src/device/regs.rs
rename to net/alxd/src/device/regs.rs
diff --git a/alxd/src/main.rs b/net/alxd/src/main.rs
similarity index 100%
rename from alxd/src/main.rs
rename to net/alxd/src/main.rs
diff --git a/driver-network/Cargo.toml b/net/driver-network/Cargo.toml
similarity index 100%
rename from driver-network/Cargo.toml
rename to net/driver-network/Cargo.toml
diff --git a/driver-network/src/lib.rs b/net/driver-network/src/lib.rs
similarity index 100%
rename from driver-network/src/lib.rs
rename to net/driver-network/src/lib.rs
diff --git a/e1000d/Cargo.toml b/net/e1000d/Cargo.toml
similarity index 79%
rename from e1000d/Cargo.toml
rename to net/e1000d/Cargo.toml
index 023d95b5d4..395a6341cc 100644
--- a/e1000d/Cargo.toml
+++ b/net/e1000d/Cargo.toml
@@ -9,6 +9,6 @@ redox-daemon = "0.1"
 redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git" }
 redox_syscall = "0.4"
 
-common = { path = "../common" }
+common = { path = "../../common" }
 driver-network = { path = "../driver-network" }
-pcid = { path = "../pcid" }
+pcid = { path = "../../pcid" }
diff --git a/e1000d/config.toml b/net/e1000d/config.toml
similarity index 100%
rename from e1000d/config.toml
rename to net/e1000d/config.toml
diff --git a/e1000d/src/device.rs b/net/e1000d/src/device.rs
similarity index 100%
rename from e1000d/src/device.rs
rename to net/e1000d/src/device.rs
diff --git a/e1000d/src/main.rs b/net/e1000d/src/main.rs
similarity index 100%
rename from e1000d/src/main.rs
rename to net/e1000d/src/main.rs
diff --git a/ixgbed/Cargo.toml b/net/ixgbed/Cargo.toml
similarity index 79%
rename from ixgbed/Cargo.toml
rename to net/ixgbed/Cargo.toml
index c9399ace7d..fd3258fa00 100644
--- a/ixgbed/Cargo.toml
+++ b/net/ixgbed/Cargo.toml
@@ -9,6 +9,6 @@ redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git" }
 redox_syscall = "0.4"
 redox-daemon = "0.1"
 
-common = { path = "../common" }
+common = { path = "../../common" }
 driver-network = { path = "../driver-network" }
-pcid = { path = "../pcid" }
+pcid = { path = "../../pcid" }
diff --git a/ixgbed/LICENSE b/net/ixgbed/LICENSE
similarity index 100%
rename from ixgbed/LICENSE
rename to net/ixgbed/LICENSE
diff --git a/ixgbed/README.md b/net/ixgbed/README.md
similarity index 100%
rename from ixgbed/README.md
rename to net/ixgbed/README.md
diff --git a/ixgbed/config.toml b/net/ixgbed/config.toml
similarity index 100%
rename from ixgbed/config.toml
rename to net/ixgbed/config.toml
diff --git a/ixgbed/src/device.rs b/net/ixgbed/src/device.rs
similarity index 100%
rename from ixgbed/src/device.rs
rename to net/ixgbed/src/device.rs
diff --git a/ixgbed/src/ixgbe.rs b/net/ixgbed/src/ixgbe.rs
similarity index 100%
rename from ixgbed/src/ixgbe.rs
rename to net/ixgbed/src/ixgbe.rs
diff --git a/ixgbed/src/main.rs b/net/ixgbed/src/main.rs
similarity index 100%
rename from ixgbed/src/main.rs
rename to net/ixgbed/src/main.rs
diff --git a/rtl8139d/Cargo.toml b/net/rtl8139d/Cargo.toml
similarity index 81%
rename from rtl8139d/Cargo.toml
rename to net/rtl8139d/Cargo.toml
index b03dcea6ef..2ff86321ab 100644
--- a/rtl8139d/Cargo.toml
+++ b/net/rtl8139d/Cargo.toml
@@ -11,6 +11,6 @@ redox_syscall = "0.4"
 redox-daemon = "0.1"
 redox-log = "0.1"
 
-common = { path = "../common" }
+common = { path = "../../common" }
 driver-network = { path = "../driver-network" }
-pcid = { path = "../pcid" }
+pcid = { path = "../../pcid" }
diff --git a/rtl8139d/config.toml b/net/rtl8139d/config.toml
similarity index 100%
rename from rtl8139d/config.toml
rename to net/rtl8139d/config.toml
diff --git a/rtl8139d/src/device.rs b/net/rtl8139d/src/device.rs
similarity index 100%
rename from rtl8139d/src/device.rs
rename to net/rtl8139d/src/device.rs
diff --git a/rtl8139d/src/main.rs b/net/rtl8139d/src/main.rs
similarity index 100%
rename from rtl8139d/src/main.rs
rename to net/rtl8139d/src/main.rs
diff --git a/rtl8168d/Cargo.toml b/net/rtl8168d/Cargo.toml
similarity index 81%
rename from rtl8168d/Cargo.toml
rename to net/rtl8168d/Cargo.toml
index ca59181391..3ec1bdfbcf 100644
--- a/rtl8168d/Cargo.toml
+++ b/net/rtl8168d/Cargo.toml
@@ -11,6 +11,6 @@ redox_syscall = "0.4"
 redox-daemon = "0.1"
 redox-log = "0.1"
 
-common = { path = "../common" }
+common = { path = "../../common" }
 driver-network = { path = "../driver-network" }
-pcid = { path = "../pcid" }
+pcid = { path = "../../pcid" }
diff --git a/rtl8168d/config.toml b/net/rtl8168d/config.toml
similarity index 100%
rename from rtl8168d/config.toml
rename to net/rtl8168d/config.toml
diff --git a/rtl8168d/src/device.rs b/net/rtl8168d/src/device.rs
similarity index 100%
rename from rtl8168d/src/device.rs
rename to net/rtl8168d/src/device.rs
diff --git a/rtl8168d/src/main.rs b/net/rtl8168d/src/main.rs
similarity index 100%
rename from rtl8168d/src/main.rs
rename to net/rtl8168d/src/main.rs
diff --git a/virtio-netd/Cargo.toml b/net/virtio-netd/Cargo.toml
similarity index 71%
rename from virtio-netd/Cargo.toml
rename to net/virtio-netd/Cargo.toml
index dc622bae92..e1063e7414 100644
--- a/virtio-netd/Cargo.toml
+++ b/net/virtio-netd/Cargo.toml
@@ -8,9 +8,9 @@ log = "0.4"
 static_assertions = "1.1.0"
 futures = { version = "0.3.28", features = ["executor"] }
 
-virtio-core = { path = "../virtio-core" }
-pcid = { path = "../pcid" }
-common = { path = "../common" }
+virtio-core = { path = "../../virtio-core" }
+pcid = { path = "../../pcid" }
+common = { path = "../../common" }
 driver-network = { path = "../driver-network" }
 
 redox-daemon = "0.1"
diff --git a/virtio-netd/config.toml b/net/virtio-netd/config.toml
similarity index 100%
rename from virtio-netd/config.toml
rename to net/virtio-netd/config.toml
diff --git a/virtio-netd/src/main.rs b/net/virtio-netd/src/main.rs
similarity index 100%
rename from virtio-netd/src/main.rs
rename to net/virtio-netd/src/main.rs
diff --git a/virtio-netd/src/scheme.rs b/net/virtio-netd/src/scheme.rs
similarity index 100%
rename from virtio-netd/src/scheme.rs
rename to net/virtio-netd/src/scheme.rs