From 0789069afc5b8ca6b6e9ba7d6077c1ad8ac602fc Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Tue, 24 Dec 2024 14:58:39 +0100
Subject: [PATCH] input: Move all input drivers to a subdirectory

---
 Cargo.toml                               | 5 +++--
 {ps2d => input/ps2d}/.gitignore          | 0
 {ps2d => input/ps2d}/Cargo.toml          | 2 +-
 {ps2d => input/ps2d}/src/controller.rs   | 0
 {ps2d => input/ps2d}/src/keymap.rs       | 0
 {ps2d => input/ps2d}/src/main.rs         | 0
 {ps2d => input/ps2d}/src/state.rs        | 0
 {ps2d => input/ps2d}/src/vm.rs           | 0
 {usbhidd => input/usbhidd}/.gitignore    | 0
 {usbhidd => input/usbhidd}/Cargo.toml    | 4 ++--
 {usbhidd => input/usbhidd}/src/keymap.rs | 0
 {usbhidd => input/usbhidd}/src/main.rs   | 0
 {usbhidd => input/usbhidd}/src/reqs.rs   | 0
 13 files changed, 6 insertions(+), 5 deletions(-)
 rename {ps2d => input/ps2d}/.gitignore (100%)
 rename {ps2d => input/ps2d}/Cargo.toml (84%)
 rename {ps2d => input/ps2d}/src/controller.rs (100%)
 rename {ps2d => input/ps2d}/src/keymap.rs (100%)
 rename {ps2d => input/ps2d}/src/main.rs (100%)
 rename {ps2d => input/ps2d}/src/state.rs (100%)
 rename {ps2d => input/ps2d}/src/vm.rs (100%)
 rename {usbhidd => input/usbhidd}/.gitignore (100%)
 rename {usbhidd => input/usbhidd}/Cargo.toml (84%)
 rename {usbhidd => input/usbhidd}/src/keymap.rs (100%)
 rename {usbhidd => input/usbhidd}/src/main.rs (100%)
 rename {usbhidd => input/usbhidd}/src/reqs.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index ed8c1bd82f..a8d2519edb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,12 +4,10 @@ members = [
     "common",
     "hwd",
     "pcid",
-    "ps2d",
     "vboxd",
     "xhcid",
     "usbctl",
     "usbhubd",
-    "usbhidd",
     "inputd",
     "virtio-core",
 
@@ -23,6 +21,9 @@ members = [
     "graphics/vesad",
     "graphics/virtio-gpud",
 
+    "input/ps2d",
+    "input/usbhidd",
+
     "net/alxd",
     "net/driver-network",
     "net/e1000d",
diff --git a/ps2d/.gitignore b/input/ps2d/.gitignore
similarity index 100%
rename from ps2d/.gitignore
rename to input/ps2d/.gitignore
diff --git a/ps2d/Cargo.toml b/input/ps2d/Cargo.toml
similarity index 84%
rename from ps2d/Cargo.toml
rename to input/ps2d/Cargo.toml
index 78f9dbe207..233e027e6f 100644
--- a/ps2d/Cargo.toml
+++ b/input/ps2d/Cargo.toml
@@ -11,4 +11,4 @@ redox_syscall = "0.5"
 redox-daemon = "0.1"
 libredox = "0.1.3"
 
-common = { path = "../common" }
+common = { path = "../../common" }
diff --git a/ps2d/src/controller.rs b/input/ps2d/src/controller.rs
similarity index 100%
rename from ps2d/src/controller.rs
rename to input/ps2d/src/controller.rs
diff --git a/ps2d/src/keymap.rs b/input/ps2d/src/keymap.rs
similarity index 100%
rename from ps2d/src/keymap.rs
rename to input/ps2d/src/keymap.rs
diff --git a/ps2d/src/main.rs b/input/ps2d/src/main.rs
similarity index 100%
rename from ps2d/src/main.rs
rename to input/ps2d/src/main.rs
diff --git a/ps2d/src/state.rs b/input/ps2d/src/state.rs
similarity index 100%
rename from ps2d/src/state.rs
rename to input/ps2d/src/state.rs
diff --git a/ps2d/src/vm.rs b/input/ps2d/src/vm.rs
similarity index 100%
rename from ps2d/src/vm.rs
rename to input/ps2d/src/vm.rs
diff --git a/usbhidd/.gitignore b/input/usbhidd/.gitignore
similarity index 100%
rename from usbhidd/.gitignore
rename to input/usbhidd/.gitignore
diff --git a/usbhidd/Cargo.toml b/input/usbhidd/Cargo.toml
similarity index 84%
rename from usbhidd/Cargo.toml
rename to input/usbhidd/Cargo.toml
index 52a7b01ce9..0d5929a857 100644
--- a/usbhidd/Cargo.toml
+++ b/input/usbhidd/Cargo.toml
@@ -13,6 +13,6 @@ log = "0.4"
 orbclient = "0.3.47"
 redox_syscall = "0.5"
 rehid = { git = "https://gitlab.redox-os.org/redox-os/rehid.git" }
-xhcid = { path = "../xhcid" }
+xhcid = { path = "../../xhcid" }
 
-common = { path = "../common" }
+common = { path = "../../common" }
diff --git a/usbhidd/src/keymap.rs b/input/usbhidd/src/keymap.rs
similarity index 100%
rename from usbhidd/src/keymap.rs
rename to input/usbhidd/src/keymap.rs
diff --git a/usbhidd/src/main.rs b/input/usbhidd/src/main.rs
similarity index 100%
rename from usbhidd/src/main.rs
rename to input/usbhidd/src/main.rs
diff --git a/usbhidd/src/reqs.rs b/input/usbhidd/src/reqs.rs
similarity index 100%
rename from usbhidd/src/reqs.rs
rename to input/usbhidd/src/reqs.rs