Move all storage drivers to storage/

Cargo.toml

@@ -2,15 +2,10 @@
 members = [
     "ac97d",
     "acpid",
-    "ahcid",
     "bgad",
-    "block-io-wrapper",
     "common",
     "fbcond",
-    "ided",
     "ihdad",
-    "nvmed",
-    "lived", # TODO: not really a driver...
     "pcid",
     "pcspkrd",
     "ps2d",
@@ -20,10 +15,8 @@ members = [
     "xhcid",
     "usbctl",
     "usbhidd",
-    "usbscsid",
     "inputd",
 
-    "virtio-blkd",
     "virtio-gpud",
     "virtio-core",
 
@@ -35,7 +28,14 @@ members = [
     "net/rtl8168d",
     "net/virtio-netd",
 
-    "bcm2835-sdhcid",
+    "storage/ahcid",
+    "storage/bcm2835-sdhcid",
+    "storage/block-io-wrapper",
+    "storage/ided",
+    "storage/lived", # TODO: not really a driver...
+    "storage/nvmed",
+    "storage/usbscsid",
+    "storage/virtio-blkd",
 ]
 
 [profile.release]

storage/ahcid/Cargo.toml

@@ -13,5 +13,5 @@ redox-log = "0.1"
 redox_syscall = "0.4"
 
 block-io-wrapper = { path = "../block-io-wrapper" }
-common = { path = "../common" }
-pcid = { path = "../pcid" }
+common = { path = "../../common" }
+pcid = { path = "../../pcid" }

storage/bcm2835-sdhcid/Cargo.toml

@@ -10,6 +10,6 @@ fdt = "0.1.5"
 redox_syscall = "0.4"
 partitionlib = { git = "https://gitlab.redox-os.org/redox-os/partitionlib.git" }
 block-io-wrapper = { path = "../block-io-wrapper" }
-common = { path = "../common" }
+common = { path = "../../common" }
 
 redox-daemon = "0.1"

storage/ided/Cargo.toml

@@ -5,10 +5,10 @@ edition = "2018"
 
 [dependencies]
 block-io-wrapper = { path = "../block-io-wrapper" }
-common = { path = "../common" }
+common = { path = "../../common" }
 log = "0.4"
 partitionlib = { git = "https://gitlab.redox-os.org/redox-os/partitionlib.git" }
-pcid = { path = "../pcid" }
+pcid = { path = "../../pcid" }
 redox-daemon = "0.1"
 redox-log = "0.1"
 redox_syscall = "0.4"

storage/nvmed/Cargo.toml

@@ -16,8 +16,8 @@ partitionlib = { git = "https://gitlab.redox-os.org/redox-os/partitionlib.git" }
 smallvec = "1"
 
 block-io-wrapper = { path = "../block-io-wrapper" }
-common = { path = "../common" }
-pcid = { path = "../pcid" }
+common = { path = "../../common" }
+pcid = { path = "../../pcid" }
 
 [features]
 default = ["async"]

storage/usbscsid/Cargo.toml

@@ -13,4 +13,4 @@ plain = "0.2"
 redox-daemon = "0.1"
 redox_syscall = "0.4"
 thiserror = "1"
-xhcid = { path = "../xhcid" }
+xhcid = { path = "../../xhcid" }

storage/virtio-blkd/Cargo.toml

@@ -18,6 +18,6 @@ redox_syscall = "0.4"
 partitionlib = { git = "https://gitlab.redox-os.org/redox-os/partitionlib.git" }
 
 block-io-wrapper = { path = "../block-io-wrapper" }
-common = { path = "../common" }
-pcid = { path = "../pcid" }
-virtio-core = { path = "../virtio-core" }
+common = { path = "../../common" }
+pcid = { path = "../../pcid" }
+virtio-core = { path = "../../virtio-core" }