FIX: watchdog timeout, while waiting for input

* add WATCHDOG_RESET to !tstc() loops * prevents watchdog timeout, while waiting for input, if CONFIG_BOOT_RETRY_TIME or CONFIG_SHOW_ACTIVITY defined Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>

FIX: watchdog timeout, while waiting for input
* add WATCHDOG_RESET to !tstc() loops * prevents watchdog timeout, while waiting for input, if CONFIG_BOOT_RETRY_TIME or CONFIG_SHOW_ACTIVITY defined Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
Jens Scharsig · Wolfgang Denk
1 parent 8178110bc2
Showing 1 changed file with 3 additions and 0 deletions Side-by-side Diff
common/main.c
@@ -730,6 +730,7 @@
 		while (!tstc()) {	/* while no incoming data */
 			if (retry_time >= 0 && get_ticks() > endtime)
 				return (-2);	/* timed out */
+			WATCHDOG_RESET();
 		}
 #endif
  
@@ -997,6 +998,7 @@
 		while (!tstc()) {	/* while no incoming data */
 			if (retry_time >= 0 && get_ticks() > endtime)
 				return (-2);	/* timed out */
+			WATCHDOG_RESET();
 		}
 #endif
 		WATCHDOG_RESET();		/* Trigger watchdog, if needed */
@@ -1005,6 +1007,7 @@
 		while (!tstc()) {
 			extern void show_activity(int arg);
 			show_activity(0);
+			WATCHDOG_RESET();
 		}
 #endif
 		c = getc();
...	...	@@ -730,6 +730,7 @@
730	730	while (!tstc()) { /* while no incoming data */
731	731	if (retry_time >= 0 && get_ticks() > endtime)
732	732	return (-2); /* timed out */
	733	+ WATCHDOG_RESET();
733	734	}
734	735	#endif
735	736
...	...	@@ -997,6 +998,7 @@
997	998	while (!tstc()) { /* while no incoming data */
998	999	if (retry_time >= 0 && get_ticks() > endtime)
999	1000	return (-2); /* timed out */
	1001	+ WATCHDOG_RESET();
1000	1002	}
1001	1003	#endif
1002	1004	WATCHDOG_RESET(); /* Trigger watchdog, if needed */
...	...	@@ -1005,6 +1007,7 @@
1005	1007	while (!tstc()) {
1006	1008	extern void show_activity(int arg);
1007	1009	show_activity(0);
	1010	+ WATCHDOG_RESET();
1008	1011	}
1009	1012	#endif
1010	1013	c = getc();