X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fxsvf%2Fxsvf.c;h=f4c5df62970cd44f5b7dea958793c10f31137310;hb=95d2a2372421aeddae01f1af51279ab7989e46b5;hp=0ec9f4dca23a37a1498094f09da8abbc70e29a22;hpb=67caf323f74937e11c0f5f95c2ee57d2786ac02b;p=openocd.git

diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index 0ec9f4dca2..f4c5df6297 100644
--- a/src/xsvf/xsvf.c
+++ b/src/xsvf/xsvf.c
@@ -133,7 +133,7 @@ static tap_state_t xsvf_to_tap( int xsvf_state )
 {
 	tap_state_t	ret;
 
-	switch( xsvf_state )
+	switch ( xsvf_state )
 	{
 	case XSV_RESET:			ret = TAP_RESET;			break;
 	case XSV_IDLE:			ret = TAP_IDLE;			break;
@@ -169,7 +169,7 @@ int xsvf_register_commands(struct command_context_s *cmd_ctx)
 	return ERROR_OK;
 }
 
-static int xsvf_read_buffer(int num_bits, int fd, u8* buf)
+static int xsvf_read_buffer(int num_bits, int fd, uint8_t* buf)
 {
 	int num_bytes;
 
@@ -186,9 +186,9 @@ static int xsvf_read_buffer(int num_bits, int fd, u8* buf)
 
 static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-	u8 *dr_out_buf = NULL; 				/* from host to device (TDI) */
-	u8 *dr_in_buf = NULL;				/* from device to host (TDO) */
-	u8 *dr_in_mask = NULL;
+	uint8_t *dr_out_buf = NULL; 				/* from host to device (TDI) */
+	uint8_t *dr_in_buf = NULL;				/* from device to host (TDO) */
+	uint8_t *dr_in_mask = NULL;
 
 	int xsdrsize = 0;
 	int xruntest = 0;					/* number of TCK cycles OR microseconds */
@@ -197,8 +197,8 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 	tap_state_t	xendir = TAP_IDLE;		/* see page 8 of the SVF spec, initial xendir to be TAP_IDLE */
 	tap_state_t xenddr = TAP_IDLE;
 
-	u8  		opcode;
-	u8		uc;
+	uint8_t  		opcode;
+	uint8_t		uc;
 	long		file_offset = 0;
 
 	int		loop_count = 0;
@@ -232,7 +232,7 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 
 	if (strcmp(args[0], "plain") != 0)
 	{
-		tap = jtag_TapByString( args[0] );
+		tap = jtag_tap_by_string( args[0] );
 		if (!tap )
 		{
 			command_print( cmd_ctx, "Tap: %s unknown", args[0] );
@@ -261,7 +261,7 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 
 	LOG_USER("xsvf processing file: \"%s\"", filename);
 
-	while( read(xsvf_fd, &opcode, 1) > 0 )
+	while ( read(xsvf_fd, &opcode, 1) > 0 )
 	{
 		/* record the position of the just read opcode within the file */
 		file_offset = lseek(xsvf_fd, 0, SEEK_CUR) - 1;
@@ -287,7 +287,7 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 
 		case XRUNTEST:
 			{
-				u8	xruntest_buf[4];
+				uint8_t	xruntest_buf[4];
 
 				if (read(xsvf_fd, xruntest_buf, 4) < 0)
 				{
@@ -302,7 +302,7 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 
 		case XREPEAT:
 			{
-				u8 myrepeat;
+				uint8_t myrepeat;
 
 				if (read(xsvf_fd, &myrepeat, 1) < 0)
 					do_abort = 1;
@@ -316,7 +316,7 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 
 		case XSDRSIZE:
 			{
-				u8	xsdrsize_buf[4];
+				uint8_t	xsdrsize_buf[4];
 
 				if (read(xsvf_fd, xsdrsize_buf, 4) < 0)
 				{
@@ -327,9 +327,9 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 				xsdrsize = be_to_h_u32(xsdrsize_buf);
 				LOG_DEBUG("XSDRSIZE %d", xsdrsize);
 
-				if( dr_out_buf ) free(dr_out_buf);
-				if( dr_in_buf)   free(dr_in_buf);
-				if( dr_in_mask)  free(dr_in_mask);
+				if ( dr_out_buf ) free(dr_out_buf);
+				if ( dr_in_buf)   free(dr_in_buf);
+				if ( dr_in_mask)  free(dr_in_mask);
 
 				dr_out_buf = malloc((xsdrsize + 7) / 8);
 				dr_in_buf = malloc((xsdrsize + 7) / 8);
@@ -354,7 +354,7 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 
 				if (opcode == XSDRTDO)
 				{
-					if(xsvf_read_buffer(xsdrsize, xsvf_fd, dr_in_buf)  != ERROR_OK )
+					if (xsvf_read_buffer(xsdrsize, xsvf_fd, dr_in_buf)  != ERROR_OK )
 					{
 						do_abort = 1;
 						break;
@@ -366,11 +366,11 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 
 				LOG_DEBUG("%s %d", op_name, xsdrsize);
 
-				for( attempt=0; attempt<limit;  ++attempt )
+				for ( attempt=0; attempt<limit;  ++attempt )
 				{
 					scan_field_t field;
 
-					if( attempt>0 )
+					if ( attempt>0 )
 					{
 						/* perform the XC9500 exception handling sequence shown in xapp067.pdf and
 						   illustrated in psuedo code at end of this file.  We start from state
@@ -405,9 +405,9 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 					field.in_value = calloc(CEIL(field.num_bits, 8), 1);
 
 					if (tap == NULL)
-						jtag_add_plain_dr_scan(1, &field, TAP_DRPAUSE);
+						jtag_add_plain_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
 					else
-						jtag_add_dr_scan(1, &field, TAP_DRPAUSE);
+						jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
 
 					jtag_check_value_mask(&field, dr_in_buf, dr_in_mask);
 
@@ -488,7 +488,7 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 		case XSTATE:
 			{
 				tap_state_t	mystate;
-				u8			uc;
+				uint8_t			uc;
 
 				if (read(xsvf_fd, &uc, 1) < 0)
 				{
@@ -505,7 +505,7 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 					the XSTATE.
 				*/
 
-				if( jtag_add_statemove( mystate ) != ERROR_OK )
+				if ( jtag_add_statemove( mystate ) != ERROR_OK )
 				{
 					/*	For special states known as stable states
 						(Test-Logic-Reset, Run-Test/Idle, Pause-DR, Pause- IR),
@@ -538,9 +538,9 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 			}
 
 			/* see page 22 of XSVF spec */
-			if( uc == 0 )
+			if ( uc == 0 )
 				xendir = TAP_IDLE;
-			else if( uc == 1 )
+			else if ( uc == 1 )
 				xendir = TAP_IRPAUSE;
 			else
 			{
@@ -561,9 +561,9 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 			}
 
 			/* see page 22 of XSVF spec */
-			if( uc == 0 )
+			if ( uc == 0 )
 				xenddr = TAP_IDLE;
-			else if( uc == 1 )
+			else if ( uc == 1 )
 				xenddr = TAP_DRPAUSE;
 			else
 			{
@@ -578,12 +578,12 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 		case XSIR:
 		case XSIR2:
 			{
-				u8	short_buf[2];
-				u8*	ir_buf;
+				uint8_t	short_buf[2];
+				uint8_t*	ir_buf;
 				int bitcount;
 				tap_state_t my_end_state = xruntest ? TAP_IDLE : xendir;
 
-				if( opcode == XSIR )
+				if ( opcode == XSIR )
 				{
 					/* one byte bitcount */
 					if (read(xsvf_fd, short_buf, 1) < 0)
@@ -642,7 +642,7 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 
 					/* LOG_DEBUG("FLUSHING QUEUE"); */
 					result = jtag_execute_queue();
-					if(result != ERROR_OK)
+					if (result != ERROR_OK)
 					{
 						tdo_mismatch = 1;
 					}
@@ -678,12 +678,12 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 		case XWAIT:
 			{
 				/* expected in stream:
-				   XWAIT <u8 wait_state> <u8 end_state> <u32 usecs>
+				   XWAIT <uint8_t wait_state> <uint8_t end_state> <uint32_t usecs>
 				*/
 
-				u8	wait;
-				u8	end;
-				u8	delay_buf[4];
+				uint8_t	wait;
+				uint8_t	end;
+				uint8_t	delay_buf[4];
 
 				tap_state_t wait_state;
 				tap_state_t end_state;
@@ -719,13 +719,13 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 		case XWAITSTATE:
 			{
 				/* expected in stream:
-				   XWAITSTATE <u8 wait_state> <u8 end_state> <u32 clock_count> <u32 usecs>
+				   XWAITSTATE <uint8_t wait_state> <uint8_t end_state> <uint32_t clock_count> <uint32_t usecs>
 				*/
 
-				u8  clock_buf[4];
-				u8  	usecs_buf[4];
-				u8	wait;
-				u8	end;
+				uint8_t  clock_buf[4];
+				uint8_t  	usecs_buf[4];
+				uint8_t	wait;
+				uint8_t	end;
 				tap_state_t wait_state;
 				tap_state_t end_state;
 				int clock_count;
@@ -775,9 +775,9 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 		case LCOUNT:
 			{
 				/* expected in stream:
-				   LCOUNT <u32 loop_count>
+				   LCOUNT <uint32_t loop_count>
 				*/
-				u8  count_buf[4];
+				uint8_t  count_buf[4];
 
 				if ( read(xsvf_fd, count_buf, 4) < 0 )
 				{
@@ -793,11 +793,11 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 		case LDELAY:
 			{
 				/* expected in stream:
-				   LDELAY <u8 wait_state> <u32 clock_count> <u32 usecs_to_sleep>
+				   LDELAY <uint8_t wait_state> <uint32_t clock_count> <uint32_t usecs_to_sleep>
 				*/
-				u8	state;
-				u8  clock_buf[4];
-				u8  usecs_buf[4];
+				uint8_t	state;
+				uint8_t  clock_buf[4];
+				uint8_t  usecs_buf[4];
 
 				if ( read(xsvf_fd, &state, 1) < 0
 				  || read(xsvf_fd, clock_buf, 4) < 0
@@ -836,7 +836,7 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 				if (limit < 1)
 					limit = 1;
 
-				for( attempt=0; attempt<limit;  ++attempt )
+				for ( attempt=0; attempt<limit;  ++attempt )
 				{
 					scan_field_t field;
 
@@ -853,9 +853,9 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 						LOG_USER("LSDR retry %d", attempt);
 
 					if (tap == NULL)
-						jtag_add_plain_dr_scan(1, &field, TAP_DRPAUSE);
+						jtag_add_plain_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
 					else
-						jtag_add_dr_scan(1, &field, TAP_DRPAUSE);
+						jtag_add_dr_scan(1, &field, jtag_set_end_state(TAP_DRPAUSE));
 
 					jtag_check_value_mask(&field, dr_in_buf, dr_in_mask);
 
@@ -864,7 +864,7 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 
 					/* LOG_DEBUG("FLUSHING QUEUE"); */
 					result = jtag_execute_queue();
-					if(result == ERROR_OK)
+					if (result == ERROR_OK)
 					{
 						matched = 1;
 						break;
@@ -882,7 +882,7 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 
 		case XTRST:
 			{
-				u8	trst_mode;
+				uint8_t	trst_mode;
 
 				if (read(xsvf_fd, &trst_mode, 1) < 0)
 				{
@@ -890,7 +890,7 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha
 					break;
 				}
 
-				switch( trst_mode )
+				switch ( trst_mode )
 				{
 				case XTRST_ON:
 					jtag_add_reset(1, 0);