--- a/packages/devs/watchdog/arm/at91/current/ChangeLog
+++ b/packages/devs/watchdog/arm/at91/current/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-4  Andrea Michelotti  <amichelotti@atmel.com>
+
+	* src/watchdog_at91.cxx: 
+	* cdl/watchdog_at91.cdl: added JTST support
+
 2003-05-12  Nick Garnett  <nickg@balti.calivar.com>
 
 	* src/watchdog_at91.cxx: 

--- a/packages/devs/watchdog/arm/at91/current/cdl/watchdog_at91.cdl
+++ b/packages/devs/watchdog/arm/at91/current/cdl/watchdog_at91.cdl
@@ -65,8 +65,8 @@ cdl_package CYGPKG_DEVICES_WATCHDOG_ARM_
       in the AT91 to execute a predefined action if the
       application fails to call the reset function for
       longer than a given timeout interval. This package
-      currently only supports the AT91x408xx and AT91M55800A
-      devices found on the Atmel EB40, EB40A and EB55 evaluation
+      currently only supports the AT91x408xx, AT91M55800A and Diopsis
+      devices found on the Atmel EB40, EB40A, EB55 and JTST evaluation
       boards. The AT91M42800 found on the EB42 is not supported
       since it uses a totally different watchdog device."
 

--- a/packages/devs/watchdog/arm/at91/current/src/watchdog_at91.cxx
+++ b/packages/devs/watchdog/arm/at91/current/src/watchdog_at91.cxx
@@ -113,7 +113,22 @@
 #else
 #error Desired resolution beyond hardware capabilities
 #endif
-
+#elif defined(CYGHWR_HAL_ARM_AT91_JTST)
+#if   BASE_TICKS / 32 <= MAX_TICKS
+#define DIVIDER 0
+#define DIV_FACTOR 32
+#elif BASE_TICKS / 128 <= MAX_TICKS
+#define DIVIDER 1
+#define DIV_FACTOR 128
+#elif BASE_TICKS / 1024 <= MAX_TICKS
+#define DIVIDER 2
+#define DIV_FACTOR 1024
+#elif BASE_TICKS / 2046 <= MAX_TICKS
+#define DIVIDER 3
+#define DIV_FACTOR 2046
+#else
+#error Desired resolution beyond hardware capabilities
+#endif
 
 #endif