avr: minor changes to watchdogOn (not used, yet).

2023-04-22 16:38:03 +02:00
parent 4bf20fb032
commit 1893d50908
1 changed files with 8 additions and 2 deletions
--- a/avr/common/watchdog.asm
+++ b/avr/common/watchdog.asm
@@ -17,8 +17,11 @@


 watchdogOn:
-  in r16, WDTCSR
-  ori r16, (1<<WDE) | (1<<WDP0) ; about 32ms period
+  ldi r16, (1<<WDE) | (1<<WDP0) ; about 32ms period
+  out WDTCSR, r16
+  ldi r16, (1<<WDP0) ; about 32ms period
+  out WDTCSR, r16
+  ori r16, (1<<WDE)
  out WDTCSR, r16
  ret

@@ -26,6 +29,9 @@ watchdogOn:

 watchdogOff:
  wdr                   ; reset WDT
+  ldi r16, (0<<WDRF)    ; clear WDRF bit in MCUSR
+  out MCUSR, r16
+
  in  r16, WDTCSR
  ori r16, (1<<WDCE)|(1<<WDE)
  push r15