wpan: prepare net impl.
This commit is contained in:
		@@ -164,6 +164,9 @@ pub enum Medium {
 | 
			
		||||
    ///
 | 
			
		||||
    /// Examples of devices of this type are the Linux `tun`, PPP interfaces, VPNs in tun (layer 3) mode.
 | 
			
		||||
    Ip,
 | 
			
		||||
 | 
			
		||||
    /// IEEE 802_15_4 medium
 | 
			
		||||
    Ieee802154,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl Default for Medium {
 | 
			
		||||
 
 | 
			
		||||
@@ -37,6 +37,7 @@ proto-ipv4 = ["smoltcp/proto-ipv4"]
 | 
			
		||||
proto-ipv6 = ["smoltcp/proto-ipv6"]
 | 
			
		||||
medium-ethernet = ["smoltcp/medium-ethernet"]
 | 
			
		||||
medium-ip = ["smoltcp/medium-ip"]
 | 
			
		||||
medium-ieee802154 = ["smoltcp/medium-ieee802154"]
 | 
			
		||||
igmp = ["smoltcp/proto-igmp"]
 | 
			
		||||
 | 
			
		||||
[dependencies]
 | 
			
		||||
 
 | 
			
		||||
@@ -51,6 +51,8 @@ where
 | 
			
		||||
            Medium::Ethernet => phy::Medium::Ethernet,
 | 
			
		||||
            #[cfg(feature = "medium-ip")]
 | 
			
		||||
            Medium::Ip => phy::Medium::Ip,
 | 
			
		||||
            #[cfg(feature = "medium-ieee802154")]
 | 
			
		||||
            Medium::Ieee802154 => phy::Medium::Ieee802154,
 | 
			
		||||
            #[allow(unreachable_patterns)]
 | 
			
		||||
            _ => panic!(
 | 
			
		||||
                "Unsupported medium {:?}. Make sure to enable it in embassy-net's Cargo features.",
 | 
			
		||||
 
 | 
			
		||||
@@ -24,9 +24,11 @@ use embassy_net_driver::{Driver, LinkState, Medium};
 | 
			
		||||
use embassy_sync::waitqueue::WakerRegistration;
 | 
			
		||||
use embassy_time::{Instant, Timer};
 | 
			
		||||
use futures::pin_mut;
 | 
			
		||||
#[allow(unused_imports)]
 | 
			
		||||
use heapless::Vec;
 | 
			
		||||
#[cfg(feature = "igmp")]
 | 
			
		||||
pub use smoltcp::iface::MulticastError;
 | 
			
		||||
#[allow(unused_imports)]
 | 
			
		||||
use smoltcp::iface::{Interface, SocketHandle, SocketSet, SocketStorage};
 | 
			
		||||
#[cfg(feature = "dhcpv4")]
 | 
			
		||||
use smoltcp::socket::dhcpv4::{self, RetryConfig};
 | 
			
		||||
@@ -34,6 +36,8 @@ use smoltcp::socket::dhcpv4::{self, RetryConfig};
 | 
			
		||||
pub use smoltcp::wire::IpListenEndpoint;
 | 
			
		||||
#[cfg(feature = "medium-ethernet")]
 | 
			
		||||
pub use smoltcp::wire::{EthernetAddress, HardwareAddress};
 | 
			
		||||
#[cfg(feature = "medium-ieee802154")]
 | 
			
		||||
pub use smoltcp::wire::{HardwareAddress, Ieee802154Address};
 | 
			
		||||
pub use smoltcp::wire::{IpAddress, IpCidr, IpEndpoint};
 | 
			
		||||
#[cfg(feature = "proto-ipv4")]
 | 
			
		||||
pub use smoltcp::wire::{Ipv4Address, Ipv4Cidr};
 | 
			
		||||
@@ -232,7 +236,7 @@ impl<D: Driver + 'static> Stack<D> {
 | 
			
		||||
        resources: &'static mut StackResources<SOCK>,
 | 
			
		||||
        random_seed: u64,
 | 
			
		||||
    ) -> Self {
 | 
			
		||||
        #[cfg(feature = "medium-ethernet")]
 | 
			
		||||
        #[cfg(any(feature = "medium-ethernet", feature = "medium-ieee802154"))]
 | 
			
		||||
        let medium = device.capabilities().medium;
 | 
			
		||||
 | 
			
		||||
        let hardware_addr = match medium {
 | 
			
		||||
@@ -240,6 +244,8 @@ impl<D: Driver + 'static> Stack<D> {
 | 
			
		||||
            Medium::Ethernet => HardwareAddress::Ethernet(EthernetAddress(device.ethernet_address())),
 | 
			
		||||
            #[cfg(feature = "medium-ip")]
 | 
			
		||||
            Medium::Ip => HardwareAddress::Ip,
 | 
			
		||||
            #[cfg(feature = "medium-ieee802154")]
 | 
			
		||||
            Medium::Ieee802154 => HardwareAddress::Ieee802154(Ieee802154Address::Absent),
 | 
			
		||||
            #[allow(unreachable_patterns)]
 | 
			
		||||
            _ => panic!(
 | 
			
		||||
                "Unsupported medium {:?}. Make sure to enable it in embassy-net's Cargo features.",
 | 
			
		||||
@@ -262,6 +268,7 @@ impl<D: Driver + 'static> Stack<D> {
 | 
			
		||||
 | 
			
		||||
        let next_local_port = (random_seed % (LOCAL_PORT_MAX - LOCAL_PORT_MIN) as u64) as u16 + LOCAL_PORT_MIN;
 | 
			
		||||
 | 
			
		||||
        #[cfg_attr(feature = "medium-ieee802154", allow(unused_mut))]
 | 
			
		||||
        let mut socket = SocketStack {
 | 
			
		||||
            sockets,
 | 
			
		||||
            iface,
 | 
			
		||||
@@ -269,6 +276,7 @@ impl<D: Driver + 'static> Stack<D> {
 | 
			
		||||
            next_local_port,
 | 
			
		||||
        };
 | 
			
		||||
 | 
			
		||||
        #[cfg_attr(feature = "medium-ieee802154", allow(unused_mut))]
 | 
			
		||||
        let mut inner = Inner {
 | 
			
		||||
            device,
 | 
			
		||||
            link_up: false,
 | 
			
		||||
@@ -287,6 +295,9 @@ impl<D: Driver + 'static> Stack<D> {
 | 
			
		||||
            dns_waker: WakerRegistration::new(),
 | 
			
		||||
        };
 | 
			
		||||
 | 
			
		||||
        #[cfg(feature = "medium-ieee802154")]
 | 
			
		||||
        let _ = config;
 | 
			
		||||
 | 
			
		||||
        #[cfg(feature = "proto-ipv4")]
 | 
			
		||||
        match config.ipv4 {
 | 
			
		||||
            ConfigV4::Static(config) => {
 | 
			
		||||
 
 | 
			
		||||
@@ -17,6 +17,7 @@ embassy-time = { version = "0.1.2", path = "../embassy-time", optional = true }
 | 
			
		||||
embassy-futures = { version = "0.1.0", path = "../embassy-futures" }
 | 
			
		||||
embassy-hal-common = { version = "0.1.0", path = "../embassy-hal-common" }
 | 
			
		||||
embassy-embedded-hal = { version = "0.1.0", path = "../embassy-embedded-hal" }
 | 
			
		||||
embassy-net-driver-channel = { version = "0.1.0", path = "../embassy-net-driver-channel", optional=true }
 | 
			
		||||
 | 
			
		||||
defmt = { version = "0.3", optional = true }
 | 
			
		||||
cortex-m = "0.7.6"
 | 
			
		||||
@@ -32,7 +33,7 @@ bitflags = { version = "2.3.3", optional = true }
 | 
			
		||||
defmt = ["dep:defmt", "embassy-sync/defmt", "embassy-embedded-hal/defmt", "embassy-hal-common/defmt", "stm32wb-hci?/defmt"]
 | 
			
		||||
 | 
			
		||||
ble = ["dep:stm32wb-hci"]
 | 
			
		||||
mac = ["dep:bitflags"]
 | 
			
		||||
mac = ["dep:bitflags", "dep:embassy-net-driver-channel"]
 | 
			
		||||
 | 
			
		||||
stm32wb10cc = [ "embassy-stm32/stm32wb10cc" ]
 | 
			
		||||
stm32wb15cc = [ "embassy-stm32/stm32wb15cc" ]
 | 
			
		||||
 
 | 
			
		||||
@@ -10,6 +10,7 @@ embassy-executor = { version = "0.2.0", path = "../../embassy-executor", feature
 | 
			
		||||
embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] }
 | 
			
		||||
embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32wb55rg", "time-driver-any", "memory-x", "exti"]  }
 | 
			
		||||
embassy-stm32-wpan = { version = "0.1.0", path = "../../embassy-stm32-wpan", features = ["defmt", "stm32wb55rg"] }
 | 
			
		||||
embassy-net = { version = "0.1.0", path = "../../embassy-net", features = ["defmt", "udp", "medium-ieee802154", "nightly"], optional=true }
 | 
			
		||||
 | 
			
		||||
defmt = "0.3"
 | 
			
		||||
defmt-rtt = "0.4"
 | 
			
		||||
@@ -24,7 +25,7 @@ heapless = { version = "0.7.5", default-features = false }
 | 
			
		||||
 | 
			
		||||
[features]
 | 
			
		||||
default = ["ble", "mac"]
 | 
			
		||||
mac = ["embassy-stm32-wpan/mac"]
 | 
			
		||||
mac = ["embassy-stm32-wpan/mac", "dep:embassy-net"]
 | 
			
		||||
ble = ["embassy-stm32-wpan/ble"]
 | 
			
		||||
 | 
			
		||||
[[bin]] 
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user