From faa64c2ce8226d03f3892f3ae153931cd6d9acaf Mon Sep 17 00:00:00 2001 From: Astro Date: Thu, 4 Feb 2021 16:22:09 +0100 Subject: [PATCH] Revert "update smoltcp 0.6.0 -> 0.7.0" This reverts commit ccf758cc85363b41b73588b71067db1511614d30. Blocked by: https://github.com/smoltcp-rs/smoltcp/issues/415 --- Cargo.lock | 28 ++++++++++++++-------------- libasync/Cargo.toml | 2 +- libasync/src/smoltcp/mod.rs | 10 +++++----- libboard_zynq/Cargo.toml | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c79e70b..d9ad5d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,9 +14,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "byteorder" -version = "1.4.2" +version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" +checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" [[package]] name = "cc" @@ -26,9 +26,9 @@ checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" [[package]] name = "cfg-if" -version = "1.0.0" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "compiler_builtins" @@ -68,9 +68,9 @@ dependencies = [ [[package]] name = "fatfs" -version = "0.3.5" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e18f80a87439240dac45d927fd8f8081b6f1e34c03e97271189fa8a8c2e96c8f" +checksum = "93079df23039e52059e1f03b4c29fb0c72da2c792aad91bb2236c9fb81d3592e" dependencies = [ "bitflags", "byteorder", @@ -148,15 +148,15 @@ dependencies = [ [[package]] name = "linked_list_allocator" -version = "0.8.11" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822add9edb1860698b79522510da17bef885171f75aa395cff099d770c609c24" +checksum = "4e6766dff3bf932e0d1c7f1cf27c0a46008f7839f85b015a312c276a4570a399" [[package]] name = "log" -version = "0.4.14" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" dependencies = [ "cfg-if", ] @@ -202,9 +202,9 @@ checksum = "bd7a31eed1591dcbc95d92ad7161908e72f4677f8fabf2a32ca49b4237cbf211" [[package]] name = "smoltcp" -version = "0.7.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab527c390c7e107f687bd92a886a083fde61b8cdc700b37f3d7e4346ffd8fae1" +checksum = "0fe46639fd2ec79eadf8fe719f237a7a0bd4dac5d957f1ca5bbdbc1c3c39e53a" dependencies = [ "bitflags", "byteorder", @@ -227,9 +227,9 @@ dependencies = [ [[package]] name = "vcell" -version = "0.1.3" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77439c1b53d2303b20d9459b1ade71a83c716e3f9c34f3228c00e6f185d6c002" +checksum = "876e32dcadfe563a4289e994f7cb391197f362b6315dc45e8ba4aa6f564a4b3c" [[package]] name = "void" diff --git a/libasync/Cargo.toml b/libasync/Cargo.toml index 9693d02..e943b54 100644 --- a/libasync/Cargo.toml +++ b/libasync/Cargo.toml @@ -13,6 +13,6 @@ nb = "1.0" libcortex_a9 = { path = "../libcortex_a9" } [dependencies.smoltcp] -version = "0.7" +version = "0.6" default-features = false features = ["alloc"] diff --git a/libasync/src/smoltcp/mod.rs b/libasync/src/smoltcp/mod.rs index f883263..0a819c5 100644 --- a/libasync/src/smoltcp/mod.rs +++ b/libasync/src/smoltcp/mod.rs @@ -23,7 +23,7 @@ pub trait LinkCheck { static mut SOCKETS: Option = None; pub struct Sockets { - sockets: RefCell>, + sockets: RefCell>, wakers: RefCell>, } @@ -47,8 +47,8 @@ impl Sockets { /// Block and run executor indefinitely while polling the smoltcp /// iface - pub fn run<'b, D: for<'d> Device<'d> + LinkCheck>( - iface: &mut EthernetInterface<'b, D>, + pub fn run<'b, 'c, 'e, D: for<'d> Device<'d> + LinkCheck>( + iface: &mut EthernetInterface<'b, 'c, 'e, D>, mut get_time: impl FnMut() -> Instant, ) -> ! { task::block_on(async { @@ -74,9 +74,9 @@ impl Sockets { unsafe { SOCKETS.as_ref().expect("Sockets") } } - fn poll<'b, D: for<'d> Device<'d>>( + fn poll<'b, 'c, 'e, D: for<'d> Device<'d>>( &self, - iface: &mut EthernetInterface<'b, D>, + iface: &mut EthernetInterface<'b, 'c, 'e, D>, instant: Instant ) { let processed = { diff --git a/libboard_zynq/Cargo.toml b/libboard_zynq/Cargo.toml index d3b4ae2..cc738e8 100644 --- a/libboard_zynq/Cargo.toml +++ b/libboard_zynq/Cargo.toml @@ -24,6 +24,6 @@ libcortex_a9 = { path = "../libcortex_a9" } libasync = { path = "../libasync" } [dependencies.smoltcp] -version = "0.7" +version = "0.6" features = ["ethernet", "proto-ipv4", "socket-tcp"] default-features = false