diff --git a/generic_ip/shutdown_monitor/0/doc/shutdown_monitor_0.json b/generic_ip/shutdown_monitor/0/doc/shutdown_monitor_0.json index 370a8b0..9c0f55e 100644 --- a/generic_ip/shutdown_monitor/0/doc/shutdown_monitor_0.json +++ b/generic_ip/shutdown_monitor/0/doc/shutdown_monitor_0.json @@ -38,7 +38,7 @@ "minor_number" : { "type" : "c", "bit_len" : "8", - "reset" : "0x01", + "reset" : "0x02", "description" : "Minor number" }, "major_number" : { diff --git a/generic_ip/shutdown_monitor/0/src/shutdown_monitor_0.vhd b/generic_ip/shutdown_monitor/0/src/shutdown_monitor_0.vhd index 1d979d5..9c8ab11 100644 --- a/generic_ip/shutdown_monitor/0/src/shutdown_monitor_0.vhd +++ b/generic_ip/shutdown_monitor/0/src/shutdown_monitor_0.vhd @@ -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