From 0e98dc4a053014ff907ebf020f0d8824253074b0 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Wed, 28 Feb 2024 21:30:02 +0100
Subject: [PATCH] Move all audio drivers to audio/

---
 Cargo.toml                                | 9 +++++----
 {ac97d => audio/ac97d}/Cargo.toml         | 4 ++--
 {ac97d => audio/ac97d}/config.toml        | 0
 {ac97d => audio/ac97d}/src/device.rs      | 0
 {ac97d => audio/ac97d}/src/main.rs        | 0
 {ihdad => audio/ihdad}/Cargo.toml         | 4 ++--
 {ihdad => audio/ihdad}/config.toml        | 0
 {ihdad => audio/ihdad}/src/hda/cmdbuff.rs | 0
 {ihdad => audio/ihdad}/src/hda/common.rs  | 0
 {ihdad => audio/ihdad}/src/hda/device.rs  | 0
 {ihdad => audio/ihdad}/src/hda/mod.rs     | 0
 {ihdad => audio/ihdad}/src/hda/node.rs    | 0
 {ihdad => audio/ihdad}/src/hda/stream.rs  | 0
 {ihdad => audio/ihdad}/src/main.rs        | 0
 {pcspkrd => audio/pcspkrd}/Cargo.toml     | 0
 {pcspkrd => audio/pcspkrd}/src/main.rs    | 0
 {pcspkrd => audio/pcspkrd}/src/pcspkr.rs  | 0
 {pcspkrd => audio/pcspkrd}/src/scheme.rs  | 0
 {sb16d => audio/sb16d}/Cargo.toml         | 2 +-
 {sb16d => audio/sb16d}/src/device.rs      | 0
 {sb16d => audio/sb16d}/src/main.rs        | 0
 21 files changed, 10 insertions(+), 9 deletions(-)
 rename {ac97d => audio/ac97d}/Cargo.toml (79%)
 rename {ac97d => audio/ac97d}/config.toml (100%)
 rename {ac97d => audio/ac97d}/src/device.rs (100%)
 rename {ac97d => audio/ac97d}/src/main.rs (100%)
 rename {ihdad => audio/ihdad}/Cargo.toml (79%)
 rename {ihdad => audio/ihdad}/config.toml (100%)
 rename {ihdad => audio/ihdad}/src/hda/cmdbuff.rs (100%)
 rename {ihdad => audio/ihdad}/src/hda/common.rs (100%)
 rename {ihdad => audio/ihdad}/src/hda/device.rs (100%)
 rename {ihdad => audio/ihdad}/src/hda/mod.rs (100%)
 rename {ihdad => audio/ihdad}/src/hda/node.rs (100%)
 rename {ihdad => audio/ihdad}/src/hda/stream.rs (100%)
 rename {ihdad => audio/ihdad}/src/main.rs (100%)
 rename {pcspkrd => audio/pcspkrd}/Cargo.toml (100%)
 rename {pcspkrd => audio/pcspkrd}/src/main.rs (100%)
 rename {pcspkrd => audio/pcspkrd}/src/pcspkr.rs (100%)
 rename {pcspkrd => audio/pcspkrd}/src/scheme.rs (100%)
 rename {sb16d => audio/sb16d}/Cargo.toml (87%)
 rename {sb16d => audio/sb16d}/src/device.rs (100%)
 rename {sb16d => audio/sb16d}/src/main.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 0d2e7110c8..f671f18059 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,15 +1,11 @@
 [workspace]
 members = [
-    "ac97d",
     "acpid",
     "bgad",
     "common",
     "fbcond",
-    "ihdad",
     "pcid",
-    "pcspkrd",
     "ps2d",
-    "sb16d",
     "vboxd",
     "vesad",
     "xhcid",
@@ -20,6 +16,11 @@ members = [
     "virtio-gpud",
     "virtio-core",
 
+    "audio/ac97d",
+    "audio/ihdad",
+    "audio/pcspkrd",
+    "audio/sb16d",
+
     "net/alxd",
     "net/driver-network",
     "net/e1000d",
diff --git a/ac97d/Cargo.toml b/audio/ac97d/Cargo.toml
similarity index 79%
rename from ac97d/Cargo.toml
rename to audio/ac97d/Cargo.toml
index 6a8c4a477f..4d780d5d99 100644
--- a/ac97d/Cargo.toml
+++ b/audio/ac97d/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2018"
 
 [dependencies]
 bitflags = "1"
-common = { path = "../common" }
+common = { path = "../../common" }
 log = "0.4"
 redox-daemon = "0.1"
 redox-log = "0.1"
@@ -13,4 +13,4 @@ redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git" }
 redox_syscall = "0.4"
 spin = "0.9"
 
-pcid = { path = "../pcid" }
+pcid = { path = "../../pcid" }
diff --git a/ac97d/config.toml b/audio/ac97d/config.toml
similarity index 100%
rename from ac97d/config.toml
rename to audio/ac97d/config.toml
diff --git a/ac97d/src/device.rs b/audio/ac97d/src/device.rs
similarity index 100%
rename from ac97d/src/device.rs
rename to audio/ac97d/src/device.rs
diff --git a/ac97d/src/main.rs b/audio/ac97d/src/main.rs
similarity index 100%
rename from ac97d/src/main.rs
rename to audio/ac97d/src/main.rs
diff --git a/ihdad/Cargo.toml b/audio/ihdad/Cargo.toml
similarity index 79%
rename from ihdad/Cargo.toml
rename to audio/ihdad/Cargo.toml
index 799e0aadb8..32f294d95a 100755
--- a/ihdad/Cargo.toml
+++ b/audio/ihdad/Cargo.toml
@@ -12,5 +12,5 @@ redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git" }
 redox_syscall = "0.4"
 spin = "0.9"
 
-common = { path = "../common" }
-pcid = { path = "../pcid" }
+common = { path = "../../common" }
+pcid = { path = "../../pcid" }
diff --git a/ihdad/config.toml b/audio/ihdad/config.toml
similarity index 100%
rename from ihdad/config.toml
rename to audio/ihdad/config.toml
diff --git a/ihdad/src/hda/cmdbuff.rs b/audio/ihdad/src/hda/cmdbuff.rs
similarity index 100%
rename from ihdad/src/hda/cmdbuff.rs
rename to audio/ihdad/src/hda/cmdbuff.rs
diff --git a/ihdad/src/hda/common.rs b/audio/ihdad/src/hda/common.rs
similarity index 100%
rename from ihdad/src/hda/common.rs
rename to audio/ihdad/src/hda/common.rs
diff --git a/ihdad/src/hda/device.rs b/audio/ihdad/src/hda/device.rs
similarity index 100%
rename from ihdad/src/hda/device.rs
rename to audio/ihdad/src/hda/device.rs
diff --git a/ihdad/src/hda/mod.rs b/audio/ihdad/src/hda/mod.rs
similarity index 100%
rename from ihdad/src/hda/mod.rs
rename to audio/ihdad/src/hda/mod.rs
diff --git a/ihdad/src/hda/node.rs b/audio/ihdad/src/hda/node.rs
similarity index 100%
rename from ihdad/src/hda/node.rs
rename to audio/ihdad/src/hda/node.rs
diff --git a/ihdad/src/hda/stream.rs b/audio/ihdad/src/hda/stream.rs
similarity index 100%
rename from ihdad/src/hda/stream.rs
rename to audio/ihdad/src/hda/stream.rs
diff --git a/ihdad/src/main.rs b/audio/ihdad/src/main.rs
similarity index 100%
rename from ihdad/src/main.rs
rename to audio/ihdad/src/main.rs
diff --git a/pcspkrd/Cargo.toml b/audio/pcspkrd/Cargo.toml
similarity index 100%
rename from pcspkrd/Cargo.toml
rename to audio/pcspkrd/Cargo.toml
diff --git a/pcspkrd/src/main.rs b/audio/pcspkrd/src/main.rs
similarity index 100%
rename from pcspkrd/src/main.rs
rename to audio/pcspkrd/src/main.rs
diff --git a/pcspkrd/src/pcspkr.rs b/audio/pcspkrd/src/pcspkr.rs
similarity index 100%
rename from pcspkrd/src/pcspkr.rs
rename to audio/pcspkrd/src/pcspkr.rs
diff --git a/pcspkrd/src/scheme.rs b/audio/pcspkrd/src/scheme.rs
similarity index 100%
rename from pcspkrd/src/scheme.rs
rename to audio/pcspkrd/src/scheme.rs
diff --git a/sb16d/Cargo.toml b/audio/sb16d/Cargo.toml
similarity index 87%
rename from sb16d/Cargo.toml
rename to audio/sb16d/Cargo.toml
index fc49b61b26..ccabfa3514 100644
--- a/sb16d/Cargo.toml
+++ b/audio/sb16d/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2018"
 
 [dependencies]
 bitflags = "1"
-common = { path = "../common" }
+common = { path = "../../common" }
 log = "0.4"
 redox-daemon = "0.1"
 redox-log = "0.1"
diff --git a/sb16d/src/device.rs b/audio/sb16d/src/device.rs
similarity index 100%
rename from sb16d/src/device.rs
rename to audio/sb16d/src/device.rs
diff --git a/sb16d/src/main.rs b/audio/sb16d/src/main.rs
similarity index 100%
rename from sb16d/src/main.rs
rename to audio/sb16d/src/main.rs