From 4377815c7b68505504f6428a82c2daf044fce467 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sun, 28 Aug 2016 09:26:04 +0200
Subject: [PATCH] watchdogSetTimeout renamed to watchdogSuspend

---
 radio/src/gui/212x64/radio_sdmanager.cpp                | 6 +++---
 radio/src/opentx.cpp                                    | 4 ++--
 radio/src/opentx.h                                      | 2 +-
 radio/src/storage/storage_common.cpp                    | 2 +-
 radio/src/targets/common/arm/stm32/usbd_storage_msd.cpp | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/radio/src/gui/212x64/radio_sdmanager.cpp b/radio/src/gui/212x64/radio_sdmanager.cpp
index c58dd8e40..b33cfe453 100644
--- a/radio/src/gui/212x64/radio_sdmanager.cpp
+++ b/radio/src/gui/212x64/radio_sdmanager.cpp
@@ -92,7 +92,7 @@ void flashBootloader(const char * filename)
   }
 
   for (int i=0; i<BOOTLOADER_SIZE; i+=1024) {
-    watchdogSetTimeout(100/*1s*/);
+    watchdogSuspend(100/*1s*/);
     if (f_read(&file, buffer, 1024, &count) != FR_OK || count != 1024) {
       POPUP_WARNING(STR_SDCARD_ERROR);
       break;
@@ -119,14 +119,14 @@ void flashBootloader(const char * filename)
 void flashSportDevice(ModuleIndex module, const char *filename)
 {
   pausePulses();
-  watchdogSetTimeout(60*60*100/*1h*/);
+  watchdogSuspend(60*60*100/*1h*/);
 
   lcdClear();
   drawProgressBar(STR_WRITING);
 
   sportFirmwareUpdate(module, filename);
 
-  watchdogSetTimeout(100/*1s*/);
+  watchdogSuspend(100/*1s*/);
   resumePulses();
 }
 
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 4690bd6fa..fecb8e37d 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -80,7 +80,7 @@ volatile tmr10ms_t g_tmr10ms;
 volatile uint8_t rtc_count = 0;
 uint32_t watchdogTimeout = 0;
 
-void watchdogSetTimeout(uint32_t timeout)
+void watchdogSuspend(uint32_t timeout)
 {
   watchdogTimeout = timeout;
 }
@@ -1972,7 +1972,7 @@ void opentxClose(uint8_t shutdown)
 
   if (shutdown) {
 #if defined(CPUARM)
-    watchdogSetTimeout(2000/*20s*/);
+    watchdogSuspend(2000/*20s*/);
 #endif
     pausePulses();   // stop mixer task to disable trims processing while in shutdown
     AUDIO_BYE();
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index b6bcc6242..78ff5444d 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -555,7 +555,7 @@ extern uint8_t rotencSpeed;
 extern uint8_t heartbeat;
 
 #if defined(CPUARM)
-void watchdogSetTimeout(uint32_t timeout);
+void watchdogSuspend(uint32_t timeout);
 #endif
 
 #define MAX_ALERT_TIME   60
diff --git a/radio/src/storage/storage_common.cpp b/radio/src/storage/storage_common.cpp
index de3b11f80..216fb1c2d 100644
--- a/radio/src/storage/storage_common.cpp
+++ b/radio/src/storage/storage_common.cpp
@@ -42,7 +42,7 @@ void storageDirty(uint8_t msk)
 void preModelLoad()
 {
 #if defined(CPUARM)
-  watchdogSetTimeout(500/*5s*/);
+  watchdogSuspend(500/*5s*/);
 #endif
 
 #if defined(SDCARD)
diff --git a/radio/src/targets/common/arm/stm32/usbd_storage_msd.cpp b/radio/src/targets/common/arm/stm32/usbd_storage_msd.cpp
index 0eb10d707..7ba0e0a02 100644
--- a/radio/src/targets/common/arm/stm32/usbd_storage_msd.cpp
+++ b/radio/src/targets/common/arm/stm32/usbd_storage_msd.cpp
@@ -223,7 +223,7 @@ int8_t STORAGE_Read (uint8_t lun,
                  uint32_t blk_addr,                       
                  uint16_t blk_len)
 {
-  watchdogSetTimeout(100/*1s*/);
+  watchdogSuspend(100/*1s*/);
   
 #if defined(EEPROM)
   if (lun == STORAGE_EEPROM_LUN) {
@@ -248,7 +248,7 @@ int8_t STORAGE_Write (uint8_t lun,
                   uint32_t blk_addr,
                   uint16_t blk_len)
 {
-  watchdogSetTimeout(100/*1s*/);
+  watchdogSuspend(100/*1s*/);
   
 #if defined(EEPROM)
   if (lun == STORAGE_EEPROM_LUN)	{