X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fmips_m4k.c;h=fa40574e505b8bee5b18844e96f422cce54e5f54;hp=909745aa648f81ec39056bc357ffe3f1f1704132;hb=ccde06a08fbf9c4f57b321dbec0509f73239c2de;hpb=42ef503d37b18d907da16d26e99167566d5aabd1

diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 909745aa64..fa40574e50 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -122,7 +122,7 @@ int mips_m4k_examine_debug_reason(target_t *target)
 
 int mips_m4k_debug_entry(target_t *target)
 {
-	mips32_common_t *mips32 = target->arch_info;
+	struct mips32_common *mips32 = target->arch_info;
 	mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
 	uint32_t debug_reg;
 
@@ -154,7 +154,7 @@ int mips_m4k_debug_entry(target_t *target)
 int mips_m4k_poll(target_t *target)
 {
 	int retval;
-	mips32_common_t *mips32 = target->arch_info;
+	struct mips32_common *mips32 = target->arch_info;
 	mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
 	uint32_t ejtag_ctrl = ejtag_info->ejtag_ctrl;
 
@@ -214,7 +214,7 @@ int mips_m4k_poll(target_t *target)
 
 int mips_m4k_halt(struct target_s *target)
 {
-	mips32_common_t *mips32 = target->arch_info;
+	struct mips32_common *mips32 = target->arch_info;
 	mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
 
 	LOG_DEBUG("target->state: %s",
@@ -259,7 +259,7 @@ int mips_m4k_halt(struct target_s *target)
 
 int mips_m4k_assert_reset(target_t *target)
 {
-	mips32_common_t *mips32 = target->arch_info;
+	struct mips32_common *mips32 = target->arch_info;
 	mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
 
 	LOG_DEBUG("target->state: %s",
@@ -338,7 +338,7 @@ int mips_m4k_soft_reset_halt(struct target_s *target)
 
 int mips_m4k_single_step_core(target_t *target)
 {
-	mips32_common_t *mips32 = target->arch_info;
+	struct mips32_common *mips32 = target->arch_info;
 	mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
 
 	/* configure single step mode */
@@ -357,7 +357,7 @@ int mips_m4k_single_step_core(target_t *target)
 
 int mips_m4k_resume(struct target_s *target, int current, uint32_t address, int handle_breakpoints, int debug_execution)
 {
-	mips32_common_t *mips32 = target->arch_info;
+	struct mips32_common *mips32 = target->arch_info;
 	mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
 	breakpoint_t *breakpoint = NULL;
 	uint32_t resume_pc;
@@ -429,7 +429,7 @@ int mips_m4k_resume(struct target_s *target, int current, uint32_t address, int
 int mips_m4k_step(struct target_s *target, int current, uint32_t address, int handle_breakpoints)
 {
 	/* get pointers to arch-specific information */
-	mips32_common_t *mips32 = target->arch_info;
+	struct mips32_common *mips32 = target->arch_info;
 	mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
 	breakpoint_t *breakpoint = NULL;
 
@@ -493,8 +493,8 @@ void mips_m4k_enable_breakpoints(struct target_s *target)
 
 int mips_m4k_set_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 {
-	mips32_common_t *mips32 = target->arch_info;
-	mips32_comparator_t * comparator_list = mips32->inst_break_list;
+	struct mips32_common *mips32 = target->arch_info;
+	struct mips32_comparator * comparator_list = mips32->inst_break_list;
 	int retval;
 
 	if (breakpoint->set)
@@ -585,8 +585,8 @@ int mips_m4k_set_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 int mips_m4k_unset_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 {
 	/* get pointers to arch-specific information */
-	mips32_common_t *mips32 = target->arch_info;
-	mips32_comparator_t * comparator_list = mips32->inst_break_list;
+	struct mips32_common *mips32 = target->arch_info;
+	struct mips32_comparator * comparator_list = mips32->inst_break_list;
 	int retval;
 
 	if (!breakpoint->set)
@@ -659,7 +659,7 @@ int mips_m4k_unset_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 
 int mips_m4k_add_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 {
-	mips32_common_t *mips32 = target->arch_info;
+	struct mips32_common *mips32 = target->arch_info;
 
 	if (breakpoint->type == BKPT_HARD)
 	{
@@ -680,7 +680,7 @@ int mips_m4k_add_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 int mips_m4k_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 {
 	/* get pointers to arch-specific information */
-	mips32_common_t *mips32 = target->arch_info;
+	struct mips32_common *mips32 = target->arch_info;
 
 	if (target->state != TARGET_HALTED)
 	{
@@ -699,10 +699,10 @@ int mips_m4k_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint
 	return ERROR_OK;
 }
 
-int mips_m4k_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
+int mips_m4k_set_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 {
-	mips32_common_t *mips32 = target->arch_info;
-	mips32_comparator_t * comparator_list = mips32->data_break_list;
+	struct mips32_common *mips32 = target->arch_info;
+	struct mips32_comparator * comparator_list = mips32->data_break_list;
 	int wp_num = 0;
 	/*
 	 * watchpoint enabled, ignore all byte lanes in value register
@@ -767,11 +767,11 @@ int mips_m4k_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
 	return ERROR_OK;
 }
 
-int mips_m4k_unset_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
+int mips_m4k_unset_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 {
 	/* get pointers to arch-specific information */
-	mips32_common_t *mips32 = target->arch_info;
-	mips32_comparator_t * comparator_list = mips32->data_break_list;
+	struct mips32_common *mips32 = target->arch_info;
+	struct mips32_comparator * comparator_list = mips32->data_break_list;
 
 	if (!watchpoint->set)
 	{
@@ -793,9 +793,9 @@ int mips_m4k_unset_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
 	return ERROR_OK;
 }
 
-int mips_m4k_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
+int mips_m4k_add_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 {
-	mips32_common_t *mips32 = target->arch_info;
+	struct mips32_common *mips32 = target->arch_info;
 
 	if (mips32->num_data_bpoints_avail < 1)
 	{
@@ -809,10 +809,10 @@ int mips_m4k_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
 	return ERROR_OK;
 }
 
-int mips_m4k_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
+int mips_m4k_remove_watchpoint(struct target_s *target, struct watchpoint *watchpoint)
 {
 	/* get pointers to arch-specific information */
-	mips32_common_t *mips32 = target->arch_info;
+	struct mips32_common *mips32 = target->arch_info;
 
 	if (target->state != TARGET_HALTED)
 	{
@@ -832,7 +832,7 @@ int mips_m4k_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint
 
 void mips_m4k_enable_watchpoints(struct target_s *target)
 {
-	watchpoint_t *watchpoint = target->watchpoints;
+	struct watchpoint *watchpoint = target->watchpoints;
 
 	/* set any pending watchpoints */
 	while (watchpoint)
@@ -845,7 +845,7 @@ void mips_m4k_enable_watchpoints(struct target_s *target)
 
 int mips_m4k_read_memory(struct target_s *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
 {
-	mips32_common_t *mips32 = target->arch_info;
+	struct mips32_common *mips32 = target->arch_info;
 	mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
 
 	LOG_DEBUG("address: 0x%8.8" PRIx32 ", size: 0x%8.8" PRIx32 ", count: 0x%8.8" PRIx32 "", address, size, count);
@@ -877,7 +877,7 @@ int mips_m4k_read_memory(struct target_s *target, uint32_t address, uint32_t siz
 
 int mips_m4k_write_memory(struct target_s *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer)
 {
-	mips32_common_t *mips32 = target->arch_info;
+	struct mips32_common *mips32 = target->arch_info;
 	mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
 
 	LOG_DEBUG("address: 0x%8.8" PRIx32 ", size: 0x%8.8" PRIx32 ", count: 0x%8.8" PRIx32 "", address, size, count);
@@ -919,7 +919,7 @@ int mips_m4k_init_target(struct command_context_s *cmd_ctx, struct target_s *tar
 
 int mips_m4k_init_arch_info(target_t *target, mips_m4k_common_t *mips_m4k, struct jtag_tap *tap)
 {
-	mips32_common_t *mips32 = &mips_m4k->mips32_common;
+	struct mips32_common *mips32 = &mips_m4k->mips32_common;
 
 	mips_m4k->common_magic = MIPSM4K_COMMON_MAGIC;
 
@@ -942,7 +942,7 @@ int mips_m4k_target_create(struct target_s *target, Jim_Interp *interp)
 int mips_m4k_examine(struct target_s *target)
 {
 	int retval;
-	mips32_common_t *mips32 = target->arch_info;
+	struct mips32_common *mips32 = target->arch_info;
 	mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
 	uint32_t idcode = 0;