-//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"