TI Launchpad patch from Peter Lorenzen, edited to ease the mergequake.

[goodfet] / firmware / apps / monitor / monitor.c

diff --git a/firmware/apps/monitor/monitor.c b/firmware/apps/monitor/monitor.c
index 39833d4..54d9cd0 100644 (file)
--- a/firmware/apps/monitor/monitor.c
+++ b/firmware/apps/monitor/monitor.c
@@ -7,6 +7,11 @@
 #include "platform.h"
 #include "monitor.h"
 #include "builddate.h"
 #include "platform.h"
 #include "monitor.h"
 #include "builddate.h"

+#if (platform == tilaunchpad)
+#include <setjmp.h>
+extern jmp_buf warmstart;
+
+#endif

 
 #define MONITOR_APP
 
 
 #define MONITOR_APP
 


@@ -174,10 +179,14 @@ void monitor_ram_pattern()
        }
        txdata(0x00,0x90,0);
 
        }
        txdata(0x00,0x90,0);
 

+#if (platform == tilaunchpad)
+       longjmp(warmstart,1);
+#else

        //Reboot
 #ifdef MSP430
        asm("br &0xfffe");
 #endif
        //Reboot
 #ifdef MSP430
        asm("br &0xfffe");
 #endif

+#endif

 }
 
 //! Return the number of contiguous bytes 0xBEEF, to measure RAM usage.
 }
 
 //! Return the number of contiguous bytes 0xBEEF, to measure RAM usage.