Cleanup: add error port, conditionalize segments.

1 files changed, 12 insertions, 23 deletions

diff --git a/core_selector/src/rtl/rng_selector.v b/core_selector/src/rtl/rng_selector.v
index 0b56684..9dd0330 100644
--- a/core_selector/src/rtl/rng_selector.v
+++ b/core_selector/src/rtl/rng_selector.v
@@ -41,26 +41,22 @@
 
 module rng_selector
   (
-   input wire 		sys_clk,
-   input wire 		sys_rst,
+   input wire           sys_clk,
+   input wire           sys_rst,
+   input wire           sys_ena,
 
-   input wire		noise,
-
-   input wire 		sys_ena,
-   input wire [13: 0] 	sys_eim_addr,
-   input wire 		sys_eim_wr,
-   input wire 		sys_eim_rd,
+   input wire [13: 0]   sys_eim_addr,
+   input wire           sys_eim_wr,
+   input wire           sys_eim_rd,
    output wire [31 : 0] sys_read_data,
-   input wire [31 : 0] 	sys_write_data,
+   input wire [31 : 0]  sys_write_data,
+   output wire          sys_error,
 
-   output wire [7 : 0] 	debug
+   input wire           noise,
+   output wire [7 : 0]  debug
    );
 
 
-`define USE_TRNG
-
-`ifdef USE_TRNG
-
    // This is a pass-through to trng.v, which instantiates and muxes the
    // entropy sources, mixer, and csprng.
 
@@ -69,25 +65,18 @@ module rng_selector
       .clk(sys_clk),
       .reset_n(~sys_rst),
 
-      .avalanche_noise(noise),
-
       .cs(sys_ena & (sys_eim_rd | sys_eim_wr)),
       .we(sys_eim_wr),
 
       .address(sys_eim_addr[11:0]),
       .write_data(sys_write_data),
       .read_data(sys_read_data),
+      .error(sys_error),
 
+      .avalanche_noise(noise),
       .debug(debug)
       );
 
-`else
-
-   assign sys_read_data = {32{1'b0}};
-   assign debug         = {32{1'b0}};
-
-`endif
-
 endmodule
 
 //======================================================================