moved constants to stm32u545

Author: theonlytruealex

boards/nucleo_u545re_q/src/main.rs

@@ -15,6 +15,7 @@ use kernel::platform::{KernelResources, SyscallDriverLookup};
 use kernel::utilities::single_thread_value::SingleThreadValue;
 use kernel::{create_capability, static_init};
 
+use stm32u545::entropy::RNG_BASE;
 use stm32u545::gpio::PinId;
 
 pub mod io;
@@ -152,8 +153,8 @@ unsafe fn start() -> (
     );
     usart1.register();
     let trng = static_init!(
-        stm32u545::Trng<'static>,
-        stm32u545::Trng::new(stm32u545::entropy::RNG_BASE)
+        stm32u545::entropy::Trng<'static>,
+        stm32u545::entropy::Trng::new(RNG_BASE)
     );
 
     // Load Peripherals Bundle

chips/stm32u545/src/entropy.rs

@@ -0,0 +1,11 @@
+// specified in the documentation (NIST compliant RNG configuration table in AN4230 available from www.st.com.)
+// that values for the CR, HTCR and NSCR should be 0x00F11F00, 0x76B3 and 0x24C2 respectivly. CR config
+// is that value, 0x00F11F00, plus the CONDRST bit
+pub const RNG_CR_CONFIG_U545: u32 = 0x40F11F00;
+pub const RNG_HTCR_CONFIG_U545: u32 = 0x76B3;
+pub const RNG_NSCR_CONFIG_U545: u32 = 0x24C2;
+
+pub type Trng<'a> =
+    stm32u5xx::entropy::Trng<'a, RNG_CR_CONFIG_U545, RNG_HTCR_CONFIG_U545, RNG_NSCR_CONFIG_U545>;
+
+pub use stm32u5xx::entropy::RNG_BASE;

chips/stm32u545/src/lib.rs

@@ -4,13 +4,11 @@
 
 #![no_std]
 
-use stm32u5xx::entropy::{RNG_CR_CONFIG_U545, RNG_HTCR_CONFIG_U545, RNG_NSCR_CONFIG_U545};
-pub use stm32u5xx::{chip, dma, entropy, exti, gpio, rcc, tim, usart};
+pub use stm32u5xx::{chip, dma, exti, gpio, rcc, tim, usart};
 
 use cortexm33::{CortexM33, CortexMVariant};
 
-pub type Trng<'a> =
-    stm32u5xx::entropy::Trng<'a, RNG_CR_CONFIG_U545, RNG_HTCR_CONFIG_U545, RNG_NSCR_CONFIG_U545>;
+pub mod entropy;
 
 #[cfg_attr(all(target_arch = "arm", target_os = "none"), used)]
 #[cfg_attr(all(target_arch = "arm", target_os = "none"), link_section = ".irqs")]

chips/stm32u5xx/src/entropy.rs

@@ -11,13 +11,6 @@ use kernel::utilities::registers::interfaces::{ReadWriteable, Readable, Writeabl
 use kernel::utilities::registers::{register_bitfields, register_structs, ReadOnly, ReadWrite};
 use kernel::utilities::StaticRef;
 
-// specified in the documentation (NIST compliant RNG configuration table in AN4230 available from www.st.com.)
-// that values for the CR, HTCR and NSCR should be 0x00F11F00, 0x76B3 and 0x24C2 respectivly. CR config
-// is that value, 0x00F11F00, plus the CONDRST bit
-pub const RNG_CR_CONFIG_U545: u32 = 0x40F11F00;
-pub const RNG_HTCR_CONFIG_U545: u32 = 0x76B3;
-pub const RNG_NSCR_CONFIG_U545: u32 = 0x24C2;
-
 register_structs! {
     /// Random number generator
     pub RngRegisters {