Rename embassy-extras to embassy-hal-common

embassy-stm32/Cargo.toml

@@ -8,7 +8,7 @@ resolver = "2"
 [dependencies]
 embassy = { version = "0.1.0", path = "../embassy", features = ["time-tick-32768hz"] }
 embassy-macros = { version = "0.1.0", path = "../embassy-macros", features = ["stm32"] }
-embassy-extras = {version = "0.1.0", path = "../embassy-extras" }
+embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" }
 embassy-traits = {version = "0.1.0", path = "../embassy-traits" }
 embassy-net = { version = "0.1.0", path = "../embassy-net", default-features = false, optional = true }
 

embassy-stm32/gen.py

@@ -85,4 +85,4 @@ with open(output_file, 'w') as f:
     for (channel_id, defn) in core['dma_channels'].items():
         singletons.append( channel_id )
 
-    f.write(f"embassy_extras::peripherals!({','.join(singletons)});")
+    f.write(f"embassy_hal_common::peripherals!({','.join(singletons)});")

embassy-stm32/src/adc/v3.rs

@@ -1,7 +1,7 @@
 use crate::adc::{AdcPin, Instance};
 use core::marker::PhantomData;
 use embassy::util::Unborrow;
-use embassy_extras::unborrow;
+use embassy_hal_common::unborrow;
 use embedded_hal::blocking::delay::DelayUs;
 
 pub const VDDA_CALIB_MV: u32 = 3000;

embassy-stm32/src/dac/v2.rs

@@ -3,7 +3,7 @@ use crate::gpio::AnyPin;
 use crate::pac::dac;
 use core::marker::PhantomData;
 use embassy::util::Unborrow;
-use embassy_extras::unborrow;
+use embassy_hal_common::unborrow;
 
 #[derive(Debug)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]

embassy-stm32/src/eth/v2/mod.rs

@@ -4,8 +4,8 @@ use core::sync::atomic::{fence, Ordering};
 use core::task::Waker;
 
 use embassy::util::{AtomicWaker, Unborrow};
-use embassy_extras::peripheral::{PeripheralMutex, PeripheralState};
-use embassy_extras::unborrow;
+use embassy_hal_common::peripheral::{PeripheralMutex, PeripheralState};
+use embassy_hal_common::unborrow;
 use embassy_net::{Device, DeviceCapabilities, LinkState, PacketBuf, MTU};
 
 use crate::gpio::sealed::Pin as __GpioPin;

embassy-stm32/src/exti/mod.rs

@@ -42,7 +42,7 @@ mod _version;
 pub use _version::*;
 
 use crate::peripherals;
