* Patch by Peter Ryser, 20 Feb 2004:
Add support for the Xilinx ML300 platform
* Patch by Stephan Linz, 17 Feb 2004:
Fix watchdog support for NIOS
* Patch by Josh Fryman, 16 Feb 2004:
Fix byte-swapping for cfi_flash.c for different bus widths
* Patch by Jon Diekema, 14 Jeb 2004:
Remove duplicate "FPGA Support" notes from the README file
diff --git a/cpu/nios/interrupts.c b/cpu/nios/interrupts.c
index 450946b..4436805 100644
--- a/cpu/nios/interrupts.c
+++ b/cpu/nios/interrupts.c
@@ -30,6 +30,7 @@
#include <asm/ptrace.h>
#include <common.h>
#include <command.h>
+#include <watchdog.h>
#ifdef CONFIG_STATUS_LED
#include <status_led.h>
#endif
@@ -54,6 +55,7 @@
ulong get_timer (ulong base)
{
+ WATCHDOG_RESET ();
return (timestamp - base);
}
diff --git a/cpu/nios/serial.c b/cpu/nios/serial.c
index 61b26ab..34257a2 100644
--- a/cpu/nios/serial.c
+++ b/cpu/nios/serial.c
@@ -23,6 +23,7 @@
#include <common.h>
+#include <watchdog.h>
#include <nios-io.h>
@@ -62,7 +63,7 @@
if (c == '\n')
serial_putc('\r');
while( (uart->status & NIOS_UART_TRDY) == 0 )
- ;
+ WATCHDOG_RESET ();
uart->txdata = (unsigned char)c;
}
@@ -81,6 +82,6 @@
int serial_getc( void )
{
while( serial_tstc() == 0 )
- ;
+ WATCHDOG_RESET ();
return( uart->rxdata & 0x00ff );
}