David Brownell <david-b@pacbell.net>:

[openocd] / src / target / arm926ejs.h

diff --git a/src/target/arm926ejs.h b/src/target/arm926ejs.h
index 65e67c5d610e5f2dcbbede4ca31169983ecb2d8b..54796512daca612b9bf03d7d358b4b5a43db521d 100644 (file)
--- a/src/target/arm926ejs.h
+++ b/src/target/arm926ejs.h
@@ -20,19 +20,14 @@
 #ifndef ARM926EJS_H
 #define ARM926EJS_H
 
-#include "target.h"
-#include "register.h"
-#include "embeddedice.h"
-#include "arm_jtag.h"
 #include "arm9tdmi.h"
 #include "armv4_5_mmu.h"
-#include "armv4_5_cache.h"
 
 #define        ARM926EJS_COMMON_MAGIC 0xa926a926
 
 typedef struct arm926ejs_common_s
 {
-       int common_magic;
+       u32 common_magic;
        armv4_5_mmu_common_t armv4_5_mmu;
        arm9tdmi_common_t arm9tdmi_common;
        int (*read_cp15)(target_t *target, u32 op1, u32 op2, u32 CRn, u32 CRm, u32 *value);
@@ -43,9 +38,9 @@ typedef struct arm926ejs_common_s
        u32 d_far;
 } arm926ejs_common_t;
 
-extern int arm926ejs_init_arch_info(target_t *target, arm926ejs_common_t *arm926ejs, int chain_pos, char *variant);
+extern int arm926ejs_init_arch_info(target_t *target, arm926ejs_common_t *arm926ejs, jtag_tap_t *tap);
 extern int arm926ejs_register_commands(struct command_context_s *cmd_ctx); 
-extern int arm926ejs_arch_state(struct target_s *target, char *buf, int buf_size); 
+extern int arm926ejs_arch_state(struct target_s *target); 
 extern int arm926ejs_write_memory(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer); 
 extern int arm926ejs_soft_reset_halt(struct target_s *target);