Index: /branches/reconfiguration/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp
===================================================================
--- /branches/reconfiguration/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp	(revision 987)
+++ /branches/reconfiguration/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp	(revision 988)
@@ -842,6 +842,6 @@
         r_dcache_clack_req         = false;
 
-        // Reset watchdog timer threshold to max value
-        r_dcache_wdt_max           = std::numeric_limits<uint32_t>::max();
+        // Reset watchdog timer (watchdog mechanism is deactivated)
+        r_dcache_wdt_max           = 0;
         r_dcache_wdt_timeout       = 0;
 
@@ -2251,5 +2251,7 @@
 
     // watchdog timeout signal
-    bool dcache_watchdog_timeout = (r_dcache_wdt.read() == r_dcache_wdt_max.read());
+    // when wdt_max is zero, the watchdog mechanism is deactivated.
+    bool dcache_watchdog_timeout = (r_dcache_wdt_max.read() > 0) &&
+                                   (r_dcache_wdt.read() == r_dcache_wdt_max.read());
 
     switch (r_dcache_fsm.read())
