X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Finclude%2Fjtag430.h;h=6ac6fcd4e646380ca2df6dd24c40134b877e84da;hp=cc32fc938fb1666f03b7db80cf66fe9d4b448908;hb=236b90b4447c8c17b0f351c22b4c2635c8e376d7;hpb=5c029aa0c4f7573d9fa49beefe6e887dee2b25f9

diff --git a/firmware/include/jtag430.h b/firmware/include/jtag430.h
index cc32fc9..6ac6fcd 100644
--- a/firmware/include/jtag430.h
+++ b/firmware/include/jtag430.h
@@ -1,16 +1,16 @@
-/*! \file jtag.h
+/*! \file jtag430.h
   \author Travis Goodspeed
   \brief JTAG handler functions.
-
-FIXME: Remove these when proven compiling
-#include <signal.h>
-#include <io.h>
-#include <iomacros.h>
 */
 
+#ifndef JTAG430_H
+#define JTAG430_H
 
+#include "app.h"
 #include "jtag.h"
 
+#define JTAG430 0x11
+
 extern unsigned int drwidth;
 
 #define MSP430MODE 0
@@ -20,8 +20,10 @@ extern unsigned int jtag430mode;
 
 // JTAG430 Commands
 
-//! Start JTAG, unique to the '430.
+//! Start JTAG, unique to the '430.  Deprecated.
 void jtag430_start();
+//! Same thing, but also for '430X2.
+unsigned char jtag430x2_start();
 //! Reset the TAP state machine, check the fuse.
 void jtag430_resettap();
 
@@ -101,3 +103,7 @@ void jtag430_por();
 #define JTAG430_ERASEINFO 0xE8
 #define JTAG430_COREIP_ID 0xF0
 #define JTAG430_DEVICE_ID 0xF1
+
+extern app_t const jtag430_app;
+
+#endif // JTAG430_H