X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Finclude%2Fjtag.h;h=4795109cfb521d0a8e6eb5617a1638b1a4265420;hp=1551d79c611cfc9d762cd4ba260c6b527dfcadf0;hb=78b9aa88dbfedd83c38c878d9f423af7da7cd36a;hpb=3bf98a899ca8003835b69d949d299369a5d7a4f7

diff --git a/firmware/include/jtag.h b/firmware/include/jtag.h
index 1551d79..4795109 100644
--- a/firmware/include/jtag.h
+++ b/firmware/include/jtag.h
@@ -1,3 +1,10 @@
+/*! \file jtag.h
+  \author Travis Goodspeed
+  \brief JTAG handler functions.
+*/
+
+#ifndef JTAG_H
+#define JTAG_H
 
 #include <signal.h>
 #include <io.h>
@@ -6,37 +13,32 @@
 
 // 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
-
-//! Start JTAG, unique to the '430.
-void jtag430_start();
-//! Reset the TAP state machine, check the fuse.
-void jtag430_resettap();
-
-//High-level Macros follow
-//! Write data to address.
-void jtag430_writemem(unsigned int adr, unsigned int data);
-//! Read data from address
-unsigned int jtag430_readmem(unsigned int adr);
-//! Halt the CPU
-void jtag430_haltcpu();
-//! Release the CPU
-void jtag430_releasecpu();
-//! Set CPU to Instruction Fetch
-void jtag430_setinstrfetch();
-//! Set the program counter.
-void jtag430_setpc(unsigned int adr);
-//! Write data to address.
-void jtag430_writeflash(unsigned int adr, unsigned int data);
+//! Ratchet Clock Down and Up
+void jtag_tcktock();
+//! Go to SHIFT_IR
+void jtag_goto_shift_ir();
+//! Go to SHIFT_DR
+void jtag_goto_shift_dr();
+//! TAP RESET
+void jtag_resettap();
 
 //Pins.  Both SPI and JTAG names are acceptable.
 //#define SS   BIT0
@@ -84,23 +86,23 @@ extern int savedtclk;
 #define SAVETCLK savedtclk=P5OUT&TCLK;
 #define RESTORETCLK if(savedtclk) P5OUT|=TCLK; else P5OUT&=~TCLK
 
-//JTAG commands, bit-swapped
-#define IR_CNTRL_SIG_16BIT         0xC8   // 0x13
-#define IR_CNTRL_SIG_CAPTURE       0x28   // 0x14
-#define IR_CNTRL_SIG_RELEASE       0xA8   // 0x15
-// Instructions for the JTAG Fuse
-#define IR_PREPARE_BLOW            0x44   // 0x22
-#define IR_EX_BLOW                 0x24   // 0x24
-// Instructions for the JTAG data register
-#define IR_DATA_16BIT              0x82   // 0x41
-#define IR_DATA_QUICK              0xC2   // 0x43
-// Instructions for the JTAG PSA mode
-#define IR_DATA_PSA                0x22   // 0x44
-#define IR_SHIFT_OUT_PSA           0x62   // 0x46
-// Instructions for the JTAG address register
-#define IR_ADDR_16BIT              0xC1   // 0x83
-#define IR_ADDR_CAPTURE            0x21   // 0x84
-#define IR_DATA_TO_ADDR            0xA1   // 0x85
-// Bypass instruction
-#define IR_BYPASS                  0xFF   // 0xFF
+//Replace every "CLRTCK SETTCK" with this.
+#define TCKTOCK CLRTCK,SETTCK
+
+//JTAG commands
+#define JTAG_IR_SHIFT 0x80
+#define JTAG_DR_SHIFT 0x81
+#define JTAG_RESETTAP 0x82
+#define JTAG_RESETTARGET 0x83
+#define JTAG_DR_SHIFT20 0x91
+
+#define MSB         0
+#define LSB         1
+#define NOEND       2
+#define NORETIDLE   4
+
+
+//JTAG430 commands
+//#include "jtag430.h"
 
+#endif