From 4b619bb0a94efb89376a682d1724c43a25adee12 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Tue, 13 Jul 2021 22:24:04 +0800 Subject: [PATCH] emulation: update trng peripherals The register mapping for the TRNG has changed. Update these peripherals to reflect the latest shuffle. Signed-off-by: Sean Cross --- emulation/peripherals/trng_kernel.cs | 9 ++++----- emulation/peripherals/trng_server.cs | 12 ++++++------ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/emulation/peripherals/trng_kernel.cs b/emulation/peripherals/trng_kernel.cs index 28abc4d2b..348a467b8 100644 --- a/emulation/peripherals/trng_kernel.cs +++ b/emulation/peripherals/trng_kernel.cs @@ -23,10 +23,9 @@ namespace Antmicro.Renode.Peripherals.Miscellaneous private void DefineRegisters() { Registers.STATUS.Define(this) // RDY is set on reset - .WithValueField(0, 32, FieldMode.Read, valueProviderCallback: _ => - { - return 3; - }, name: "STATUS"); + .WithFlag(0, name: "ready", valueProviderCallback: _ => true) + .WithFlag(1, name: "avail", valueProviderCallback: _ => true) + ; Registers.DATA.Define(this) .WithValueField(0, 32, FieldMode.Read, valueProviderCallback: _ => @@ -40,7 +39,7 @@ namespace Antmicro.Renode.Peripherals.Miscellaneous return (uint)rng.Next(); }, name: "URANDOM"); Registers.URANDOM_VALID.Define(this) - .WithFlag(0, FieldMode.Read, valueProviderCallback: _ => { return true; }, name: "URANDOM_VALID"); + .WithFlag(0, FieldMode.Read, valueProviderCallback: _ => true, name: "URANDOM_VALID"); } private readonly PseudorandomNumberGenerator rng = EmulationManager.Instance.CurrentEmulation.RandomGenerator; diff --git a/emulation/peripherals/trng_server.cs b/emulation/peripherals/trng_server.cs index 459d6bebd..decda0eb1 100644 --- a/emulation/peripherals/trng_server.cs +++ b/emulation/peripherals/trng_server.cs @@ -53,12 +53,12 @@ namespace Antmicro.Renode.Peripherals.Miscellaneous AV_CONFIG = 0xc, RO_CONFIG = 0x10, - READY = 0xd8, - EV_STATUS = 0xdc, - EV_PENDING = 0xe0, - EV_ENABLE = 0xe4, - URANDOM = 0xf0, - URANDOM_VALID = 0xf4, + READY = 0xc4, + EV_STATUS = 0xc8, + EV_PENDING = 0xcc, + EV_ENABLE = 0xd0, + URANDOM = 0xdc, + URANDOM_VALID = 0xe0, TEST = 0xf8, } }