diff --git a/NetBSD/9.0/usr/src/sys/dev/sbus/sbusfpga_trng.c b/NetBSD/9.0/usr/src/sys/dev/sbus/sbusfpga_trng.c
index d67fde8..6218781 100644
--- a/NetBSD/9.0/usr/src/sys/dev/sbus/sbusfpga_trng.c
+++ b/NetBSD/9.0/usr/src/sys/dev/sbus/sbusfpga_trng.c
@@ -109,6 +109,7 @@ sbusfpga_trng_match(device_t parent, cfdata_t cf, void *aux)
 #define CONFIG_CSR_DATA_WIDTH 32
 // define CSR_LEDS_BASE & others to avoid defining the CSRs of HW we don't handle
 #define CSR_LEDS_BASE
+#define CSR_CURVE25519ENGINE_BASE
 #define CSR_DDRPHY_BASE
 #define CSR_EXCHANGE_WITH_MEM_BASE
 #define CSR_SDRAM_BASE
@@ -120,6 +121,7 @@ sbusfpga_trng_match(device_t parent, cfdata_t cf, void *aux)
 //#define CSR_TRNG_BASE
 #include "dev/sbus/litex_csr.h"
 #undef CSR_LEDS_BASE
+#undef CSR_CURVE25519ENGINE_BASE
 #undef CSR_DDRPHY_BASE
 #undef CSR_EXCHANGE_WITH_MEM_BASE
 #undef CSR_SDRAM_BASE
@@ -135,7 +137,7 @@ sbusfpga_trng_getentropy(size_t nbytes, void *cookie) {
   struct sbusfpga_trng_softc *sc = cookie;
   size_t dbytes = 0;
   int failure = 0;
-  while ((nbytes - dbytes) > 0) {
+  while (nbytes > dbytes) {
 	  u_int32_t data = trng_data_read(sc);
 	  if (data) {
 		  rnd_add_data_sync(&sc->sc_rndsource, &data, 4, 32); // 32 is perhaps optimistic
@@ -148,8 +150,10 @@ sbusfpga_trng_getentropy(size_t nbytes, void *cookie) {
 		  }
 		  delay(1);
 	  }
+	  if (((dbytes%32)==0) && (nbytes > dbytes))
+		  delay(1); // let the hardware breathes if the OS needs a lof of bytes
   }
-  aprint_normal_dev(sc->sc_dev, "gathered %zd bytes\n", dbytes);
+  aprint_normal_dev(sc->sc_dev, "gathered %zd bytes [%d]\n", dbytes, failure);
 }
 
 /*
diff --git a/NetBSD/9.0/usr/src/sys/dev/sbus/sbusfpga_trng.h b/NetBSD/9.0/usr/src/sys/dev/sbus/sbusfpga_trng.h
index 365b367..86557de 100644
--- a/NetBSD/9.0/usr/src/sys/dev/sbus/sbusfpga_trng.h
+++ b/NetBSD/9.0/usr/src/sys/dev/sbus/sbusfpga_trng.h
@@ -26,8 +26,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _RDFPGA_TRNG_H_
-#define _RDFPGA_TRNG_H_
+#ifndef _SBUSFPGA_TRNG_H_
+#define _SBUSFPGA_TRNG_H_
 
 struct sbusfpga_trng_softc {
 	device_t sc_dev;		/* us as a device */
@@ -40,4 +40,4 @@ struct sbusfpga_trng_softc {
 	struct krndsource       sc_rndsource;
 };
 
-#endif /* _RDFPGA_TRNG_H_ */
+#endif /* _SBUSFPGA_TRNG_H_ */