[Cryptech-Commits] [core/rng/trng] 01/02: Merge branch 'config_core_selector'

[git at cryptech.is]

This is an automated email from the git hooks/post-receive script.

paul at psgd.org pushed a commit to branch master
in repository core/rng/trng.

commit 23ffa6a5939d49cee92ca9657e1ef7781e5a55b9
Merge: c67a637 a1c1b2a
Author: Paul Selkirk <paul at psgd.org>
Date:   Fri Nov 13 16:48:39 2015 -0500

    Merge branch 'config_core_selector'

 src/rtl/trng.v       |  8 ++++----
 src/rtl/trng_mixer.v | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --cc src/rtl/trng_mixer.v
index 0d565c7,97777ac..d192090
--- a/src/rtl/trng_mixer.v
+++ b/src/rtl/trng_mixer.v
@@@ -80,33 -80,39 +80,41 @@@ module trng_mixer
    //----------------------------------------------------------------
    // Internal constant and parameter definitions.
    //----------------------------------------------------------------
 -  parameter MODE_SHA_512 = 2'h3;
 -
 -  parameter ENTROPY_IDLE     = 4'h0;
 -  parameter ENTROPY_SRC0     = 4'h1;
 -  parameter ENTROPY_SRC0_ACK = 4'h2;
 -  parameter ENTROPY_SRC1     = 4'h3;
 -  parameter ENTROPY_SRC1_ACK = 4'h4;
 -  parameter ENTROPY_SRC2     = 4'h5;
 -  parameter ENTROPY_SRC2_ACK = 4'h6;
 -
 -  parameter CTRL_IDLE    = 4'h0;
 -  parameter CTRL_COLLECT = 4'h1;
 -  parameter CTRL_MIX     = 4'h2;
 -  parameter CTRL_SYN     = 4'h3;
 -  parameter CTRL_ACK     = 4'h4;
 -  parameter CTRL_NEXT    = 4'h5;
 +  localparam MODE_SHA_512 = 2'h3;
 +
 +  localparam ENTROPY_IDLE     = 4'h0;
 +  localparam ENTROPY_SRC0     = 4'h1;
 +  localparam ENTROPY_SRC0_ACK = 4'h2;
 +  localparam ENTROPY_SRC1     = 4'h3;
 +  localparam ENTROPY_SRC1_ACK = 4'h4;
 +  localparam ENTROPY_SRC2     = 4'h5;
 +  localparam ENTROPY_SRC2_ACK = 4'h6;
 +  localparam TEST_ENTROPY     = 4'he;
 +  localparam TEST_ENTROPY_ACK = 4'hf;
 +
 +  localparam CTRL_IDLE    = 4'h0;
 +  localparam CTRL_COLLECT = 4'h1;
 +  localparam CTRL_MIX     = 4'h2;
 +  localparam CTRL_SYN     = 4'h3;
 +  localparam CTRL_ACK     = 4'h4;
 +  localparam CTRL_NEXT    = 4'h5;
  
+   localparam ADDR_NAME0            = 8'h00;
+   localparam ADDR_NAME1            = 8'h01;
+   localparam ADDR_VERSION          = 8'h02;
+ 
 -  parameter ADDR_MIXER_CTRL        = 8'h10;
 -  parameter MIXER_CTRL_ENABLE_BIT  = 0;
 -  parameter MIXER_CTRL_RESTART_BIT = 1;
 -  parameter ADDR_MIXER_STATUS      = 8'h11;
 -  parameter ADDR_MIXER_TIMEOUT     = 8'h20;
 +  localparam ADDR_MIXER_CTRL        = 8'h10;
 +  localparam MIXER_CTRL_ENABLE_BIT  = 0;
 +  localparam MIXER_CTRL_RESTART_BIT = 1;
 +  localparam ADDR_MIXER_STATUS      = 8'h11;
 +  localparam ADDR_MIXER_TIMEOUT     = 8'h20;
  
 -  parameter DEFAULT_ENTROPY_TIMEOUT = 24'h100000;
 +  localparam DEFAULT_ENTROPY_TIMEOUT = 24'h100000;
  
+   parameter CORE_NAME0     = 32'h726e676d; // "rngm"
+   parameter CORE_NAME1     = 32'h69786572; // "ixer"
+   parameter CORE_VERSION   = 32'h302e3530; // "0.50"
+ 
  
    //----------------------------------------------------------------
    // Registers including update variables and write enable.