From 37ceae908b39fcf1ef3b38680cef240ed6b1e867 Mon Sep 17 00:00:00 2001
From: Bob McWhirter <bmcwhirt@redhat.com>
Date: Wed, 1 Sep 2021 09:39:33 -0400
Subject: Rename Random impl to Rng. Create Random struct providing
 next_x(range) for all T:Rng.

---
 examples/stm32h7/src/bin/eth.rs |  6 +++---
 examples/stm32h7/src/bin/rng.rs | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'examples')

diff --git a/examples/stm32h7/src/bin/eth.rs b/examples/stm32h7/src/bin/eth.rs
index 4a9f261c2..df4931455 100644
--- a/examples/stm32h7/src/bin/eth.rs
+++ b/examples/stm32h7/src/bin/eth.rs
@@ -21,7 +21,7 @@ use embassy_net::{
 };
 use embassy_stm32::eth::lan8742a::LAN8742A;
 use embassy_stm32::eth::{Ethernet, State};
-use embassy_stm32::rng::Random;
+use embassy_stm32::rng::Rng;
 use embassy_stm32::{interrupt, peripherals};
 use heapless::Vec;
 use panic_probe as _;
@@ -81,7 +81,7 @@ fn _embassy_rand(buf: &mut [u8]) {
     });
 }
 
-static mut RNG_INST: Option<Random<RNG>> = None;
+static mut RNG_INST: Option<Rng<RNG>> = None;
 
 static EXECUTOR: Forever<Executor> = Forever::new();
 static STATE: Forever<State<'static, 4, 4>> = Forever::new();
@@ -97,7 +97,7 @@ fn main() -> ! {
 
     let p = embassy_stm32::init(config());
 
-    let rng = Random::new(p.RNG);
+    let rng = Rng::new(p.RNG);
     unsafe {
         RNG_INST.replace(rng);
     }
diff --git a/examples/stm32h7/src/bin/rng.rs b/examples/stm32h7/src/bin/rng.rs
index fea88c410..cf1b14ea5 100644
--- a/examples/stm32h7/src/bin/rng.rs
+++ b/examples/stm32h7/src/bin/rng.rs
@@ -8,9 +8,9 @@
 mod example_common;
 use embassy::executor::Spawner;
 use embassy::time::{Duration, Timer};
-use embassy::traits::rng::Random as _;
 use embassy_stm32::gpio::{Level, Output, Speed};
-use embassy_stm32::rng::Random;
+use embassy_stm32::rng::Rng;
+use embassy::traits::rng::Random;
 use embassy_stm32::Peripherals;
 use embedded_hal::digital::v2::OutputPin;
 use example_common::*;
@@ -21,14 +21,14 @@ async fn main(_spawner: Spawner, p: Peripherals) {
 
     let mut led = Output::new(p.PB14, Level::High, Speed::Low);
 
-    let mut rng = Random::new(p.RNG);
+    let mut rng = Random::new(Rng::new(p.RNG));
 
     loop {
-        info!("high {}", unwrap!(rng.next(16).await));
+        info!("high {}", unwrap!(rng.next_u8(16).await));
         unwrap!(led.set_high());
         Timer::after(Duration::from_millis(500)).await;
 
-        info!("low {}", unwrap!(rng.next(16).await));
+        info!("low {}", unwrap!(rng.next_u8(16).await));
         unwrap!(led.set_low());
         Timer::after(Duration::from_millis(500)).await;
     }
-- 
cgit