X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm926ejs.h;h=d4fd0cb6ebf9227c196d3ac8ddd0e02286a9cc56;hp=9202fc6f2bd12cb35cf1d1825e3f2ae0d8a59271;hb=57e30102ea440d77aa001e26eb901d0cbb305a30;hpb=2c35b35e111b5a23a3316e02e419c212840c4cc2
diff --git a/src/target/arm926ejs.h b/src/target/arm926ejs.h
index 9202fc6f2b..d4fd0cb6eb 100644
--- a/src/target/arm926ejs.h
+++ b/src/target/arm926ejs.h
@@ -13,46 +13,43 @@
* 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 . *
***************************************************************************/
-#ifndef ARM926EJS_H
-#define ARM926EJS_H
-#include
+#ifndef OPENOCD_TARGET_ARM926EJS_H
+#define OPENOCD_TARGET_ARM926EJS_H
+
+#include "arm9tdmi.h"
#include "armv4_5_mmu.h"
#define ARM926EJS_COMMON_MAGIC 0xa926a926
-struct arm926ejs_common
-{
+struct arm926ejs_common {
struct arm7_9_common arm7_9_common;
uint32_t common_magic;
struct armv4_5_mmu_common armv4_5_mmu;
- int (*read_cp15)(struct target *target, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t *value);
- int (*write_cp15)(struct target *target, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t value);
+ int (*read_cp15)(struct target *target, uint32_t op1, uint32_t op2,
+ uint32_t CRn, uint32_t CRm, uint32_t *value);
+ int (*write_cp15)(struct target *target, uint32_t op1, uint32_t op2,
+ uint32_t CRn, uint32_t CRm, uint32_t value);
uint32_t cp15_control_reg;
uint32_t d_fsr;
uint32_t i_fsr;
uint32_t d_far;
};
-static inline struct arm926ejs_common *
-target_to_arm926(struct target *target)
+static inline struct arm926ejs_common *target_to_arm926(struct target *target)
{
- return container_of(target->arch_info, struct arm926ejs_common,
- arm7_9_common.armv4_5_common);
+ return container_of(target->arch_info, struct arm926ejs_common, arm7_9_common.arm);
}
-
int arm926ejs_init_arch_info(struct target *target,
struct arm926ejs_common *arm926ejs, struct jtag_tap *tap);
int arm926ejs_arch_state(struct target *target);
int arm926ejs_write_memory(struct target *target,
- uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
+ target_addr_t address, uint32_t size, uint32_t count, const uint8_t *buffer);
int arm926ejs_soft_reset_halt(struct target *target);
extern const struct command_registration arm926ejs_command_handlers[];
-#endif /* ARM926EJS_H */
+#endif /* OPENOCD_TARGET_ARM926EJS_H */