From: Angus Gratton <angus@espressif.com>
Date: Wed, 14 Aug 2019 07:32:16 +0000 (+0800)
Subject: Merge branch 'refactor/timerg_in_test' into 'master'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=367ecc2d6006100f795d80006b9b9556507991d0;p=esp-idf

Merge branch 'refactor/timerg_in_test' into 'master'

timer_group: refactoring to avoid direct register access in the ISR

See merge request espressif/esp-idf!5656
---

367ecc2d6006100f795d80006b9b9556507991d0
diff --cc components/esp32/panic.c
index 9b56938623,b0c6401de9..294c3635d2
--- a/components/esp32/panic.c
+++ b/components/esp32/panic.c
@@@ -421,15 -425,15 +425,16 @@@ static void reconfigureAllWdts(void
  */
  static inline void disableAllWdts(void)
  {
-     TIMERG0.wdt_wprotect = TIMG_WDT_WKEY_VALUE;
-     TIMERG0.wdt_config0.en = 0;
-     TIMERG0.wdt_wprotect = 0;
-     TIMERG1.wdt_wprotect = TIMG_WDT_WKEY_VALUE;
-     TIMERG1.wdt_config0.en = 0;
-     TIMERG1.wdt_wprotect = 0;
+     timer_ll_wdt_set_protect(&TIMERG0, false);
+     timer_ll_wdt_set_enable(&TIMERG0, false);
+     timer_ll_wdt_set_protect(&TIMERG0, true);
+ 
+     timer_ll_wdt_set_protect(&TIMERG1, false);
+     timer_ll_wdt_set_enable(&TIMERG1, false);
+     timer_ll_wdt_set_protect(&TIMERG1, true);
  }
  
 +#if CONFIG_ESP32_PANIC_PRINT_REBOOT || CONFIG_ESP32_PANIC_SILENT_REBOOT
  static void esp_panic_dig_reset(void) __attribute__((noreturn));
  
  static void esp_panic_dig_reset(void)