Implement for embassy-net and fixes

embassy-rs · May 29, 2021 · 0b8e456 · 0b8e456
1 parent 5061375
commit 0b8e456
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 132 deletions.
diff --git a/embassy-net/Cargo.toml b/embassy-net/Cargo.toml
@@ -11,6 +11,7 @@ defmt-debug = []
 defmt-info = []
 defmt-warn = []
 defmt-error = []
+defmt-enable = [ "defmt", "embassy/defmt-enable", "embassy-fmt/defmt" ]
 
 tcp = ["smoltcp/socket-tcp"]
 dhcpv4 = ["medium-ethernet", "smoltcp/socket-dhcpv4"]
@@ -23,6 +24,7 @@ defmt = { version = "0.2.0", optional = true }
 log = { version = "0.4.11", optional = true }
 
 embassy             = { version = "0.1.0", path = "../embassy" }
+embassy-fmt         = { version = "0.1.0", path = "../embassy-fmt" }
 
 managed             = { version = "0.8.0", default-features = false, features = [ "map" ]}
 heapless            = { version = "0.5.6", default-features = false } 

diff --git a/embassy-net/src/config/dhcp.rs b/embassy-net/src/config/dhcp.rs
@@ -4,7 +4,6 @@ use smoltcp::time::Instant;
 
 use super::*;
 use crate::device::LinkState;
-use crate::fmt::*;
 use crate::{Interface, SocketSet};
 
 pub struct DhcpConfigurator {

diff --git a/embassy-net/src/config/mod.rs b/embassy-net/src/config/mod.rs
@@ -3,7 +3,6 @@ use heapless::Vec;
 use smoltcp::time::Instant;
 use smoltcp::wire::{Ipv4Address, Ipv4Cidr};
 
-use crate::fmt::*;
 use crate::{Interface, SocketSet};
 
 mod statik;

diff --git a/embassy-net/src/config/statik.rs b/embassy-net/src/config/statik.rs
@@ -1,7 +1,6 @@
 use smoltcp::time::Instant;
 
 use super::*;
-use crate::fmt::*;
 use crate::{Interface, SocketSet};
 
 pub struct StaticConfigurator {

diff --git a/embassy-net/src/device.rs b/embassy-net/src/device.rs
@@ -3,7 +3,6 @@ use smoltcp::phy::Device as SmolDevice;
 use smoltcp::phy::DeviceCapabilities;
 use smoltcp::time::Instant as SmolInstant;
 
-use crate::fmt::*;
 use crate::packet_pool::PacketBoxExt;
 use crate::Result;
 use crate::{Packet, PacketBox, PacketBuf};

diff --git a/embassy-net/src/fmt.rs b/embassy-net/src/fmt.rs
diff --git a/embassy-net/src/lib.rs b/embassy-net/src/lib.rs
@@ -1,7 +1,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
-// This mod MUST go first, so that the others see its macros.
-pub(crate) mod fmt;
+#[macro_use]
+extern crate embassy_fmt;
 
 mod config;
 mod device;

diff --git a/embassy-net/src/stack.rs b/embassy-net/src/stack.rs
@@ -20,7 +20,6 @@ use smoltcp::wire::{IpAddress, IpCidr, Ipv4Address, Ipv4Cidr};
 use crate::config::Configurator;
 use crate::config::Event;
 use crate::device::{Device, DeviceAdapter, LinkState};
-use crate::fmt::*;
 use crate::{Interface, SocketSet};
 
 const ADDRESSES_LEN: usize = 1;

diff --git a/embassy-net/src/tcp_socket.rs b/embassy-net/src/tcp_socket.rs
@@ -11,7 +11,6 @@ use smoltcp::time::Duration;
 use smoltcp::wire::IpEndpoint;
 
 use super::stack::Stack;
-use crate::fmt::*;
 use crate::{Error, Result};
 
 pub struct TcpSocket<'a> {

diff --git a/embassy-nrf/src/spim.rs b/embassy-nrf/src/spim.rs
@@ -12,9 +12,8 @@ use futures::future::poll_fn;
 use traits::spi::FullDuplex;
 
 use crate::gpio::sealed::Pin as _;
-use crate::gpio::{OptionalPin, Pin as GpioPin};
+use crate::gpio::{self, OptionalPin, Pin as GpioPin};
 use crate::interrupt::Interrupt;
-use crate::gpio;
 use crate::{pac, util::slice_in_ram_or};
 
 pub use embedded_hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3};

diff --git a/embassy-nrf/src/twim.rs b/embassy-nrf/src/twim.rs
@@ -13,10 +13,9 @@ use embassy::util::{AtomicWaker, Unborrow};
 use embassy_extras::unborrow;
 
 use crate::chip::{EASY_DMA_SIZE, FORCE_COPY_BUFFER_SIZE};
-use crate::gpio::Pin as GpioPin;
+use crate::gpio::{self, Pin as GpioPin};
 use crate::pac;
 use crate::util::{slice_in_ram, slice_in_ram_or};
-use crate::gpio;
 
 pub enum Frequency {
     #[doc = "26738688: 100 kbps"]

diff --git a/embassy-stm32/src/rcc/h7/mod.rs b/embassy-stm32/src/rcc/h7/mod.rs
@@ -2,7 +2,6 @@ use core::marker::PhantomData;
 
 use embassy::util::Unborrow;
 
-use crate::fmt::{assert, panic};
 use crate::pac::peripherals;
 use crate::pac::rcc::vals::Timpre;
 use crate::pac::{DBGMCU, RCC, SYSCFG};

diff --git a/embassy-stm32/src/rcc/h7/pll.rs b/embassy-stm32/src/rcc/h7/pll.rs
@@ -1,5 +1,4 @@
 use super::{Hertz, RCC};
-use crate::fmt::assert;
 
 const VCO_MIN: u32 = 150_000_000;
 const VCO_MAX: u32 = 420_000_000;