X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Fmips_m4k.c;h=be7f59ec8c38ab7e2bd334605985f110b59c14a9;hb=539527ab74f73bfd27d055d7ca20d30176be5e17;hp=7cca55de61f375cb602ff1d2f6b5c1f761a78356;hpb=ce16ff901c63c65d6087af4436159a6529de3b95;p=fw%2Fopenocd

diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 7cca55de6..be7f59ec8 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -25,6 +25,7 @@
 
 #include "mips32.h"
 #include "mips_m4k.h"
+#include "mips32_dmaacc.h"
 #include "jtag.h"
 #include "log.h"
 
@@ -44,7 +45,7 @@ int mips_m4k_write_memory(struct target_s *target, u32 address, u32 size, u32 co
 int mips_m4k_register_commands(struct command_context_s *cmd_ctx);
 int mips_m4k_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
 int mips_m4k_quit(void);
-int mips_m4k_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct target_s *target);
+int mips_m4k_target_create(struct target_s *target, Jim_Interp *interp);
 
 int mips_m4k_examine(struct target_s *target);
 int mips_m4k_assert_reset(target_t *target);
@@ -83,7 +84,7 @@ target_type_t mips_m4k_target =
 	.remove_watchpoint = mips_m4k_remove_watchpoint,
 
 	.register_commands = mips_m4k_register_commands,
-	.target_command = mips_m4k_target_command,
+	.target_create = mips_m4k_target_create,
 	.init_target = mips_m4k_init_target,
 	.examine = mips_m4k_examine,
 	.quit = mips_m4k_quit
@@ -119,8 +120,9 @@ int mips_m4k_debug_entry(target_t *target)
 	
 	mips32_save_context(target);
 	
-	LOG_DEBUG("entered debug state at PC 0x%x, target->state: %s", \
-		*(u32*)(mips32->core_cache->reg_list[MIPS32_PC].value), target_state_strings[target->state]);
+	LOG_DEBUG("entered debug state at PC 0x%x, target->state: %s", 
+		*(u32*)(mips32->core_cache->reg_list[MIPS32_PC].value), 
+		  Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
 	
 	return ERROR_OK;
 }
@@ -130,13 +132,14 @@ int mips_m4k_poll(target_t *target)
 	int retval;
 	mips32_common_t *mips32 = target->arch_info;
 	mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
+	u32 ejtag_ctrl = ejtag_info->ejtag_ctrl;
 	
 	/* read ejtag control reg */
 	jtag_add_end_state(TAP_RTI);
 	mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
-	mips_ejtag_drscan_32(ejtag_info, &ejtag_info->ejtag_ctrl);
+	mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
 	
-	if (ejtag_info->ejtag_ctrl & EJTAG_CTRL_BRKST)
+	if (ejtag_ctrl & EJTAG_CTRL_BRKST)
 	{
 		if ((target->state == TARGET_RUNNING) || (target->state == TARGET_RESET))
 		{
@@ -165,19 +168,19 @@ int mips_m4k_poll(target_t *target)
 		target->state = TARGET_RUNNING;
 	}
 	
-	if (ejtag_info->ejtag_ctrl & EJTAG_CTRL_ROCC)
+	if (ejtag_ctrl & EJTAG_CTRL_ROCC)
 	{
 		/* we have detected a reset, clear flag
 		 * otherwise ejtag will not work */
 		jtag_add_end_state(TAP_RTI);
-		ejtag_info->ejtag_ctrl &= ~EJTAG_CTRL_ROCC;
+		ejtag_ctrl = ejtag_info->ejtag_ctrl & ~EJTAG_CTRL_ROCC;
 		
 		mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
-		mips_ejtag_drscan_32(ejtag_info, &ejtag_info->ejtag_ctrl);
+		mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
 		LOG_DEBUG("Reset Detected");
 	}
 	
-//	LOG_DEBUG("ctrl=0x%08X", ejtag_info->ejtag_ctrl);
+//	LOG_DEBUG("ctrl=0x%08X", ejtag_ctrl);
 	
 	return ERROR_OK;
 }
