CORE-297 made the wd_alarm output of shutdown monitor sticky

This commit is contained in:
Damian Smith 2021-08-25 17:33:29 +01:00
commit e55aced79c
2 changed files with 4 additions and 4 deletions

View file

@ -38,7 +38,7 @@
"minor_number" : {
"type" : "c",
"bit_len" : "8",
"reset" : "0x01",
"reset" : "0x02",
"description" : "Minor number"
},
"major_number" : {

View file

@ -49,7 +49,7 @@ entity shutdown_monitor_0 is
monitor_out : out std_logic_vector(18 downto 0);
irq : out std_logic;
wd_alarm_out : out std_logic;
wd_alarm_out : out std_logic; -- stays true until status is cleared
-- Avalon CSR slave interface
avs_csr_address : in std_logic_vector(5 downto 0);
@ -104,7 +104,7 @@ architecture rtl of shutdown_monitor_0 is
begin
monitor_out <= pwr_mask(18 downto 0);
wd_alarm_out <= wd_alarm;
wd_alarm_out <= bad_status_snapshot(31);
GEN_CMP_CNT : if TEST_MODE = false generate
@ -209,7 +209,7 @@ begin
elsif clk'event and clk = '1' then
-- Generate a bad status if any unmasked input is high. Test trip is always bit 31;
-- Generate a bad status if any unmasked input is high.
bad_status <= (trip_mask and (22x"0" & test_shutdn_signal & monitor_in_filt)) or (wd_alarm & 31x"0");
-- We've tripped if the trip count is not zero