diff --git a/Cargo.lock b/Cargo.lock index a674a7039..c4910cc95 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -282,6 +282,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitmask" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5da9b3d9f6f585199287a473f4f8dfab6566cf827d15c00c219f53c645687ead" + [[package]] name = "bitvec" version = "0.22.3" @@ -1569,6 +1575,18 @@ dependencies = [ "xous-ipc 0.9.29 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "ghostfat" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eed551bd858894367c918b3f2fb1c9d73d753a1ad450768bcaa1467695c09e69" +dependencies = [ + "bitflags", + "log", + "packing 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "usbd_scsi 0.1.0", +] + [[package]] name = "glob" version = "0.3.0" @@ -1917,6 +1935,12 @@ dependencies = [ "either", ] +[[package]] +name = "itm_logger" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9c84afb983c1eec3f46806b3c0fe5f69991729f3bde34946faa5e7c58ad7300" + [[package]] name = "itoa" version = "0.4.8" @@ -2522,6 +2546,54 @@ dependencies = [ "syn", ] +[[package]] +name = "packing" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54c66f5cd59fcc93cc3cdd9119e9863c3a8552fbf3a33521005ed402635c7cb9" +dependencies = [ + "packing_codegen 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "typenum", +] + +[[package]] +name = "packing" +version = "0.2.0" +dependencies = [ + "packing_codegen 0.1.0", + "typenum", +] + +[[package]] +name = "packing" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4244f3101641a801ce20e684a149dccc3c0d9a290f4061ff57890099313fbecd" +dependencies = [ + "packing_codegen 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "typenum", +] + +[[package]] +name = "packing_codegen" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "packing_codegen" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0a0ea25381cd681bf1d46e04a01590ea41bffc283b1cd96b1c25cd91635546f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "passwords" version = "3.1.9" @@ -4055,6 +4127,24 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +[[package]] +name = "uf2_block" +version = "0.1.0" +dependencies = [ + "bitmask", + "packing 0.2.0", +] + +[[package]] +name = "uf2_block" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68df793ca56bcdef49a7f1a584798ecdf3bf1e69669df5f6d539245b985f3a4b" +dependencies = [ + "bitmask", + "packing 0.1.0", +] + [[package]] name = "unicode-bidi" version = "0.3.8" @@ -4155,6 +4245,7 @@ version = "0.1.0" dependencies = [ "bitfield", "embedded-time", + "ghostfat", "keyboard", "llio", "log", @@ -4168,7 +4259,8 @@ dependencies = [ "rkyv", "usb-device", "usbd-human-interface-device 0.2.1", - "usbd-mass-storage", + "usbd_mass_storage 0.1.0", + "usbd_scsi 0.1.1", "utralib", "vcell", "xous 0.9.29 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4238,11 +4330,91 @@ dependencies = [ ] [[package]] -name = "usbd-mass-storage" +name = "usbd_bulk_only_transport" version = "0.1.0" dependencies = [ + "embedded-hal", + "itm_logger", "log", + "nb 0.1.3", + "packing 0.2.0", + "typenum", "usb-device", + "usbd_mass_storage 0.1.0", +] + +[[package]] +name = "usbd_bulk_only_transport" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6fcd931e7f821bc79563a5f993e4ffbf41500d333e611fa9df7ca135e12135f" +dependencies = [ + "embedded-hal", + "itm_logger", + "nb 0.1.3", + "packing 0.1.0", + "typenum", + "usb-device", + "usbd_mass_storage 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "usbd_mass_storage" +version = "0.1.0" +dependencies = [ + "embedded-hal", + "itm_logger", + "log", + "nb 0.1.3", + "packing 0.2.0", + "typenum", + "usb-device", +] + +[[package]] +name = "usbd_mass_storage" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d9d9a2d2b51782f26ea29fdaca5deb5b6c1300ef072e736de9f96b2e367dec5" +dependencies = [ + "embedded-hal", + "itm_logger", + "nb 0.1.3", + "packing 0.1.0", + "typenum", + "usb-device", +] + +[[package]] +name = "usbd_scsi" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c7bda9b94b13f64e41ad0b9cc9a5af3e14b04d17e9906ae3be5cd91835b8647" +dependencies = [ + "embedded-hal", + "itm_logger", + "nb 0.1.3", + "packing 0.1.0", + "typenum", + "uf2_block 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "usb-device", + "usbd_bulk_only_transport 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "usbd_mass_storage 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "usbd_scsi" +version = "0.1.1" +dependencies = [ + "embedded-hal", + "itm_logger", + "nb 0.1.3", + "packing 0.2.0", + "typenum", + "uf2_block 0.1.0", + "usb-device", + "usbd_bulk_only_transport 0.1.0", + "usbd_mass_storage 0.1.0", ] [[package]] diff --git a/services/usb-device-xous/Cargo.toml b/services/usb-device-xous/Cargo.toml index bb9fa5307..cd2a11531 100644 --- a/services/usb-device-xous/Cargo.toml +++ b/services/usb-device-xous/Cargo.toml @@ -29,9 +29,10 @@ usbd-human-interface-device = "0.2.1" embedded-time = "0.12.1" # required by the keyboard interface packed_struct = { version = "0.10", default-features = false } # used by the usbd-human-interface-device crate num_enum = { version = "0.5", default-features = false } # used by the usbd-human-interface-device crate +usbd_scsi = { path = "./stm32-usb.rs/firmware/usbd_scsi" } +usbd_mass_storage = { path = "./stm32-usb.rs/firmware/usbd_mass_storage" } -[dependencies.usbd-mass-storage] -path = "../../../usbd-mass-storage" +ghostfat = "0.5.0" [dependencies.usb-device] # see top level Cargo.toml for patch.crates-io directive to help with dev work