From 887412daf5ccc18760f151a5a8677e7a5dfa71ad Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Wed, 28 Feb 2024 21:36:43 +0100
Subject: [PATCH] Move all graphics related drivers to graphics/

---
 Cargo.toml                                          | 10 +++++-----
 {bgad => graphics/bgad}/Cargo.toml                  |  2 +-
 {bgad => graphics/bgad}/config.toml                 |  0
 {bgad => graphics/bgad}/src/bga.rs                  |  0
 {bgad => graphics/bgad}/src/main.rs                 |  0
 {bgad => graphics/bgad}/src/scheme.rs               |  0
 {fbcond => graphics/fbcond}/Cargo.toml              |  2 +-
 {fbcond => graphics/fbcond}/src/display.rs          |  0
 {fbcond => graphics/fbcond}/src/main.rs             |  0
 {fbcond => graphics/fbcond}/src/scheme.rs           |  0
 {fbcond => graphics/fbcond}/src/text.rs             |  0
 {vesad => graphics/vesad}/Cargo.toml                |  4 ++--
 {vesad => graphics/vesad}/src/display.rs            |  0
 {vesad => graphics/vesad}/src/framebuffer.rs        |  0
 {vesad => graphics/vesad}/src/main.rs               |  0
 {vesad => graphics/vesad}/src/scheme.rs             |  0
 {vesad => graphics/vesad}/src/screen.rs             |  0
 {virtio-gpud => graphics/virtio-gpud}/Cargo.toml    |  8 ++++----
 {virtio-gpud => graphics/virtio-gpud}/src/main.rs   |  0
 {virtio-gpud => graphics/virtio-gpud}/src/scheme.rs |  0
 20 files changed, 13 insertions(+), 13 deletions(-)
 rename {bgad => graphics/bgad}/Cargo.toml (81%)
 rename {bgad => graphics/bgad}/config.toml (100%)
 rename {bgad => graphics/bgad}/src/bga.rs (100%)
 rename {bgad => graphics/bgad}/src/main.rs (100%)
 rename {bgad => graphics/bgad}/src/scheme.rs (100%)
 rename {fbcond => graphics/fbcond}/Cargo.toml (85%)
 rename {fbcond => graphics/fbcond}/src/display.rs (100%)
 rename {fbcond => graphics/fbcond}/src/main.rs (100%)
 rename {fbcond => graphics/fbcond}/src/scheme.rs (100%)
 rename {fbcond => graphics/fbcond}/src/text.rs (100%)
 rename {vesad => graphics/vesad}/Cargo.toml (72%)
 rename {vesad => graphics/vesad}/src/display.rs (100%)
 rename {vesad => graphics/vesad}/src/framebuffer.rs (100%)
 rename {vesad => graphics/vesad}/src/main.rs (100%)
 rename {vesad => graphics/vesad}/src/scheme.rs (100%)
 rename {vesad => graphics/vesad}/src/screen.rs (100%)
 rename {virtio-gpud => graphics/virtio-gpud}/Cargo.toml (70%)
 rename {virtio-gpud => graphics/virtio-gpud}/src/main.rs (100%)
 rename {virtio-gpud => graphics/virtio-gpud}/src/scheme.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index f671f18059..b489a829a7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,19 +1,14 @@
 [workspace]
 members = [
     "acpid",
-    "bgad",
     "common",
-    "fbcond",
     "pcid",
     "ps2d",
     "vboxd",
-    "vesad",
     "xhcid",
     "usbctl",
     "usbhidd",
     "inputd",
-
-    "virtio-gpud",
     "virtio-core",
 
     "audio/ac97d",
@@ -21,6 +16,11 @@ members = [
     "audio/pcspkrd",
     "audio/sb16d",
 
+    "graphics/bgad",
+    "graphics/fbcond",
+    "graphics/vesad",
+    "graphics/virtio-gpud",
+
     "net/alxd",
     "net/driver-network",
     "net/e1000d",
diff --git a/bgad/Cargo.toml b/graphics/bgad/Cargo.toml
similarity index 81%
rename from bgad/Cargo.toml
rename to graphics/bgad/Cargo.toml
index 596bf0f54d..afa6619215 100644
--- a/bgad/Cargo.toml
+++ b/graphics/bgad/Cargo.toml
@@ -8,4 +8,4 @@ orbclient = "0.3.27"
 redox-daemon = "0.1"
 redox_syscall = "0.4"
 
-pcid = { path = "../pcid" }
+pcid = { path = "../../pcid" }
diff --git a/bgad/config.toml b/graphics/bgad/config.toml
similarity index 100%
rename from bgad/config.toml
rename to graphics/bgad/config.toml
diff --git a/bgad/src/bga.rs b/graphics/bgad/src/bga.rs
similarity index 100%
rename from bgad/src/bga.rs
rename to graphics/bgad/src/bga.rs
diff --git a/bgad/src/main.rs b/graphics/bgad/src/main.rs
similarity index 100%
rename from bgad/src/main.rs
rename to graphics/bgad/src/main.rs
diff --git a/bgad/src/scheme.rs b/graphics/bgad/src/scheme.rs
similarity index 100%
rename from bgad/src/scheme.rs
rename to graphics/bgad/src/scheme.rs
diff --git a/fbcond/Cargo.toml b/graphics/fbcond/Cargo.toml
similarity index 85%
rename from fbcond/Cargo.toml
rename to graphics/fbcond/Cargo.toml
index 465876c071..d934921104 100644
--- a/fbcond/Cargo.toml
+++ b/graphics/fbcond/Cargo.toml
@@ -10,7 +10,7 @@ redox_event = "0.2"
 redox_syscall = "0.4"
 redox-daemon = "0.1"
 
-inputd = { path = "../inputd" }
+inputd = { path = "../../inputd" }
 
 [features]
 default = []
diff --git a/fbcond/src/display.rs b/graphics/fbcond/src/display.rs
similarity index 100%
rename from fbcond/src/display.rs
rename to graphics/fbcond/src/display.rs
diff --git a/fbcond/src/main.rs b/graphics/fbcond/src/main.rs
similarity index 100%
rename from fbcond/src/main.rs
rename to graphics/fbcond/src/main.rs
diff --git a/fbcond/src/scheme.rs b/graphics/fbcond/src/scheme.rs
similarity index 100%
rename from fbcond/src/scheme.rs
rename to graphics/fbcond/src/scheme.rs
diff --git a/fbcond/src/text.rs b/graphics/fbcond/src/text.rs
similarity index 100%
rename from fbcond/src/text.rs
rename to graphics/fbcond/src/text.rs
diff --git a/vesad/Cargo.toml b/graphics/vesad/Cargo.toml
similarity index 72%
rename from vesad/Cargo.toml
rename to graphics/vesad/Cargo.toml
index 85d12fc9fb..5d6542ccf5 100644
--- a/vesad/Cargo.toml
+++ b/graphics/vesad/Cargo.toml
@@ -9,8 +9,8 @@ ransid = "0.4"
 redox_syscall = "0.4"
 redox-daemon = "0.1"
 
-common = { path = "../common" }
-inputd = { path = "../inputd" }
+common = { path = "../../common" }
+inputd = { path = "../../inputd" }
 
 [features]
 default = []
diff --git a/vesad/src/display.rs b/graphics/vesad/src/display.rs
similarity index 100%
rename from vesad/src/display.rs
rename to graphics/vesad/src/display.rs
diff --git a/vesad/src/framebuffer.rs b/graphics/vesad/src/framebuffer.rs
similarity index 100%
rename from vesad/src/framebuffer.rs
rename to graphics/vesad/src/framebuffer.rs
diff --git a/vesad/src/main.rs b/graphics/vesad/src/main.rs
similarity index 100%
rename from vesad/src/main.rs
rename to graphics/vesad/src/main.rs
diff --git a/vesad/src/scheme.rs b/graphics/vesad/src/scheme.rs
similarity index 100%
rename from vesad/src/scheme.rs
rename to graphics/vesad/src/scheme.rs
diff --git a/vesad/src/screen.rs b/graphics/vesad/src/screen.rs
similarity index 100%
rename from vesad/src/screen.rs
rename to graphics/vesad/src/screen.rs
diff --git a/virtio-gpud/Cargo.toml b/graphics/virtio-gpud/Cargo.toml
similarity index 70%
rename from virtio-gpud/Cargo.toml
rename to graphics/virtio-gpud/Cargo.toml
index 41fd2a69b5..a51e8b5a7a 100644
--- a/virtio-gpud/Cargo.toml
+++ b/graphics/virtio-gpud/Cargo.toml
@@ -11,10 +11,10 @@ futures = { version = "0.3.28", features = ["executor"] }
 anyhow = "1.0.71"
 paste = "1.0.13"
 
-common = { path = "../common" }
-virtio-core = { path = "../virtio-core" }
-pcid = { path = "../pcid" }
-inputd = { path = "../inputd" }
+common = { path = "../../common" }
+virtio-core = { path = "../../virtio-core" }
+pcid = { path = "../../pcid" }
+inputd = { path = "../../inputd" }
 
 redox-daemon = "0.1"
 redox_syscall = "0.4"
diff --git a/virtio-gpud/src/main.rs b/graphics/virtio-gpud/src/main.rs
similarity index 100%
rename from virtio-gpud/src/main.rs
rename to graphics/virtio-gpud/src/main.rs
diff --git a/virtio-gpud/src/scheme.rs b/graphics/virtio-gpud/src/scheme.rs
similarity index 100%
rename from virtio-gpud/src/scheme.rs
rename to graphics/virtio-gpud/src/scheme.rs