diff options
| author | Dario Nieuwenhuis <[email protected]> | 2021-05-17 02:16:17 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2021-05-17 02:16:17 +0200 |
| commit | cd0d3c4b0da528a10c9ca510e5863bc8779fd28f (patch) | |
| tree | 1d3d54be50034279400e47ac0b4a3ce56d2e6a67 /embassy-traits/src | |
| parent | 35d05a4214e035bbb6da380c38c0a90b285887f2 (diff) | |
| parent | dd69320b9e3c6e306304e364a351d43b6b3ce9a2 (diff) | |
Merge branch 'stm32-neo'
Diffstat (limited to 'embassy-traits/src')
| -rw-r--r-- | embassy-traits/src/flash.rs | 1 | ||||
| -rw-r--r-- | embassy-traits/src/gpio.rs | 1 | ||||
| -rw-r--r-- | embassy-traits/src/lib.rs | 1 | ||||
| -rw-r--r-- | embassy-traits/src/rng.rs | 17 | ||||
| -rw-r--r-- | embassy-traits/src/spi.rs | 1 | ||||
| -rw-r--r-- | embassy-traits/src/uart.rs | 1 |
6 files changed, 18 insertions, 4 deletions
diff --git a/embassy-traits/src/flash.rs b/embassy-traits/src/flash.rs index c9b14a390..5e0a4e39f 100644 --- a/embassy-traits/src/flash.rs +++ b/embassy-traits/src/flash.rs | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | use core::future::Future; | 1 | use core::future::Future; |
| 2 | use core::pin::Pin; | ||
| 3 | 2 | ||
| 4 | #[derive(Copy, Clone, Debug, Eq, PartialEq)] | 3 | #[derive(Copy, Clone, Debug, Eq, PartialEq)] |
| 5 | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | 4 | #[cfg_attr(feature = "defmt", derive(defmt::Format))] |
diff --git a/embassy-traits/src/gpio.rs b/embassy-traits/src/gpio.rs index c4ae206cd..9fdb41f56 100644 --- a/embassy-traits/src/gpio.rs +++ b/embassy-traits/src/gpio.rs | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | use core::future::Future; | 1 | use core::future::Future; |
| 2 | use core::pin::Pin; | ||
| 3 | 2 | ||
| 4 | /// Wait for a pin to become high. | 3 | /// Wait for a pin to become high. |
| 5 | pub trait WaitForHigh { | 4 | pub trait WaitForHigh { |
diff --git a/embassy-traits/src/lib.rs b/embassy-traits/src/lib.rs index ceef0d2ed..047417870 100644 --- a/embassy-traits/src/lib.rs +++ b/embassy-traits/src/lib.rs | |||
| @@ -13,3 +13,4 @@ pub mod gpio; | |||
| 13 | pub mod i2c; | 13 | pub mod i2c; |
| 14 | pub mod spi; | 14 | pub mod spi; |
| 15 | pub mod uart; | 15 | pub mod uart; |
| 16 | pub mod rng; | ||
diff --git a/embassy-traits/src/rng.rs b/embassy-traits/src/rng.rs new file mode 100644 index 000000000..ddc4c20e0 --- /dev/null +++ b/embassy-traits/src/rng.rs | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | use core::future::Future; | ||
| 2 | |||
| 3 | /// Random-number Generator | ||
| 4 | pub trait Rng { | ||
| 5 | type Error; | ||
| 6 | |||
| 7 | type RngFuture<'a>: Future<Output = Result<(), Self::Error>> + 'a | ||
| 8 | where | ||
| 9 | Self: 'a; | ||
| 10 | |||
| 11 | /// Completely fill the provided buffer with random bytes. | ||
| 12 | /// | ||
| 13 | /// May result in delays if entropy is exhausted prior to completely | ||
| 14 | /// filling the buffer. Upon completion, the buffer will be completely | ||
| 15 | /// filled or an error will have been reported. | ||
| 16 | fn fill_bytes<'a>(&'a mut self, dest: &'a mut [u8]) -> Self::RngFuture<'a>; | ||
| 17 | } | ||
diff --git a/embassy-traits/src/spi.rs b/embassy-traits/src/spi.rs index 771ebf2f0..227b8bfea 100644 --- a/embassy-traits/src/spi.rs +++ b/embassy-traits/src/spi.rs | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | //! Async SPI API | 1 | //! Async SPI API |
| 2 | 2 | ||
| 3 | use core::future::Future; | 3 | use core::future::Future; |
| 4 | use core::pin::Pin; | ||
| 5 | 4 | ||
| 6 | /// Full duplex (master mode) | 5 | /// Full duplex (master mode) |
| 7 | /// | 6 | /// |
diff --git a/embassy-traits/src/uart.rs b/embassy-traits/src/uart.rs index 9e76306b0..755aee6d3 100644 --- a/embassy-traits/src/uart.rs +++ b/embassy-traits/src/uart.rs | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | use core::future::Future; | 1 | use core::future::Future; |
| 2 | use core::pin::Pin; | ||
| 3 | 2 | ||
| 4 | #[derive(Copy, Clone, Debug, Eq, PartialEq)] | 3 | #[derive(Copy, Clone, Debug, Eq, PartialEq)] |
| 5 | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | 4 | #[cfg_attr(feature = "defmt", derive(defmt::Format))] |
