Add STM32 watchdog configuration

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4617 42af7a65-404d-4744-a932-0658087f49c3

4 files changed, 10 insertions, 12 deletions

diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index a70a9406d..9dcb3ad1f 100755
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -225,4 +225,4 @@
 	* Kconfig:  Continued Kconfig file updates (no longer tracking on a per-file
 	  basis in the ChangeLog)
 	* apps/examples/watchdog:  Add a watchdog timer example.
-
+	* apps/examples/tiff:  Fix wrong path used for temporary file.
diff --git a/apps/examples/watchdog/watchdog.h b/apps/examples/watchdog/watchdog.h
index 1b36da9b4..e5e906691 100644
--- a/apps/examples/watchdog/watchdog.h
+++ b/apps/examples/watchdog/watchdog.h
@@ -118,7 +118,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: watchdog_devinit()
+ * Name: up_wdginitialize()
  *
  * Description:
  *   Perform architecuture-specific initialization of the Watchdog hardware.
@@ -127,6 +127,6 @@
  *
  ****************************************************************************/
 
-int watchdog_devinit(void);
+int up_wdginitialize(void);
 
 #endif /* __APPS_EXAMPLES_WATCHDOG_WATCHDOG_H */
diff --git a/apps/examples/watchdog/watchdog_main.c b/apps/examples/watchdog/watchdog_main.c
index 6d1e1c43a..819f2636f 100644
--- a/apps/examples/watchdog/watchdog_main.c
+++ b/apps/examples/watchdog/watchdog_main.c
@@ -223,7 +223,7 @@ static void parse_args(FAR struct wdog_example_s *wdog, int argc, FAR char **arg
 int wdog_main(int argc, char *argv[])
 {
   struct wdog_example_s wdog;
-  uint32_t elapsed;
+  long elapsed;
   int fd;
   int ret;
 
@@ -235,10 +235,10 @@ int wdog_main(int argc, char *argv[])
    * this test.
    */
 
-  ret = watchdog_devinit();
+  ret = up_wdginitialize();
   if (ret != OK)
     {
-      message("wdog_main: watchdog_devinit failed: %d\n", ret);
+      message("wdog_main: up_wdginitialize failed: %d\n", ret);
       goto errout;
     }
 
@@ -251,8 +251,6 @@ int wdog_main(int argc, char *argv[])
               CONFIG_EXAMPLES_WATCHDOG_DEVPATH, errno);
       goto errout;
     }
-  message("wdog_main: starting output with frequency: %d duty: %08x count: %d\n",
-          info.frequency, info.duty, info.count);
 
   /* Set the watchdog timeout */
 
@@ -289,7 +287,7 @@ int wdog_main(int argc, char *argv[])
           goto errout_with_dev;
         }
 
-      message("  ping elapsed=%d\n", elpased);
+      message("  ping elapsed=%ld\n", elapsed);
       msgflush();
     }
 
@@ -301,7 +299,7 @@ int wdog_main(int argc, char *argv[])
 
       usleep(wdog.pingdelay * 1000);
 
-      message("  NO ping elapsed=%d\n", elpased);
+      message("  NO ping elapsed=%ld\n", elapsed);
       msgflush();
     }
 
diff --git a/apps/graphics/tiff/tiff_initialize.c b/apps/graphics/tiff/tiff_initialize.c
index 0e5b3229c..3e1328eb2 100644
--- a/apps/graphics/tiff/tiff_initialize.c
+++ b/apps/graphics/tiff/tiff_initialize.c
@@ -474,10 +474,10 @@ int tiff_initialize(FAR struct tiff_info_s *info)
       goto errout;
     }
 
-  info->tmp2fd = open(info->tmpfile1, O_RDWR|O_CREAT|O_TRUNC, 0666);
+  info->tmp2fd = open(info->tmpfile2, O_RDWR|O_CREAT|O_TRUNC, 0666);
   if (info->tmp2fd < 0)
     {
-      gdbg("Failed to open %s for reading/writing: %d\n", info->tmpfile1, errno);
+      gdbg("Failed to open %s for reading/writing: %d\n", info->tmpfile2, errno);
       goto errout;
     }