@@ -187,7 +190,8 @@ int mips_m4k_halt(struct target_s *target)
 	mips32_common_t *mips32 = target->arch_info;
 	mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
 	
-	LOG_DEBUG("target->state: %s", target_state_strings[target->state]);
+	LOG_DEBUG("target->state: %s", 
+		  Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
 	
 	if (target->state == TARGET_HALTED)
 	{
@@ -231,7 +235,8 @@ int mips_m4k_assert_reset(target_t *target)
 	mips32_common_t *mips32 = target->arch_info;
 	mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
 	
-	LOG_DEBUG("target->state: %s", target_state_strings[target->state]);
+	LOG_DEBUG("target->state: %s", 
+		  Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
 	
 	if (!(jtag_reset_config & RESET_HAS_SRST))
 	{
@@ -279,7 +284,8 @@ int mips_m4k_assert_reset(target_t *target)
 
 int mips_m4k_deassert_reset(target_t *target)
 {
-	LOG_DEBUG("target->state: %s", target_state_strings[target->state]);
+	LOG_DEBUG("target->state: %s", 
+		  Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
 	
 	/* deassert reset lines */
 	jtag_add_reset(0, 0);
@@ -508,7 +514,11 @@ int mips_m4k_read_memory(struct target_s *target, u32 address, u32 size, u32 cou
 		case 4:
 		case 2:
 		case 1:
-			return mips32_pracc_read_mem(ejtag_info, address, size, count, (void *)buffer);
+			/* if noDMA off, use DMAACC mode for memory read */
+			if(ejtag_info->impcode & (1<<14))
+				return mips32_pracc_read_mem(ejtag_info, address, size, count, (void *)buffer);
+			else
+				return mips32_dmaacc_read_mem(ejtag_info, address, size, count, (void *)buffer);
 		default:
 			LOG_ERROR("BUG: we shouldn't get here");
 			exit(-1);
@@ -543,7 +553,11 @@ int mips_m4k_write_memory(struct target_s *target, u32 address, u32 size, u32 co
 		case 4:
 		case 2:
 		case 1:
-			mips32_pracc_write_mem(ejtag_info, address, size, count, (void *)buffer);
+			/* if noDMA off, use DMAACC mode for memory write */
+			if(ejtag_info->impcode & (1<<14))
+				mips32_pracc_write_mem(ejtag_info, address, size, count, (void *)buffer);
+			else
+				mips32_dmaacc_write_mem(ejtag_info, address, size, count, (void *)buffer);
 			break;
 		default:
 			LOG_ERROR("BUG: we shouldn't get here");
@@ -574,7 +588,7 @@ int mips_m4k_quit(void)
 	return ERROR_OK;
 }
 
-int mips_m4k_init_arch_info(target_t *target, mips_m4k_common_t *mips_m4k, int chain_pos, char *variant)
+int mips_m4k_init_arch_info(target_t *target, mips_m4k_common_t *mips_m4k, int chain_pos, const char *variant)
 {
 	mips32_common_t *mips32 = &mips_m4k->mips32_common;
 	
@@ -596,24 +610,11 @@ int mips_m4k_init_arch_info(target_t *target, mips_m4k_common_t *mips_m4k, int c
 	return ERROR_OK;
 }
 
-int mips_m4k_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct target_s *target)
+int mips_m4k_target_create(struct target_s *target, Jim_Interp *interp)
 {
-	int chain_pos;
-	char *variant = NULL;
-	mips_m4k_common_t *mips_m4k = malloc(sizeof(mips_m4k_common_t));
+	mips_m4k_common_t *mips_m4k = calloc(1,sizeof(mips_m4k_common_t));
 	
-	if (argc < 4)
-	{
-		LOG_ERROR("'target mips4k' requires at least one additional argument");
-		exit(-1);
-	}
-	
-	chain_pos = strtoul(args[3], NULL, 0);
-	
-	if (argc >= 5)
-		variant = args[4];
-	
-	mips_m4k_init_arch_info(target, mips_m4k, chain_pos, variant);
+	mips_m4k_init_arch_info(target, mips_m4k, target->chain_position, target->variant);
 	
 	return ERROR_OK;
 }