Commit 13c19c57 authored by Damien George's avatar Damien George
Browse files

stmhal: Only init RNG if it's used.

parent 0a6e9f56
...@@ -458,8 +458,7 @@ soft_reset: ...@@ -458,8 +458,7 @@ soft_reset:
#endif #endif
#if MICROPY_HW_ENABLE_RNG #if MICROPY_HW_ENABLE_RNG
// RNG rng_init0();
rng_init();
#endif #endif
#if MICROPY_HW_ENABLE_TIMER #if MICROPY_HW_ENABLE_TIMER
......
#include <string.h>
#include "stm32f4xx_hal.h" #include "stm32f4xx_hal.h"
#include "misc.h" #include "misc.h"
...@@ -6,20 +8,35 @@ ...@@ -6,20 +8,35 @@
#include "obj.h" #include "obj.h"
#include "rng.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) { void rng_init(void) {
__RNG_CLK_ENABLE(); __RNG_CLK_ENABLE();
RngHandle.Instance = RNG; HAL_RNG_Init(&RNGHandle);
HAL_RNG_Init(&RngHandle);
} }
uint32_t rng_get(void) { 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) { 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); MP_DEFINE_CONST_FUN_OBJ_0(pyb_rng_get_obj, pyb_rng_get);
#endif // MICROPY_HW_ENABLE_RNG
void rng_init(void); void rng_init0(void);
uint32_t rng_get(void); uint32_t rng_get(void);
MP_DECLARE_CONST_FUN_OBJ(pyb_rng_get_obj); MP_DECLARE_CONST_FUN_OBJ(pyb_rng_get_obj);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment