From c75b560def7ed2889d11744cc08c37f2d781bc7e Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Wed, 28 Feb 2024 21:26:09 +0100 Subject: [PATCH] Move all storage drivers to storage/ --- Cargo.toml | 16 ++++++++-------- {ahcid => storage/ahcid}/.gitignore | 0 {ahcid => storage/ahcid}/Cargo.toml | 4 ++-- {ahcid => storage/ahcid}/src/ahci/disk_ata.rs | 0 {ahcid => storage/ahcid}/src/ahci/disk_atapi.rs | 0 {ahcid => storage/ahcid}/src/ahci/fis.rs | 0 {ahcid => storage/ahcid}/src/ahci/hba.rs | 0 {ahcid => storage/ahcid}/src/ahci/mod.rs | 0 {ahcid => storage/ahcid}/src/main.rs | 0 {ahcid => storage/ahcid}/src/scheme.rs | 0 .../bcm2835-sdhcid}/Cargo.toml | 2 +- .../bcm2835-sdhcid}/src/main.rs | 0 .../bcm2835-sdhcid}/src/scheme.rs | 0 .../bcm2835-sdhcid}/src/sd/mod.rs | 0 .../block-io-wrapper}/.gitignore | 0 .../block-io-wrapper}/Cargo.toml | 0 .../block-io-wrapper}/src/lib.rs | 0 {ided => storage/ided}/.gitignore | 0 {ided => storage/ided}/Cargo.toml | 4 ++-- {ided => storage/ided}/src/ide.rs | 0 {ided => storage/ided}/src/main.rs | 0 {ided => storage/ided}/src/scheme.rs | 0 {lived => storage/lived}/Cargo.toml | 0 {lived => storage/lived}/src/main.rs | 0 {nvmed => storage/nvmed}/.gitignore | 0 {nvmed => storage/nvmed}/Cargo.toml | 4 ++-- {nvmed => storage/nvmed}/src/main.rs | 0 {nvmed => storage/nvmed}/src/nvme/cmd.rs | 0 {nvmed => storage/nvmed}/src/nvme/cq_reactor.rs | 0 {nvmed => storage/nvmed}/src/nvme/identify.rs | 0 {nvmed => storage/nvmed}/src/nvme/mod.rs | 0 {nvmed => storage/nvmed}/src/nvme/queues.rs | 0 {nvmed => storage/nvmed}/src/scheme.rs | 0 {usbscsid => storage/usbscsid}/.gitignore | 0 {usbscsid => storage/usbscsid}/Cargo.toml | 2 +- {usbscsid => storage/usbscsid}/src/main.rs | 0 .../usbscsid}/src/protocol/bot.rs | 0 .../usbscsid}/src/protocol/mod.rs | 0 {usbscsid => storage/usbscsid}/src/scheme.rs | 0 {usbscsid => storage/usbscsid}/src/scsi/cmds.rs | 0 {usbscsid => storage/usbscsid}/src/scsi/mod.rs | 0 .../usbscsid}/src/scsi/opcodes.rs | 0 {virtio-blkd => storage/virtio-blkd}/Cargo.toml | 6 +++--- {virtio-blkd => storage/virtio-blkd}/src/main.rs | 0 .../virtio-blkd}/src/scheme.rs | 0 45 files changed, 19 insertions(+), 19 deletions(-) rename {ahcid => storage/ahcid}/.gitignore (100%) rename {ahcid => storage/ahcid}/Cargo.toml (82%) rename {ahcid => storage/ahcid}/src/ahci/disk_ata.rs (100%) rename {ahcid => storage/ahcid}/src/ahci/disk_atapi.rs (100%) rename {ahcid => storage/ahcid}/src/ahci/fis.rs (100%) rename {ahcid => storage/ahcid}/src/ahci/hba.rs (100%) rename {ahcid => storage/ahcid}/src/ahci/mod.rs (100%) rename {ahcid => storage/ahcid}/src/main.rs (100%) rename {ahcid => storage/ahcid}/src/scheme.rs (100%) rename {bcm2835-sdhcid => storage/bcm2835-sdhcid}/Cargo.toml (91%) rename {bcm2835-sdhcid => storage/bcm2835-sdhcid}/src/main.rs (100%) rename {bcm2835-sdhcid => storage/bcm2835-sdhcid}/src/scheme.rs (100%) rename {bcm2835-sdhcid => storage/bcm2835-sdhcid}/src/sd/mod.rs (100%) rename {block-io-wrapper => storage/block-io-wrapper}/.gitignore (100%) rename {block-io-wrapper => storage/block-io-wrapper}/Cargo.toml (100%) rename {block-io-wrapper => storage/block-io-wrapper}/src/lib.rs (100%) rename {ided => storage/ided}/.gitignore (100%) rename {ided => storage/ided}/Cargo.toml (80%) rename {ided => storage/ided}/src/ide.rs (100%) rename {ided => storage/ided}/src/main.rs (100%) rename {ided => storage/ided}/src/scheme.rs (100%) rename {lived => storage/lived}/Cargo.toml (100%) rename {lived => storage/lived}/src/main.rs (100%) rename {nvmed => storage/nvmed}/.gitignore (100%) rename {nvmed => storage/nvmed}/Cargo.toml (86%) rename {nvmed => storage/nvmed}/src/main.rs (100%) rename {nvmed => storage/nvmed}/src/nvme/cmd.rs (100%) rename {nvmed => storage/nvmed}/src/nvme/cq_reactor.rs (100%) rename {nvmed => storage/nvmed}/src/nvme/identify.rs (100%) rename {nvmed => storage/nvmed}/src/nvme/mod.rs (100%) rename {nvmed => storage/nvmed}/src/nvme/queues.rs (100%) rename {nvmed => storage/nvmed}/src/scheme.rs (100%) rename {usbscsid => storage/usbscsid}/.gitignore (100%) rename {usbscsid => storage/usbscsid}/Cargo.toml (91%) rename {usbscsid => storage/usbscsid}/src/main.rs (100%) rename {usbscsid => storage/usbscsid}/src/protocol/bot.rs (100%) rename {usbscsid => storage/usbscsid}/src/protocol/mod.rs (100%) rename {usbscsid => storage/usbscsid}/src/scheme.rs (100%) rename {usbscsid => storage/usbscsid}/src/scsi/cmds.rs (100%) rename {usbscsid => storage/usbscsid}/src/scsi/mod.rs (100%) rename {usbscsid => storage/usbscsid}/src/scsi/opcodes.rs (100%) rename {virtio-blkd => storage/virtio-blkd}/Cargo.toml (81%) rename {virtio-blkd => storage/virtio-blkd}/src/main.rs (100%) rename {virtio-blkd => storage/virtio-blkd}/src/scheme.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 8982e528b9..0d2e7110c8 100644 --- a/Cargo.toml +++ b/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] diff --git a/ahcid/.gitignore b/storage/ahcid/.gitignore similarity index 100% rename from ahcid/.gitignore rename to storage/ahcid/.gitignore diff --git a/ahcid/Cargo.toml b/storage/ahcid/Cargo.toml similarity index 82% rename from ahcid/Cargo.toml rename to storage/ahcid/Cargo.toml index cb5637dd69..03fd054a25 100644 --- a/ahcid/Cargo.toml +++ b/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" } diff --git a/ahcid/src/ahci/disk_ata.rs b/storage/ahcid/src/ahci/disk_ata.rs similarity index 100% rename from ahcid/src/ahci/disk_ata.rs rename to storage/ahcid/src/ahci/disk_ata.rs diff --git a/ahcid/src/ahci/disk_atapi.rs b/storage/ahcid/src/ahci/disk_atapi.rs similarity index 100% rename from ahcid/src/ahci/disk_atapi.rs rename to storage/ahcid/src/ahci/disk_atapi.rs diff --git a/ahcid/src/ahci/fis.rs b/storage/ahcid/src/ahci/fis.rs similarity index 100% rename from ahcid/src/ahci/fis.rs rename to storage/ahcid/src/ahci/fis.rs diff --git a/ahcid/src/ahci/hba.rs b/storage/ahcid/src/ahci/hba.rs similarity index 100% rename from ahcid/src/ahci/hba.rs rename to storage/ahcid/src/ahci/hba.rs diff --git a/ahcid/src/ahci/mod.rs b/storage/ahcid/src/ahci/mod.rs similarity index 100% rename from ahcid/src/ahci/mod.rs rename to storage/ahcid/src/ahci/mod.rs diff --git a/ahcid/src/main.rs b/storage/ahcid/src/main.rs similarity index 100% rename from ahcid/src/main.rs rename to storage/ahcid/src/main.rs diff --git a/ahcid/src/scheme.rs b/storage/ahcid/src/scheme.rs similarity index 100% rename from ahcid/src/scheme.rs rename to storage/ahcid/src/scheme.rs diff --git a/bcm2835-sdhcid/Cargo.toml b/storage/bcm2835-sdhcid/Cargo.toml similarity index 91% rename from bcm2835-sdhcid/Cargo.toml rename to storage/bcm2835-sdhcid/Cargo.toml index faa5ddfb77..f9bce4ae2b 100644 --- a/bcm2835-sdhcid/Cargo.toml +++ b/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" diff --git a/bcm2835-sdhcid/src/main.rs b/storage/bcm2835-sdhcid/src/main.rs similarity index 100% rename from bcm2835-sdhcid/src/main.rs rename to storage/bcm2835-sdhcid/src/main.rs diff --git a/bcm2835-sdhcid/src/scheme.rs b/storage/bcm2835-sdhcid/src/scheme.rs similarity index 100% rename from bcm2835-sdhcid/src/scheme.rs rename to storage/bcm2835-sdhcid/src/scheme.rs diff --git a/bcm2835-sdhcid/src/sd/mod.rs b/storage/bcm2835-sdhcid/src/sd/mod.rs similarity index 100% rename from bcm2835-sdhcid/src/sd/mod.rs rename to storage/bcm2835-sdhcid/src/sd/mod.rs diff --git a/block-io-wrapper/.gitignore b/storage/block-io-wrapper/.gitignore similarity index 100% rename from block-io-wrapper/.gitignore rename to storage/block-io-wrapper/.gitignore diff --git a/block-io-wrapper/Cargo.toml b/storage/block-io-wrapper/Cargo.toml similarity index 100% rename from block-io-wrapper/Cargo.toml rename to storage/block-io-wrapper/Cargo.toml diff --git a/block-io-wrapper/src/lib.rs b/storage/block-io-wrapper/src/lib.rs similarity index 100% rename from block-io-wrapper/src/lib.rs rename to storage/block-io-wrapper/src/lib.rs diff --git a/ided/.gitignore b/storage/ided/.gitignore similarity index 100% rename from ided/.gitignore rename to storage/ided/.gitignore diff --git a/ided/Cargo.toml b/storage/ided/Cargo.toml similarity index 80% rename from ided/Cargo.toml rename to storage/ided/Cargo.toml index 6e4a036981..c580881d9e 100644 --- a/ided/Cargo.toml +++ b/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" diff --git a/ided/src/ide.rs b/storage/ided/src/ide.rs similarity index 100% rename from ided/src/ide.rs rename to storage/ided/src/ide.rs diff --git a/ided/src/main.rs b/storage/ided/src/main.rs similarity index 100% rename from ided/src/main.rs rename to storage/ided/src/main.rs diff --git a/ided/src/scheme.rs b/storage/ided/src/scheme.rs similarity index 100% rename from ided/src/scheme.rs rename to storage/ided/src/scheme.rs diff --git a/lived/Cargo.toml b/storage/lived/Cargo.toml similarity index 100% rename from lived/Cargo.toml rename to storage/lived/Cargo.toml diff --git a/lived/src/main.rs b/storage/lived/src/main.rs similarity index 100% rename from lived/src/main.rs rename to storage/lived/src/main.rs diff --git a/nvmed/.gitignore b/storage/nvmed/.gitignore similarity index 100% rename from nvmed/.gitignore rename to storage/nvmed/.gitignore diff --git a/nvmed/Cargo.toml b/storage/nvmed/Cargo.toml similarity index 86% rename from nvmed/Cargo.toml rename to storage/nvmed/Cargo.toml index b18436d927..ce52f43752 100644 --- a/nvmed/Cargo.toml +++ b/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"] diff --git a/nvmed/src/main.rs b/storage/nvmed/src/main.rs similarity index 100% rename from nvmed/src/main.rs rename to storage/nvmed/src/main.rs diff --git a/nvmed/src/nvme/cmd.rs b/storage/nvmed/src/nvme/cmd.rs similarity index 100% rename from nvmed/src/nvme/cmd.rs rename to storage/nvmed/src/nvme/cmd.rs diff --git a/nvmed/src/nvme/cq_reactor.rs b/storage/nvmed/src/nvme/cq_reactor.rs similarity index 100% rename from nvmed/src/nvme/cq_reactor.rs rename to storage/nvmed/src/nvme/cq_reactor.rs diff --git a/nvmed/src/nvme/identify.rs b/storage/nvmed/src/nvme/identify.rs similarity index 100% rename from nvmed/src/nvme/identify.rs rename to storage/nvmed/src/nvme/identify.rs diff --git a/nvmed/src/nvme/mod.rs b/storage/nvmed/src/nvme/mod.rs similarity index 100% rename from nvmed/src/nvme/mod.rs rename to storage/nvmed/src/nvme/mod.rs diff --git a/nvmed/src/nvme/queues.rs b/storage/nvmed/src/nvme/queues.rs similarity index 100% rename from nvmed/src/nvme/queues.rs rename to storage/nvmed/src/nvme/queues.rs diff --git a/nvmed/src/scheme.rs b/storage/nvmed/src/scheme.rs similarity index 100% rename from nvmed/src/scheme.rs rename to storage/nvmed/src/scheme.rs diff --git a/usbscsid/.gitignore b/storage/usbscsid/.gitignore similarity index 100% rename from usbscsid/.gitignore rename to storage/usbscsid/.gitignore diff --git a/usbscsid/Cargo.toml b/storage/usbscsid/Cargo.toml similarity index 91% rename from usbscsid/Cargo.toml rename to storage/usbscsid/Cargo.toml index f014a19fd2..28083405a3 100644 --- a/usbscsid/Cargo.toml +++ b/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" } diff --git a/usbscsid/src/main.rs b/storage/usbscsid/src/main.rs similarity index 100% rename from usbscsid/src/main.rs rename to storage/usbscsid/src/main.rs diff --git a/usbscsid/src/protocol/bot.rs b/storage/usbscsid/src/protocol/bot.rs similarity index 100% rename from usbscsid/src/protocol/bot.rs rename to storage/usbscsid/src/protocol/bot.rs diff --git a/usbscsid/src/protocol/mod.rs b/storage/usbscsid/src/protocol/mod.rs similarity index 100% rename from usbscsid/src/protocol/mod.rs rename to storage/usbscsid/src/protocol/mod.rs diff --git a/usbscsid/src/scheme.rs b/storage/usbscsid/src/scheme.rs similarity index 100% rename from usbscsid/src/scheme.rs rename to storage/usbscsid/src/scheme.rs diff --git a/usbscsid/src/scsi/cmds.rs b/storage/usbscsid/src/scsi/cmds.rs similarity index 100% rename from usbscsid/src/scsi/cmds.rs rename to storage/usbscsid/src/scsi/cmds.rs diff --git a/usbscsid/src/scsi/mod.rs b/storage/usbscsid/src/scsi/mod.rs similarity index 100% rename from usbscsid/src/scsi/mod.rs rename to storage/usbscsid/src/scsi/mod.rs diff --git a/usbscsid/src/scsi/opcodes.rs b/storage/usbscsid/src/scsi/opcodes.rs similarity index 100% rename from usbscsid/src/scsi/opcodes.rs rename to storage/usbscsid/src/scsi/opcodes.rs diff --git a/virtio-blkd/Cargo.toml b/storage/virtio-blkd/Cargo.toml similarity index 81% rename from virtio-blkd/Cargo.toml rename to storage/virtio-blkd/Cargo.toml index 5f6ab31295..c9ec28ced1 100644 --- a/virtio-blkd/Cargo.toml +++ b/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" } diff --git a/virtio-blkd/src/main.rs b/storage/virtio-blkd/src/main.rs similarity index 100% rename from virtio-blkd/src/main.rs rename to storage/virtio-blkd/src/main.rs diff --git a/virtio-blkd/src/scheme.rs b/storage/virtio-blkd/src/scheme.rs similarity index 100% rename from virtio-blkd/src/scheme.rs rename to storage/virtio-blkd/src/scheme.rs