Merge branch 'config_core_selector'

1 files changed, 7 insertions, 3 deletions

diff --git a/csprng.c b/csprng.c
index 1051bbd..9517d0d 100644
--- a/csprng.c
+++ b/csprng.c
@@ -35,24 +35,28 @@
 #include <stdint.h>
 
 #include "hal.h"
+#include "verilog_constants.h"
 
 #ifndef WAIT_FOR_CSPRNG_VALID
 #define WAIT_FOR_CSPRNG_VALID   0
 #endif
 
-hal_error_t hal_get_random(void *buffer, const size_t length)
+hal_error_t hal_get_random(const hal_core_t *core, void *buffer, const size_t length)
 {
   uint8_t temp[4], *buf = buffer;
   hal_error_t err;
   size_t i;
 
+  if ((err = hal_core_check_name(&core, CSPRNG_NAME)) != HAL_OK)
+    return err;
+
   for (i = 0; i < length; i += 4) {
     const int last = (length - i) < 4;
 
-    if (WAIT_FOR_CSPRNG_VALID && (err = hal_io_wait_valid(CSPRNG_ADDR_STATUS)) != HAL_OK)
+    if (WAIT_FOR_CSPRNG_VALID && (err = hal_io_wait_valid(core)) != HAL_OK)
       return err;
 
-    if ((err = hal_io_read(CSPRNG_ADDR_RANDOM, (last ? temp : &buf[i]), 4)) != HAL_OK)
+    if ((err = hal_io_read(core, CSPRNG_ADDR_RANDOM, (last ? temp : &buf[i]), 4)) != HAL_OK)
       return err;
 
     if (last)