X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Fmonitor%2Fmonitor.c;h=039cf6e77ecca149dcd4c21b1ac36e5bad24671e;hp=73aa61caa7a9588642842a05f2942636385e7e70;hb=90bcaba3bfb6282df613a59dc74815f2ae4171d0;hpb=21ff17d2af1e50542d9343d7177269a8910ebbe3

diff --git a/firmware/apps/monitor/monitor.c b/firmware/apps/monitor/monitor.c
index 73aa61c..039cf6e 100644
--- 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"
+#if (platform == tilaunchpad)
+#include <setjmp.h>
+extern jmp_buf warmstart;
+
+#endif
 
 #define MONITOR_APP
 
@@ -78,14 +83,22 @@ void monitor_handle_fn(uint8_t const app,
 		break;
 
 	case PEEK:
+	  #ifdef MSP430
 		cmddata[0]=memorybyte[cmddataword[0]];
+          #else
+		debugstr("Monitor peeks are unsupported on this platform.");
+	  #endif
 		txdata(app,verb,1);
 		break;
 
 	case POKE:
+	  #ifdef MSP430
 		//Todo, make word or byte.
 		memorybyte[cmddataword[0]] = cmddata[2];
 		cmddata[0] = memorybyte[cmddataword[0]];
+          #else
+		debugstr("Monitor pokes are unsupported on this platform.");
+	  #endif
 		txdata(app,verb,1);
 		break;
 
@@ -123,19 +136,8 @@ void monitor_handle_fn(uint8_t const app,
 		break;
 
 	case MONITOR_DIR:
-	  //P5DIR=cmddata[0];
-	  debugstr("Command deprecated.");
-	  txdata(app,verb,1);
-	  break;
-
 	case MONITOR_IN:
-	  //cmddata[0]=P5IN;
-	  debugstr("Command deprecated.");
-	  txdata(app,verb,1);
-	  break;
-
 	case MONITOR_OUT:
-	  //P5OUT=cmddata[0];
 	  debugstr("Command deprecated.");
 	  txdata(app,verb,1);
 	  break;
@@ -146,9 +148,11 @@ void monitor_handle_fn(uint8_t const app,
 		break;
 
 	case MONITOR_CONNECTED:
-		msp430_init_dco_done();
-		txdata(app,verb,0);
-		break;
+	  #ifdef MSP430
+	  msp430_init_dco_done();
+	  #endif
+	  txdata(app,verb,0);
+	  break;
 	}
 }
 
@@ -164,10 +168,14 @@ void monitor_ram_pattern()
 	}
 	txdata(0x00,0x90,0);
 
+#if (platform == tilaunchpad)
+	longjmp(warmstart,1);
+#else
 	//Reboot
 #ifdef MSP430
 	asm("br &0xfffe");
 #endif
+#endif
 }
 
 //! Return the number of contiguous bytes 0xBEEF, to measure RAM usage.