Merge branch 'driver-categories3' into 'master'
Move all storage, audio and graphics related drives to the relative subdirectories See merge request redox-os/drivers!145
This commit is contained in:
Jeremy Soller
+18
-17
@@ -1,32 +1,26 @@
|
||||
[workspace]
|
||||
members = [
|
||||
"ac97d",
|
||||
"acpid",
|
||||
"ahcid",
|
||||
"bgad",
|
||||
"block-io-wrapper",
|
||||
"common",
|
||||
"fbcond",
|
||||
"ided",
|
||||
"ihdad",
|
||||
"nvmed",
|
||||
"lived", # TODO: not really a driver...
|
||||
"pcid",
|
||||
"pcspkrd",
|
||||
"ps2d",
|
||||
"sb16d",
|
||||
"vboxd",
|
||||
"vesad",
|
||||
"xhcid",
|
||||
"usbctl",
|
||||
"usbhidd",
|
||||
"usbscsid",
|
||||
"inputd",
|
||||
|
||||
"virtio-blkd",
|
||||
"virtio-gpud",
|
||||
"virtio-core",
|
||||
|
||||
"audio/ac97d",
|
||||
"audio/ihdad",
|
||||
"audio/pcspkrd",
|
||||
"audio/sb16d",
|
||||
|
||||
"graphics/bgad",
|
||||
"graphics/fbcond",
|
||||
"graphics/vesad",
|
||||
"graphics/virtio-gpud",
|
||||
|
||||
"net/alxd",
|
||||
"net/driver-network",
|
||||
"net/e1000d",
|
||||
@@ -35,7 +29,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]
|
||||
|
||||
@@ -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" }
|
||||
@@ -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" }
|
||||
@@ -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"
|
||||
@@ -8,4 +8,4 @@ orbclient = "0.3.27"
|
||||
redox-daemon = "0.1"
|
||||
redox_syscall = "0.4"
|
||||
|
||||
pcid = { path = "../pcid" }
|
||||
pcid = { path = "../../pcid" }
|
||||
@@ -10,7 +10,7 @@ redox_event = "0.2"
|
||||
redox_syscall = "0.4"
|
||||
redox-daemon = "0.1"
|
||||
|
||||
inputd = { path = "../inputd" }
|
||||
inputd = { path = "../../inputd" }
|
||||
|
||||
[features]
|
||||
default = []
|
||||
@@ -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 = []
|
||||
@@ -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"
|
||||
@@ -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" }
|
||||
@@ -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"
|
||||
@@ -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"
|
||||
@@ -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"]
|
||||
@@ -13,4 +13,4 @@ plain = "0.2"
|
||||
redox-daemon = "0.1"
|
||||
redox_syscall = "0.4"
|
||||
thiserror = "1"
|
||||
xhcid = { path = "../xhcid" }
|
||||
xhcid = { path = "../../xhcid" }
|
||||
@@ -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" }
|
||||
Reference in New Issue
Block a user