X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fstr9xpec.c;h=33471e6b3a67c4d054701833d8d173f7e1636920;hb=4f7761828c91108d4bf4a12e78f23b6483b18ade;hp=14dfebca36c547e2b16ba0ac03df247e765a4a6f;hpb=fb1a9b2cb2f844a17d26dfeb3d26849364d93e26;p=openocd.git

diff --git a/src/flash/str9xpec.c b/src/flash/str9xpec.c
index 14dfebca36..33471e6b3a 100644
--- a/src/flash/str9xpec.c
+++ b/src/flash/str9xpec.c
@@ -101,7 +101,7 @@ static int str9xpec_register_commands(struct command_context_s *cmd_ctx)
 
 int str9xpec_set_instr(jtag_tap_t *tap, uint32_t new_instr, tap_state_t end_state)
 {
-	if ( tap == NULL ){
+	if (tap == NULL) {
 		return ERROR_TARGET_INVALID;
 	}
 
@@ -318,14 +318,14 @@ static int str9xpec_flash_bank_command(struct command_context_s *cmd_ctx, char *
 	str9xpec_info = malloc(sizeof(str9xpec_flash_controller_t));
 	bank->driver_priv = str9xpec_info;
 
-	/* find out jtag position of flash controller
-	 * it is always after the arm966 core */
-
+	/* REVISIT verify that the jtag position of flash controller is
+	 * right after *THIS* core, which must be a STR9xx core ...
+	 */
 	armv4_5 = bank->target->arch_info;
 	arm7_9 = armv4_5->arch_info;
 	jtag_info = &arm7_9->jtag_info;
 
-	str9xpec_info->tap = jtag_tap_by_position( jtag_info->tap->abs_chain_position - 1);
+	str9xpec_info->tap = bank->target->tap;
 	str9xpec_info->isc_enable = 0;
 
 	str9xpec_build_block_list(bank);
@@ -349,7 +349,7 @@ static int str9xpec_blank_check(struct flash_bank_s *bank, int first, int last)
 	tap = str9xpec_info->tap;
 
 	if (!str9xpec_info->isc_enable) {
-		str9xpec_isc_enable( bank );
+		str9xpec_isc_enable(bank);
 	}
 
 	if (!str9xpec_info->isc_enable) {
@@ -438,7 +438,7 @@ static int str9xpec_erase_area(struct flash_bank_s *bank, int first, int last)
 	tap = str9xpec_info->tap;
 
 	if (!str9xpec_info->isc_enable) {
-		str9xpec_isc_enable( bank );
+		str9xpec_isc_enable(bank);
 	}
 
 	if (!str9xpec_info->isc_enable) {
@@ -518,7 +518,7 @@ static int str9xpec_lock_device(struct flash_bank_s *bank)
 	tap = str9xpec_info->tap;
 
 	if (!str9xpec_info->isc_enable) {
-		str9xpec_isc_enable( bank );
+		str9xpec_isc_enable(bank);
 	}
 
 	if (!str9xpec_info->isc_enable) {
@@ -575,7 +575,7 @@ static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int l
 	/* last bank: 0xFF signals a full device protect */
 	if (last == 0xFF)
 	{
-		if ( set )
+		if (set)
 		{
 			status = str9xpec_lock_device(bank);
 		}
@@ -589,7 +589,7 @@ static int str9xpec_protect(struct flash_bank_s *bank, int set, int first, int l
 	{
 		for (i = first; i <= last; i++)
 		{
-			if ( set )
+			if (set)
 				buf_set_u32(str9xpec_info->options, str9xpec_info->sector_bits[i], 1, 1);
 			else
 				buf_set_u32(str9xpec_info->options, str9xpec_info->sector_bits[i], 1, 0);
@@ -671,11 +671,11 @@ static int str9xpec_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t o
 				check_address = sec_end;
 		}
 
-		if ((offset >= sec_start) && (offset < sec_end)){
+		if ((offset >= sec_start) && (offset < sec_end)) {
 			first_sector = i;
 		}
 
-		if ((offset + count >= sec_start) && (offset + count < sec_end)){
+		if ((offset + count >= sec_start) && (offset + count < sec_end)) {
 			last_sector = i;
 		}
 	}
@@ -845,7 +845,7 @@ static int str9xpec_erase_check(struct flash_bank_s *bank)
 
 static int str9xpec_info(struct flash_bank_s *bank, char *buf, int buf_size)
 {
-	snprintf(buf, buf_size, "str9xpec flash driver info" );
+	snprintf(buf, buf_size, "str9xpec flash driver info");
 	return ERROR_OK;
 }
 
@@ -919,13 +919,13 @@ static int str9xpec_write_options(struct flash_bank_s *bank)
 	tap = str9xpec_info->tap;
 
 	/* erase config options first */
-	status = str9xpec_erase_area( bank, 0xFE, 0xFE );
+	status = str9xpec_erase_area(bank, 0xFE, 0xFE);
 
 	if ((status & ISC_STATUS_ERROR) != STR9XPEC_ISC_SUCCESS)
 		return status;
 
 	if (!str9xpec_info->isc_enable) {
-		str9xpec_isc_enable( bank );
+		str9xpec_isc_enable(bank);
 	}
 
 	if (!str9xpec_info->isc_enable) {
@@ -1254,7 +1254,8 @@ static int str9xpec_handle_flash_disable_turbo_command(struct command_context_s
 		return ERROR_FAIL;
 
 	/* exit turbo mode via RESET */
-	str9xpec_set_instr(tap, ISC_NOOP, TAP_RESET);
+	str9xpec_set_instr(tap, ISC_NOOP, TAP_IDLE);
+	jtag_add_tlr();
 	jtag_execute_queue();
 
 	/* restore previous scan chain */