Cargo.lock

@@ -28,6 +28,7 @@ dependencies = [
  "libcortex_a9 0.0.0",
  "libregister 0.0.0",
  "libsupport_zynq 0.0.0",
+ "smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp.git?rev=8eb01aca364aefe5f823d68d552d62c76c9be4a3)",
 ]
 
 [[package]]
@@ -37,7 +38,7 @@ dependencies = [
  "bit_field 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libcortex_a9 0.0.0",
  "libregister 0.0.0",
- "smoltcp 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp.git?rev=8eb01aca364aefe5f823d68d552d62c76c9be4a3)",
  "volatile-register 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -47,6 +48,7 @@ version = "0.0.0"
 dependencies = [
  "bit_field 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libregister 0.0.0",
+ "smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp.git?rev=8eb01aca364aefe5f823d68d552d62c76c9be4a3)",
 ]
 
 [[package]]
@@ -68,6 +70,7 @@ dependencies = [
  "libregister 0.0.0",
  "linked_list_allocator 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "r0 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp.git?rev=8eb01aca364aefe5f823d68d552d62c76c9be4a3)",
 ]
 
 [[package]]
@@ -87,8 +90,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "smoltcp"
-version = "0.6.0"
+version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/m-labs/smoltcp.git?rev=8eb01aca364aefe5f823d68d552d62c76c9be4a3#8eb01aca364aefe5f823d68d552d62c76c9be4a3"
 dependencies = [
  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -116,6 +119,6 @@ dependencies = [
 "checksum linked_list_allocator 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5825aea823c659d0fdcdbe8c9b78baf56f3a10365d783db874f6d360df72626f"
 "checksum managed 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fdcec5e97041c7f0f1c5b7d93f12e57293c831c646f4cc7a5db59460c7ea8de6"
 "checksum r0 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd7a31eed1591dcbc95d92ad7161908e72f4677f8fabf2a32ca49b4237cbf211"
-"checksum smoltcp 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0fe46639fd2ec79eadf8fe719f237a7a0bd4dac5d957f1ca5bbdbc1c3c39e53a"
+"checksum smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp.git?rev=8eb01aca364aefe5f823d68d552d62c76c9be4a3)" = "<none>"
 "checksum vcell 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "876e32dcadfe563a4289e994f7cb391197f362b6315dc45e8ba4aa6f564a4b3c"
 "checksum volatile-register 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d67cb4616d99b940db1d6bd28844ff97108b498a6ca850e5b6191a532063286"

default.nix

@@ -49,7 +49,7 @@ let
     name = "${crate}";
     src = ./.;
     crateSubdir = crate;
-    cargoSha256 = "0106i3qg44gvcv18bq3854lbj7x4qkjzqpw5ldrxjlzf6h13gfgv";
+    cargoSha256 = "11868q4ib6n1rp7lh3a1maa5faim2cvhsckz3vx6vwh8i1nh88n9";
     cargoFeatures = features;
     doCheck = false;
   };

experiments/Cargo.toml

@@ -15,3 +15,9 @@ libregister = { path = "../libregister" }
 libcortex_a9 = { path = "../libcortex_a9" }
 libboard_zynq = { path = "../libboard_zynq" }
 libsupport_zynq = { path = "../libsupport_zynq" }
+
+[dependencies.smoltcp]
+git = "https://github.com/m-labs/smoltcp.git"
+rev = "8eb01aca364aefe5f823d68d552d62c76c9be4a3"
+features = ["ethernet", "proto-ipv4", "socket-tcp"]
+default-features = false

experiments/src/main.rs

@@ -3,20 +3,15 @@
 
 use core::mem::transmute;
 use libcortex_a9::mutex::Mutex;
-use libboard_zynq::{
+use libboard_zynq::{print, println, self as zynq, clocks::Clocks, clocks::source::{ClockSource, ArmPll, IoPll}};
-    print, println,
-    self as zynq, clocks::Clocks, clocks::source::{ClockSource, ArmPll, IoPll},
-    smoltcp::{
-        wire::{EthernetAddress, IpAddress, IpCidr},
-        iface::{NeighborCache, EthernetInterfaceBuilder},
-        time::Instant,
-        socket::SocketSet,
-        socket::{TcpSocket, TcpSocketBuffer},
-    },
-};
 use libsupport_zynq::{
     ram, alloc::{vec, vec::Vec},
     boot,
+    smoltcp::wire::{EthernetAddress, IpAddress, IpCidr},
+    smoltcp::iface::{NeighborCache, EthernetInterfaceBuilder},
+    smoltcp::time::Instant,
+    smoltcp::socket::SocketSet,
+    smoltcp::socket::{TcpSocket, TcpSocketBuffer},
 };
 
 const HWADDR: [u8; 6] = [0, 0x23, 0xde, 0xea, 0xbe, 0xef];

libboard_zynq/Cargo.toml

@@ -16,6 +16,7 @@ libregister = { path = "../libregister" }
 libcortex_a9 = { path = "../libcortex_a9" }
 
 [dependencies.smoltcp]
-version = "0.6"
+git = "https://github.com/m-labs/smoltcp.git"
+rev = "8eb01aca364aefe5f823d68d552d62c76c9be4a3"
 features = ["ethernet", "proto-ipv4", "socket-tcp"]
 default-features = false

libboard_zynq/src/lib.rs

@@ -1,8 +1,5 @@
 #![no_std]
 
-/// Re-export so that dependents can always use the same version
-pub use smoltcp;
-
 pub mod slcr;
 pub mod clocks;
 pub mod uart;

libcortex_a9/Cargo.toml

@@ -12,3 +12,9 @@ default = ["target_zc706"]
 [dependencies]
 bit_field = "0.10"
 libregister = { path = "../libregister" }
+
+[dependencies.smoltcp]
+git = "https://github.com/m-labs/smoltcp.git"
+rev = "8eb01aca364aefe5f823d68d552d62c76c9be4a3"
+features = ["ethernet", "proto-ipv4", "socket-tcp"]
+default-features = false

libsupport_zynq/Cargo.toml

@@ -16,3 +16,9 @@ linked_list_allocator = { version = "0.8", default-features = false }
 libregister = { path = "../libregister" }
 libcortex_a9 = { path = "../libcortex_a9" }
 libboard_zynq = { path = "../libboard_zynq" }
+
+[dependencies.smoltcp]
+git = "https://github.com/m-labs/smoltcp.git"
+rev = "8eb01aca364aefe5f823d68d552d62c76c9be4a3"
+features = ["ethernet", "proto-ipv4", "socket-tcp"]
+default-features = false

libsupport_zynq/src/lib.rs

@@ -11,3 +11,4 @@ pub mod boot;
 mod abort;
 mod panic;
 pub mod ram;
+pub use smoltcp;