X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm9tdmi.h;h=9f9409b4649e2f3cc2816861241c2c3d366a4154;hp=9dfa8863103e0d059223ada949dc6acde3c55f4b;hb=d0e763ac7ef6aa17b17bd00ccdfbccfb4eacda69;hpb=75cdc8a260e081752698f374d4cd6e97e84eb6cb

diff --git a/src/target/arm9tdmi.h b/src/target/arm9tdmi.h
index 9dfa886310..9f9409b464 100644
--- a/src/target/arm9tdmi.h
+++ b/src/target/arm9tdmi.h
@@ -16,64 +16,41 @@
  *   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"
 
-#define	ARM9TDMI_COMMON_MAGIC 0x00a900a9
-
-typedef struct arm9tdmi_common_s
-{
-	int common_magic;
-	void *arch_info;
-	arm7_9_common_t arm7_9_common;
-} arm9tdmi_common_t;
-
-typedef struct arm9tdmi_vector_s
-{
-	char *name;
-	uint32_t value;
-} arm9tdmi_vector_t;
-
-enum arm9tdmi_vector
-{
-	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,
-};
-
-extern int arm9tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
-int arm9tdmi_examine(struct target_s *target);
-extern int arm9tdmi_init_arch_info(target_t *target, arm9tdmi_common_t *arm9tdmi, jtag_tap_t *tap);
-extern int arm9tdmi_register_commands(struct command_context_s *cmd_ctx);
-
-extern int arm9tdmi_clock_out(arm_jtag_t *jtag_info, uint32_t instr, uint32_t out, uint32_t *in, int sysspeed);
-extern int arm9tdmi_clock_data_in(arm_jtag_t *jtag_info, uint32_t *in);
-extern int arm9tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size, int be);
-extern void arm9tdmi_read_core_regs(target_t *target, uint32_t mask, uint32_t* core_regs[16]);
-extern void arm9tdmi_write_core_regs(target_t *target, uint32_t mask, uint32_t core_regs[16]);
-
-extern int arm9tdmi_examine_debug_reason(target_t *target);
-
-extern void arm9tdmi_load_word_regs(target_t *target, uint32_t mask);
-extern void arm9tdmi_load_hword_reg(target_t *target, int num);
-extern void arm9tdmi_load_byte_reg(target_t *target, int num);
-extern void arm9tdmi_store_word_regs(target_t *target, uint32_t mask);
-extern void arm9tdmi_store_hword_reg(target_t *target, int num);
-extern void arm9tdmi_store_byte_reg(target_t *target, int num);
-
-extern void arm9tdmi_branch_resume(target_t *target);
-extern void arm9tdmi_enable_single_step(target_t *target, uint32_t next_pc);
-extern void arm9tdmi_disable_single_step(target_t *target);
+int arm9tdmi_init_target(struct command_context *cmd_ctx,
+		struct target *target);
+int arm9tdmi_init_arch_info(struct target *target,
+		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);
+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]);
+void arm9tdmi_write_core_regs(struct target *target,
+		uint32_t mask, uint32_t core_regs[16]);
+
+int arm9tdmi_examine_debug_reason(struct target *target);
+
+void arm9tdmi_load_word_regs(struct target *target, uint32_t mask);
+void arm9tdmi_load_hword_reg(struct target *target, int num);
+void arm9tdmi_load_byte_reg(struct target *target, int num);
+void arm9tdmi_store_word_regs(struct target *target, uint32_t mask);
+void arm9tdmi_store_hword_reg(struct target *target, int num);
+void arm9tdmi_store_byte_reg(struct target *target, int num);
+
+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 */