-use embassy_extras::unsafe_impl_unborrow;
+use embassy_hal_common::unsafe_impl_unborrow;
 
 pub(crate) mod sealed {
     pub trait Channel {}

embassy-stm32/src/gpio.rs

@@ -2,7 +2,7 @@
 use core::convert::Infallible;
 use core::marker::PhantomData;
 use embassy::util::Unborrow;
-use embassy_extras::{unborrow, unsafe_impl_unborrow};
+use embassy_hal_common::{unborrow, unsafe_impl_unborrow};
 use embedded_hal::digital::v2::{toggleable, InputPin, OutputPin, StatefulOutputPin};
 
 use crate::pac;

embassy-stm32/src/i2c/v1.rs

@@ -2,7 +2,7 @@ use crate::i2c::{Error, Instance, SclPin, SdaPin};
 use crate::time::Hertz;
 use core::marker::PhantomData;
 use embassy::util::Unborrow;
-use embassy_extras::unborrow;
+use embassy_hal_common::unborrow;
 use embedded_hal::blocking::i2c::Read;
 use embedded_hal::blocking::i2c::Write;
 use embedded_hal::blocking::i2c::WriteRead;

embassy-stm32/src/i2c/v2.rs

@@ -1,7 +1,7 @@
 use core::cmp;
 use core::marker::PhantomData;
 use embassy::util::Unborrow;
-use embassy_extras::unborrow;
+use embassy_hal_common::unborrow;
 use embedded_hal::blocking::i2c::Read;
 use embedded_hal::blocking::i2c::Write;
 use embedded_hal::blocking::i2c::WriteRead;

embassy-stm32/src/interrupt.rs

@@ -1,7 +1,7 @@
 pub use bare_metal::Mutex;
 pub use critical_section::CriticalSection;
 pub use embassy::interrupt::{take, Interrupt};
-pub use embassy_extras::interrupt::Priority4 as Priority;
+pub use embassy_hal_common::interrupt::Priority4 as Priority;
 
 use crate::pac::Interrupt as InterruptEnum;
 use embassy::interrupt::declare;

embassy-stm32/src/rcc/f4/mod.rs

@@ -6,7 +6,7 @@ use crate::time::Hertz;
 use crate::time::U32Ext;
 use core::marker::PhantomData;
 use embassy::util::Unborrow;
-use embassy_extras::unborrow;
+use embassy_hal_common::unborrow;
 use pac::rcc::vals::{Hpre, Ppre, Sw};
 
 /// Most of clock setup is copied from stm32l0xx-hal, and adopted to the generated PAC,

embassy-stm32/src/rcc/l0/mod.rs

@@ -6,7 +6,7 @@ use crate::time::Hertz;
 use crate::time::U32Ext;
 use core::marker::PhantomData;
 use embassy::util::Unborrow;
-use embassy_extras::unborrow;
+use embassy_hal_common::unborrow;
 use pac::rcc::vals::{Hpre, Msirange, Plldiv, Pllmul, Pllsrc, Ppre, Sw};
 
 /// Most of clock setup is copied from stm32l0xx-hal, and adopted to the generated PAC,

embassy-stm32/src/rcc/l4/mod.rs

@@ -6,7 +6,7 @@ use crate::time::Hertz;
 use crate::time::U32Ext;
 use core::marker::PhantomData;
 use embassy::util::Unborrow;
-use embassy_extras::unborrow;
+use embassy_hal_common::unborrow;
 
 /// Most of clock setup is copied from stm32l0xx-hal, and adopted to the generated PAC,
 /// and with the addition of the init function to configure a system clock.

embassy-stm32/src/rcc/wb55/mod.rs

@@ -6,7 +6,7 @@ use crate::time::Hertz;
 use crate::time::U32Ext;
 use core::marker::PhantomData;
 use embassy::util::Unborrow;
-use embassy_extras::unborrow;
+use embassy_hal_common::unborrow;
 
 /// Most of clock setup is copied from stm32l0xx-hal, and adopted to the generated PAC,
 /// and with the addition of the init function to configure a system clock.

embassy-stm32/src/rcc/wl5x/mod.rs

@@ -6,7 +6,7 @@ use crate::time::Hertz;
 use crate::time::U32Ext;
 use core::marker::PhantomData;
 use embassy::util::Unborrow;
-use embassy_extras::unborrow;
+use embassy_hal_common::unborrow;
 
 /// Most of clock setup is copied from stm32l0xx-hal, and adopted to the generated PAC,
 /// and with the addition of the init function to configure a system clock.

embassy-stm32/src/rng.rs

@@ -4,7 +4,7 @@ use core::future::Future;
 use core::task::Poll;
 use embassy::traits;
 use embassy::util::{AtomicWaker, Unborrow};
-use embassy_extras::unborrow;
+use embassy_hal_common::unborrow;
 use futures::future::poll_fn;
 use rand_core::{CryptoRng, RngCore};
 

embassy-stm32/src/sdmmc/v2.rs

@@ -6,7 +6,7 @@ use core::task::Poll;
 
 use embassy::interrupt::InterruptExt;
 use embassy::util::{AtomicWaker, OnDrop, Unborrow};
-use embassy_extras::unborrow;
+use embassy_hal_common::unborrow;
 use futures::future::poll_fn;
 use sdio_host::{BusWidth, CardCapacity, CardStatus, CurrentState, SDStatus, CID, CSD, OCR, SCR};
 

embassy-stm32/src/spi/v1.rs

@@ -12,7 +12,7 @@ use core::future::Future;
 use core::marker::PhantomData;
 use core::ptr;
 use embassy::util::Unborrow;
-use embassy_extras::unborrow;
+use embassy_hal_common::unborrow;
 use embassy_traits::spi as traits;
 pub use embedded_hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3};
 use futures::future::join3;

embassy-stm32/src/spi/v2.rs

@@ -14,7 +14,7 @@ use core::future::Future;
 use core::marker::PhantomData;
 use core::ptr;
 use embassy::util::Unborrow;
-use embassy_extras::unborrow;
+use embassy_hal_common::unborrow;
 use embassy_traits::spi as traits;
 pub use embedded_hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3};
 use futures::future::join3;

embassy-stm32/src/spi/v3.rs

@@ -14,7 +14,7 @@ use core::future::Future;
 use core::marker::PhantomData;
 use core::ptr;
 use embassy::util::Unborrow;
-use embassy_extras::unborrow;
+use embassy_hal_common::unborrow;
 use embassy_traits::spi as traits;
 pub use embedded_hal::spi::{Mode, Phase, Polarity, MODE_0, MODE_1, MODE_2, MODE_3};
 

embassy-stm32/src/usart/v1.rs

@@ -1,7 +1,7 @@
 use core::future::Future;
 use core::marker::PhantomData;
 use embassy::util::Unborrow;
-use embassy_extras::unborrow;
+use embassy_hal_common::unborrow;
 use futures::TryFutureExt;
 
 use super::*;

embassy-stm32/src/usart/v2.rs

@@ -1,7 +1,7 @@
 use core::future::Future;
 use core::marker::PhantomData;
 use embassy::util::Unborrow;
-use embassy_extras::unborrow;
+use embassy_hal_common::unborrow;
 use futures::TryFutureExt;
 
 use super::*;