X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=examples%2Ftriface%2Fboot%2Fmain.c;h=d84dc2552873aa478e89ea5dd857c18b7626a4de;hb=e1510c810a9169e2aa6661e95c8306cf995ad6cd;hp=dc105baf0374a10c02de0ee5ce608012b89edc5b;hpb=24c21c92d29b76a3f0de0a107f4bafef7bb0f812;p=bertos.git

diff --git a/examples/triface/boot/main.c b/examples/triface/boot/main.c
index dc105baf..d84dc255 100644
--- a/examples/triface/boot/main.c
+++ b/examples/triface/boot/main.c
@@ -46,29 +46,55 @@
  * \author Daniele Basile <asterix@develer.com>
  */
 
+#include "hw/hw_boot.h"
+#include "cfg/cfg_ser.h"
+
 #include <net/xmodem.h>
+
 #include <cfg/compiler.h>
 #include <cfg/debug.h>
 #include <cfg/macros.h> /* BV() */
 
-#include <drv/wdt.h>
 #include <drv/ser.h>
 #include <drv/timer.h>
-#include <drv/flash_avr.h>
-
-#include "hw/hw_boot.h"
-#include "cfg/cfg_boot.h"
+#include <drv/flash.h>
 
 #include <string.h>
 
+#include <avr/wdt.h>
+
+/*
+ * Watchdog disable.
+ *
+ * This function disable the watchdog timer early after a reset.
+ * We must do it very soon because new AVR cores do not disable
+ * the watchdog timer after a cpu reset. In this way the watchdog
+ * timer is still enabled, continuously resetting the cpu. This is
+ * necessary only with new AVR cores, for other cores this code has
+ * no effect.
+ *
+ * \{
+ */
+// Function prototype of watchdog reset.
+void wdt_init(void) __attribute__((naked)) __attribute__((section(".init3")));
+// Function implementation of watchdog reset.
+void wdt_init(void)
+{
+    MCUSR = 0;
+    wdt_disable();
+
+    return;
+}
+/* \} */
+
 int main(void)
 {
-	FlashAvr flash;
+	Flash flash;
 	Serial ser;
 
 
 	// Set up flash programming functions.
-	flash_avr_init(&flash);
+	flash_init(&flash);
 
 	IRQ_ENABLE;
 
@@ -77,15 +103,15 @@ int main(void)
 	kdbg_init();
 	timer_init();
 
-
 	/* Open the main communication port */
 
-	ser_init(&ser, CONFIG_SER_HOSTPORT);
-	ser_setbaudrate(&ser, CONFIG_SER_HOSTPORTBAUDRATE);
+	ser_init(&ser, CONFIG_BOOT_PORT);
+	ser_setbaudrate(&ser, CONFIG_BOOT_BAUDRATE);
+
+	xmodem_recv(&ser.fd, &flash.fd);
 
-	xmodem_recv(&ser, &flash.fd);
 	kfile_close(&flash.fd);
-    kfile_close(&ser.fd);
+	kfile_close(&ser.fd);
 
 	IRQ_DISABLE;