A major refactor of the GoodFET firmware build system and apps to give better

[goodfet] / firmware / include / jtagarm7.h

diff --git a/firmware/include/jtagarm7.h b/firmware/include/jtagarm7.h
index 921deea..ea13851 100644 (file)
--- a/firmware/include/jtagarm7.h
+++ b/firmware/include/jtagarm7.h
@@ -2,18 +2,16 @@
   \brief JTAG handler functions for the ARM7TDMI family of processors
 */
 
-#include "jtag.h"
+#ifndef JTAGARM7_H
+#define JTAGARM7_H
 
+#include "app.h"
+
+#define JTAGARM7 0x13
 
 #define JTAGSTATE_ARM 0         // bit 4 on dbg status reg is low
 #define JTAGSTATE_THUMB 1
 
-unsigned char current_chain;
-unsigned char current_dbgstate = -1;
-//unsigned char last_halt_debug_state = -1;
-//unsigned long last_halt_pc = -1;
-
-
 // JTAGARM7 Commands
 
 //! Start JTAG
@@ -86,7 +84,6 @@ The least significant bit of the instruction register is scanned in and scanned
 
 
 //JTAGARM7TDMI commands
-#define JTAGARM7_RESETTARGET                0x86
 #define JTAGARM7_GET_REGISTER               0x87
 #define JTAGARM7_SET_REGISTER               0x88
 #define JTAGARM7_DEBUG_INSTR                0x89
@@ -142,3 +139,7 @@ The least significant bit of the instruction register is scanned in and scanned
 #define JTAG_ARM7TDMI_DBG_cgenL     8
 #define JTAG_ARM7TDMI_DBG_TBIT      16
 
+extern app_t const jtagarm7_app;
+
+#endif // JTAGARM7_H
+