max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update smoltcp, fix build issues with no ethernet.

Browse Source
This commit is contained in:
Dario Nieuwenhuis 2021-11-26 20:39:21 +01:00
parent 6aa27d1a8e
commit 524eed5db5
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embassy-net/Cargo.toml
View File

@ -35,7 +35,7 @@ atomic-pool = "0.2.1"
[dependencies.smoltcp] [dependencies.smoltcp]
git = "https://github.com/smoltcp-rs/smoltcp" git = "https://github.com/smoltcp-rs/smoltcp"
rev = "453183f8a1d16daf2f6739b565d3dc7ac93b662e" rev = "f5bc05cda8d83595c98688991f4b69fc963a88f6"
default-features = false default-features = false
features = [ features = [
"proto-ipv4", "proto-ipv4",

4
embassy-net/src/lib.rs
View File

@ -26,6 +26,8 @@ pub use tcp_socket::TcpSocket;
pub use smoltcp::phy::{DeviceCapabilities, Medium}; pub use smoltcp::phy::{DeviceCapabilities, Medium};
pub use smoltcp::time::Duration as SmolDuration; pub use smoltcp::time::Duration as SmolDuration;
pub use smoltcp::time::Instant as SmolInstant; pub use smoltcp::time::Instant as SmolInstant;
pub use smoltcp::wire::{HardwareAddress, IpAddress, IpCidr, Ipv4Address, Ipv4Cidr}; #[cfg(feature = "medium-ethernet")]
pub use smoltcp::wire::{EthernetAddress, HardwareAddress};
pub use smoltcp::wire::{IpAddress, IpCidr, Ipv4Address, Ipv4Cidr};
pub type Interface = smoltcp::iface::Interface<'static, device::DeviceAdapter>; pub type Interface = smoltcp::iface::Interface<'static, device::DeviceAdapter>;
pub use smoltcp::{Error, Result}; pub use smoltcp::{Error, Result};

13
embassy-net/src/stack.rs
View File

@ -8,18 +8,15 @@ use embassy::waitqueue::WakerRegistration;
use futures::pin_mut; use futures::pin_mut;
use smoltcp::iface::InterfaceBuilder; use smoltcp::iface::InterfaceBuilder;
use smoltcp::iface::SocketStorage; use smoltcp::iface::SocketStorage;
use smoltcp::time::Instant as SmolInstant;
use smoltcp::wire::{IpCidr, Ipv4Address, Ipv4Cidr};
#[cfg(feature = "medium-ethernet")] #[cfg(feature = "medium-ethernet")]
use smoltcp::iface::{Neighbor, NeighborCache, Route, Routes}; use smoltcp::iface::{Neighbor, NeighborCache, Route, Routes};
#[cfg(feature = "medium-ethernet")] #[cfg(feature = "medium-ethernet")]
use smoltcp::phy::Device as _; use smoltcp::phy::{Device as _, Medium};
#[cfg(feature = "medium-ethernet")] #[cfg(feature = "medium-ethernet")]
use smoltcp::phy::Medium; use smoltcp::wire::{EthernetAddress, HardwareAddress, IpAddress};
use smoltcp::time::Instant as SmolInstant;
#[cfg(feature = "medium-ethernet")]
use smoltcp::wire::EthernetAddress;
#[cfg(feature = "medium-ethernet")]
use smoltcp::wire::IpAddress;
use smoltcp::wire::{HardwareAddress, IpCidr, Ipv4Address, Ipv4Cidr};
use crate::config::Configurator; use crate::config::Configurator;
use crate::config::Event; use crate::config::Event;