diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-07-31 01:41:12 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2023-07-31 01:41:12 +0200 |
| commit | 4999b045df4e5956733b0341795714a9214c12d3 (patch) | |
| tree | 84c40ec27c89bb4dedea30cdafbaad484bfda3cb /examples/stm32l5/src | |
| parent | d6c5c1772cf2c6099ab08675afc0fead2e50fffb (diff) | |
stm32/rng: use bind_interrupts!.
Diffstat (limited to 'examples/stm32l5/src')
| -rw-r--r-- | examples/stm32l5/src/bin/rng.rs | 8 | ||||
| -rw-r--r-- | examples/stm32l5/src/bin/usb_ethernet.rs | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/examples/stm32l5/src/bin/rng.rs b/examples/stm32l5/src/bin/rng.rs index d359847e8..9549d64d8 100644 --- a/examples/stm32l5/src/bin/rng.rs +++ b/examples/stm32l5/src/bin/rng.rs | |||
| @@ -6,9 +6,13 @@ use defmt::*; | |||
| 6 | use embassy_executor::Spawner; | 6 | use embassy_executor::Spawner; |
| 7 | use embassy_stm32::rcc::{ClockSrc, PLLClkDiv, PLLMul, PLLSource, PLLSrcDiv}; | 7 | use embassy_stm32::rcc::{ClockSrc, PLLClkDiv, PLLMul, PLLSource, PLLSrcDiv}; |
| 8 | use embassy_stm32::rng::Rng; | 8 | use embassy_stm32::rng::Rng; |
| 9 | use embassy_stm32::Config; | 9 | use embassy_stm32::{bind_interrupts, peripherals, rng, Config}; |
| 10 | use {defmt_rtt as _, panic_probe as _}; | 10 | use {defmt_rtt as _, panic_probe as _}; |
| 11 | 11 | ||
| 12 | bind_interrupts!(struct Irqs { | ||
| 13 | RNG => rng::InterruptHandler<peripherals::RNG>; | ||
| 14 | }); | ||
| 15 | |||
| 12 | #[embassy_executor::main] | 16 | #[embassy_executor::main] |
| 13 | async fn main(_spawner: Spawner) { | 17 | async fn main(_spawner: Spawner) { |
| 14 | let mut config = Config::default(); | 18 | let mut config = Config::default(); |
| @@ -23,7 +27,7 @@ async fn main(_spawner: Spawner) { | |||
| 23 | 27 | ||
| 24 | info!("Hello World!"); | 28 | info!("Hello World!"); |
| 25 | 29 | ||
| 26 | let mut rng = Rng::new(p.RNG); | 30 | let mut rng = Rng::new(p.RNG, Irqs); |
| 27 | 31 | ||
| 28 | let mut buf = [0u8; 16]; | 32 | let mut buf = [0u8; 16]; |
| 29 | unwrap!(rng.async_fill_bytes(&mut buf).await); | 33 | unwrap!(rng.async_fill_bytes(&mut buf).await); |
diff --git a/examples/stm32l5/src/bin/usb_ethernet.rs b/examples/stm32l5/src/bin/usb_ethernet.rs index 32eba4277..5e75b21c9 100644 --- a/examples/stm32l5/src/bin/usb_ethernet.rs +++ b/examples/stm32l5/src/bin/usb_ethernet.rs | |||
| @@ -9,7 +9,7 @@ use embassy_net::{Stack, StackResources}; | |||
| 9 | use embassy_stm32::rcc::*; | 9 | use embassy_stm32::rcc::*; |
| 10 | use embassy_stm32::rng::Rng; | 10 | use embassy_stm32::rng::Rng; |
| 11 | use embassy_stm32::usb::Driver; | 11 | use embassy_stm32::usb::Driver; |
| 12 | use embassy_stm32::{bind_interrupts, peripherals, usb, Config}; | 12 | use embassy_stm32::{bind_interrupts, peripherals, rng, usb, Config}; |
| 13 | use embassy_usb::class::cdc_ncm::embassy_net::{Device, Runner, State as NetState}; | 13 | use embassy_usb::class::cdc_ncm::embassy_net::{Device, Runner, State as NetState}; |
| 14 | use embassy_usb::class::cdc_ncm::{CdcNcmClass, State}; | 14 | use embassy_usb::class::cdc_ncm::{CdcNcmClass, State}; |
| 15 | use embassy_usb::{Builder, UsbDevice}; | 15 | use embassy_usb::{Builder, UsbDevice}; |
| @@ -24,6 +24,7 @@ const MTU: usize = 1514; | |||
| 24 | 24 | ||
| 25 | bind_interrupts!(struct Irqs { | 25 | bind_interrupts!(struct Irqs { |
| 26 | USB_FS => usb::InterruptHandler<peripherals::USB>; | 26 | USB_FS => usb::InterruptHandler<peripherals::USB>; |
| 27 | RNG => rng::InterruptHandler<peripherals::RNG>; | ||
| 27 | }); | 28 | }); |
| 28 | 29 | ||
| 29 | #[embassy_executor::task] | 30 | #[embassy_executor::task] |
| @@ -99,7 +100,7 @@ async fn main(spawner: Spawner) { | |||
| 99 | //}); | 100 | //}); |
| 100 | 101 | ||
| 101 | // Generate random seed | 102 | // Generate random seed |
| 102 | let mut rng = Rng::new(p.RNG); | 103 | let mut rng = Rng::new(p.RNG, Irqs); |
| 103 | let seed = rng.next_u64(); | 104 | let seed = rng.next_u64(); |
| 104 | 105 | ||
| 105 | // Init network stack | 106 | // Init network stack |
