From 13c19c57a02c7f157ed062821b7446edf691be06 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Sun, 20 Apr 2014 00:45:59 +0100
Subject: [PATCH] stmhal: Only init RNG if it's used.
---
stmhal/main.c | 3 +--
stmhal/rng.c | 27 ++++++++++++++++++++++-----
stmhal/rng.h | 2 +-
3 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/stmhal/main.c b/stmhal/main.c
index 86cbe3601..bfcee76b6 100644
--- a/stmhal/main.c
+++ b/stmhal/main.c
@@ -458,8 +458,7 @@ soft_reset:
#endif
#if MICROPY_HW_ENABLE_RNG
- // RNG
- rng_init();
+ rng_init0();
#endif
#if MICROPY_HW_ENABLE_TIMER
diff --git a/stmhal/rng.c b/stmhal/rng.c
index f0d14fe97..19e624f79 100644
--- a/stmhal/rng.c
+++ b/stmhal/rng.c
@@ -1,3 +1,5 @@
+#include <string.h>
+
#include "stm32f4xx_hal.h"
#include "misc.h"
@@ -6,20 +8,35 @@
#include "obj.h"
#include "rng.h"
-STATIC RNG_HandleTypeDef RngHandle;
+#if MICROPY_HW_ENABLE_RNG
+
+STATIC RNG_HandleTypeDef RNGHandle = {.Instance = NULL};
+
+void rng_init0(void) {
+ // reset the RNG handle
+ memset(&RNGHandle, 0, sizeof(RNG_HandleTypeDef));
+ RNGHandle.Instance = RNG;
+}
void rng_init(void) {
__RNG_CLK_ENABLE();
- RngHandle.Instance = RNG;
- HAL_RNG_Init(&RngHandle);
+ HAL_RNG_Init(&RNGHandle);
}
uint32_t rng_get(void) {
- return HAL_RNG_GetRandomNumber(&RngHandle);
+ if (RNGHandle.State == HAL_RNG_STATE_RESET) {
+ rng_init();
+ }
+ return HAL_RNG_GetRandomNumber(&RNGHandle);
}
STATIC mp_obj_t pyb_rng_get(void) {
- return mp_obj_new_int(HAL_RNG_GetRandomNumber(&RngHandle) >> 2);
+ if (RNGHandle.State == HAL_RNG_STATE_RESET) {
+ rng_init();
+ }
+ return mp_obj_new_int(HAL_RNG_GetRandomNumber(&RNGHandle) >> 2);
}
MP_DEFINE_CONST_FUN_OBJ_0(pyb_rng_get_obj, pyb_rng_get);
+
+#endif // MICROPY_HW_ENABLE_RNG
diff --git a/stmhal/rng.h b/stmhal/rng.h
index 5442d453c..650d69026 100644
--- a/stmhal/rng.h
+++ b/stmhal/rng.h
@@ -1,4 +1,4 @@
-void rng_init(void);
+void rng_init0(void);
uint32_t rng_get(void);
MP_DECLARE_CONST_FUN_OBJ(pyb_rng_get_obj);
--
GitLab