X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm9tdmi.h;h=c6f0ccf0f274b969326f5185220f1f83c1e23aa6;hp=496e4c52d251358bab05ccd0546af0b8153820ee;hb=5fbf4d4cc3f67ec8b2fb3d8a789117583a84e1a1;hpb=aafb916bea1153b8d2f4706e4a62628f49741133

diff --git a/src/target/arm9tdmi.h b/src/target/arm9tdmi.h
index 496e4c52d2..c6f0ccf0f2 100644
--- a/src/target/arm9tdmi.h
+++ b/src/target/arm9tdmi.h
@@ -16,46 +16,19 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
-#ifndef ARM9TDMI_H
-#define ARM9TDMI_H
 
-#include "embeddedice.h"
-
-/* FIXME we don't really need a separate arm9tdmi struct any more...
- * remove it, the arm7/arm9 common struct suffices.
- */
-struct arm9tdmi_common
-{
-	struct arm7_9_common arm7_9_common;
-};
+#ifndef OPENOCD_TARGET_ARM9TDMI_H
+#define OPENOCD_TARGET_ARM9TDMI_H
 
-struct arm9tdmi_vector
-{
-	char *name;
-	uint32_t value;
-};
-
-enum arm9tdmi_vector_bit
-{
-	ARM9TDMI_RESET_VECTOR = 0x01,
-	ARM9TDMI_UNDEF_VECTOR = 0x02,
-	ARM9TDMI_SWI_VECTOR = 0x04,
-	ARM9TDMI_PABT_VECTOR = 0x08,
-	ARM9TDMI_DABT_VECTOR = 0x10,
-	/* BIT(5) reserved -- must be zero */
-	ARM9TDMI_IRQ_VECTOR = 0x40,
-	ARM9TDMI_FIQ_VECTOR = 0x80,
-};
+#include "embeddedice.h"
 
 int arm9tdmi_init_target(struct command_context *cmd_ctx,
 		struct target *target);
 int arm9tdmi_init_arch_info(struct target *target,
-		struct arm9tdmi_common *arm9tdmi, struct jtag_tap *tap);
-int arm9tdmi_register_commands(struct command_context *cmd_ctx);
+		struct arm7_9_common *arm7_9, struct jtag_tap *tap);
+extern const struct command_registration arm9tdmi_command_handlers[];
 
 int arm9tdmi_clock_out(struct arm_jtag *jtag_info,
 		uint32_t instr, uint32_t out, uint32_t *in, int sysspeed);
@@ -63,7 +36,7 @@ int arm9tdmi_clock_data_in(struct arm_jtag *jtag_info, uint32_t *in);
 int arm9tdmi_clock_data_in_endianness(struct arm_jtag *jtag_info,
 		void *in, int size, int be);
 void arm9tdmi_read_core_regs(struct target *target,
-		uint32_t mask, uint32_t* core_regs[16]);
+		uint32_t mask, uint32_t *core_regs[16]);
 void arm9tdmi_write_core_regs(struct target *target,
 		uint32_t mask, uint32_t core_regs[16]);
 
@@ -80,4 +53,4 @@ void arm9tdmi_branch_resume(struct target *target);
 void arm9tdmi_enable_single_step(struct target *target, uint32_t next_pc);
 void arm9tdmi_disable_single_step(struct target *target);
 
-#endif /* ARM9TDMI_H */
+#endif /* OPENOCD_TARGET_ARM9TDMI_H */