X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Finclude%2Fjtag.h;h=aab18fe74f9b176807d0df3f5f34064d0a78492b;hp=17833d66a3bf6784dd9791199242d476697bbccb;hb=d85d45d823dda71280f4ed9083717ec8e5ce28ae;hpb=a653ba1562dc444e4be791e22264a89a3c6b4a19

diff --git a/firmware/include/jtag.h b/firmware/include/jtag.h
index 17833d6..aab18fe 100644
--- a/firmware/include/jtag.h
+++ b/firmware/include/jtag.h
@@ -1,18 +1,41 @@
+/*! \file jtag.h
+  \author Travis Goodspeed
+  \brief JTAG handler functions.
+*/
+
+#ifndef JTAG_H
+#define JTAG_H
 
 #include <signal.h>
 #include <io.h>
 #include <iomacros.h>
 
+extern unsigned int drwidth;
+
+#define MSP430MODE 0
+#define MSP430XMODE 1
+#define MSP430X2MODE 2
+extern unsigned int jtag430mode;
 
 // Generic Commands
 
+//! Shift n bytes.
+unsigned long jtagtransn(unsigned long word,
+			 unsigned char bitcount,
+             unsigned char flags);
+//! Shift the address width.
+unsigned long jtag_dr_shiftadr(unsigned long in);
 //! Shift 8 bits of the IR.
 unsigned char jtag_ir_shift8(unsigned char);
 //! Shift 16 bits of the DR.
 unsigned int jtag_dr_shift16(unsigned int);
+//! Shift 20 bits of the DR, MSP430 specific.
+unsigned long jtag_dr_shift20(unsigned long in);
 //! Stop JTAG, release pins
 void jtag_stop();
 
+//! Setup the JTAG pin directions.
+void jtagsetup();
 
 // JTAG430 Commands
 
@@ -21,6 +44,9 @@ void jtag430_start();
 //! Reset the TAP state machine, check the fuse.
 void jtag430_resettap();
 
+//! Defined in jtag430asm.S
+void jtag430_tclk_flashpulses(int);
+
 //High-level Macros follow
 //! Write data to address.
 void jtag430_writemem(unsigned int adr, unsigned int data);
@@ -83,7 +109,12 @@ extern int savedtclk;
 #define SAVETCLK savedtclk=P5OUT&TCLK;
 #define RESTORETCLK if(savedtclk) P5OUT|=TCLK; else P5OUT&=~TCLK
 
-//JTAG commands, bit-swapped
+//Replace every "CLRTCK SETTCK" with this.
+#define TCKTOCK CLRTCK,SETTCK
+
+
+//16-bit MSP430 JTAG commands, bit-swapped
+//Rewrite these with MSP430 prefix.
 #define IR_CNTRL_SIG_16BIT         0xC8   // 0x13
 #define IR_CNTRL_SIG_CAPTURE       0x28   // 0x14
 #define IR_CNTRL_SIG_RELEASE       0xA8   // 0x15
@@ -103,3 +134,34 @@ extern int savedtclk;
 // Bypass instruction
 #define IR_BYPASS                  0xFF   // 0xFF
 
+//MSP430X2 unique
+#define IR_COREIP_ID               0xE8   // 0x17 
+#define IR_DEVICE_ID               0xE1   // 0x87
+
+//MSP430 or MSP430X
+#define MSP430JTAGID 0x89
+//MSP430X2 only
+#define MSP430X2JTAGID 0x91
+
+//! Syncs a POR.
+unsigned int jtag430x2_syncpor();
+//! Executes an MSP430X2 POR
+unsigned int jtag430x2_por();
+//! Power-On Reset
+void jtag430_por();
+
+//JTAG commands
+#define JTAG_IR_SHIFT 0x80
+#define JTAG_DR_SHIFT 0x81
+#define JTAG_DR_SHIFT20 0x91
+
+#define MSB         0
+#define LSB         1
+#define NOEND       2
+#define NORETIDLE   4
+
+
+//JTAG430 commands
+#include "jtag430.h"
+
+#endif