X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fvsllink.c;h=0684dd3bb79415f32ac9ec29b6f92697d428c0cd;hb=ca32f25638408df8a9c18522da43f6e8adcdb5cb;hp=f462f07c82cdc20baf794dbc96fb1bec8736ecd2;hpb=9f535f9af7c6b7e8843033049a6da0f6d76d513b;p=openocd.git

diff --git a/src/jtag/vsllink.c b/src/jtag/vsllink.c
index f462f07c82..0684dd3bb7 100644
--- a/src/jtag/vsllink.c
+++ b/src/jtag/vsllink.c
@@ -105,13 +105,12 @@ static uint8_t VSLLINK_tap_move[6][6] =
 	{0xfe, 0x60, 0x38, 0x5c, 0x40, 0x5e}	/* PI  */
 };
 
-typedef struct insert_insignificant_operation
-{
+struct insert_insignificant_operation {
 	unsigned char insert_value;
 	unsigned char insert_position;
-}insert_insignificant_operation_t;
+};
 
-static insert_insignificant_operation_t VSLLINK_TAP_MOVE_INSERT_INSIGNIFICANT[6][6] =
+static struct insert_insignificant_operation VSLLINK_TAP_MOVE_INSERT_INSIGNIFICANT[6][6] =
 {
 /*	 stuff	offset   */
 	{/*	TLR	*/
@@ -163,18 +162,17 @@ static uint8_t VSLLINK_BIT_MSK[8] =
 	0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f
 };
 
-typedef struct
-{
+struct pending_scan_result {
 	int offset;
 	int length; /* Number of bits to read */
-	scan_command_t *command; /* Corresponding scan command */
+	struct scan_command *command; /* Corresponding scan command */
 	uint8_t *buffer;
-} pending_scan_result_t;
+};
 
 #define MAX_PENDING_SCAN_RESULTS 256
 
 static int pending_scan_results_length;
-static pending_scan_result_t pending_scan_results_buffer[MAX_PENDING_SCAN_RESULTS];
+static struct pending_scan_result pending_scan_results_buffer[MAX_PENDING_SCAN_RESULTS];
 
 /* Queue command functions */
 static void vsllink_end_state(tap_state_t state);
@@ -188,9 +186,9 @@ static void vsllink_runtest(int num_cycles);
 static void vsllink_stableclocks_dma(int num_cycles, int tms);
 static void vsllink_stableclocks_normal(int num_cycles, int tms);
 static void (*vsllink_stableclocks)(int num_cycles, int tms);
-static void vsllink_scan_dma(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command);
-static void vsllink_scan_normal(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command);
-static void (*vsllink_scan)(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command);
+static void vsllink_scan_dma(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command);
+static void vsllink_scan_normal(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command);
+static void (*vsllink_scan)(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command);
 static void vsllink_reset(int trst, int srst);
 static void vsllink_simple_command(uint8_t command);
 static int vsllink_connect(void);
@@ -207,20 +205,19 @@ static int (*vsllink_tap_execute)(void);
 static void vsllink_tap_ensure_space_dma(int scans, int length);
 static void vsllink_tap_ensure_space_normal(int scans, int length);
 static void (*vsllink_tap_ensure_space)(int scans, int length);
-static void vsllink_tap_append_scan_dma(int length, uint8_t *buffer, scan_command_t *command);
-static void vsllink_tap_append_scan_normal(int length, uint8_t *buffer, scan_command_t *command, int offset);
+static void vsllink_tap_append_scan_dma(int length, uint8_t *buffer, struct scan_command *command);
+static void vsllink_tap_append_scan_normal(int length, uint8_t *buffer, struct scan_command *command, int offset);
 
 /* VSLLink lowlevel functions */
-typedef struct vsllink_jtag
-{
+struct vsllink {
 	struct usb_dev_handle* usb_handle;
-} vsllink_jtag_t;
+};
 
-static vsllink_jtag_t *vsllink_usb_open(void);
-static void vsllink_usb_close(vsllink_jtag_t *vsllink_jtag);
-static int vsllink_usb_message(vsllink_jtag_t *vsllink_jtag, int out_length, int in_length);
-static int vsllink_usb_write(vsllink_jtag_t *vsllink_jtag, int out_length);
-static int vsllink_usb_read(vsllink_jtag_t *vsllink_jtag);
+static struct vsllink *vsllink_usb_open(void);
+static void vsllink_usb_close(struct vsllink *vsllink);
+static int vsllink_usb_message(struct vsllink *vsllink, int out_length, int in_length);
+static int vsllink_usb_write(struct vsllink *vsllink, int out_length);
+static int vsllink_usb_read(struct vsllink *vsllink);
 
 #if defined _DEBUG_USB_COMMS_ || defined _DEBUG_JTAG_IO_
 static void vsllink_debug_buffer(uint8_t *buffer, int length);
@@ -236,7 +233,7 @@ static uint8_t *tdi_buffer = NULL;
 static uint8_t *tdo_buffer = NULL;
 static int last_tms;
 
-static vsllink_jtag_t* vsllink_jtag_handle = NULL;
+static struct vsllink* vsllink_handle = NULL;
 
 static void reset_command_pointer(void)
 {
@@ -253,7 +250,7 @@ static void reset_command_pointer(void)
 
 static int vsllink_execute_queue(void)
 {
-	jtag_command_t *cmd = jtag_command_queue;
+	struct jtag_command *cmd = jtag_command_queue;
 	int scan_size;
 	enum scan_type type;
 	uint8_t *buffer;
@@ -370,7 +367,7 @@ static int vsllink_speed(int speed)
 	vsllink_usb_out_buffer[1] = (speed >> 0) & 0xff;
 	vsllink_usb_out_buffer[2] = (speed >> 8) & 0xFF;
 
-	result = vsllink_usb_write(vsllink_jtag_handle, 3);
+	result = vsllink_usb_write(vsllink_handle, 3);
 
 	if (result == 3)
 	{
@@ -413,9 +410,9 @@ static int vsllink_init(void)
 		exit(-1);
 	}
 
-	vsllink_jtag_handle = vsllink_usb_open();
+	vsllink_handle = vsllink_usb_open();
 
-	if (vsllink_jtag_handle == 0)
+	if (vsllink_handle == 0)
 	{
 		LOG_ERROR("Can't find USB JTAG Interface! Please check connection and permissions.");
 		return ERROR_JTAG_INIT_FAILED;
@@ -428,7 +425,7 @@ static int vsllink_init(void)
 	while (check_cnt < 5)
 	{
 		vsllink_simple_command(0x00);
-		result = vsllink_usb_read(vsllink_jtag_handle);
+		result = vsllink_usb_read(vsllink_handle);
 
 		if (result > 2)
 		{
@@ -517,7 +514,7 @@ static int vsllink_init(void)
 	vsllink_usb_out_buffer[0] = VSLLINK_CMD_SET_PORTDIR;
 	vsllink_usb_out_buffer[1] = JTAG_PINMSK_SRST | JTAG_PINMSK_TRST | JTAG_PINMSK_USR1 | JTAG_PINMSK_USR2;
 	vsllink_usb_out_buffer[2] = JTAG_PINMSK_SRST | JTAG_PINMSK_TRST;
-	if (vsllink_usb_write(vsllink_jtag_handle, 3) != 3)
+	if (vsllink_usb_write(vsllink_handle, 3) != 3)
 	{
 		LOG_ERROR("VSLLink USB send data error");
 		exit(-1);
@@ -540,7 +537,7 @@ static int vsllink_quit(void)
 		vsllink_usb_out_buffer[0] = VSLLINK_CMD_SET_PORTDIR;
 		vsllink_usb_out_buffer[1] = JTAG_PINMSK_SRST | JTAG_PINMSK_TRST | JTAG_PINMSK_USR1 | JTAG_PINMSK_USR2;
 		vsllink_usb_out_buffer[2] = 0;
-		if (vsllink_usb_write(vsllink_jtag_handle, 3) != 3)
+		if (vsllink_usb_write(vsllink_handle, 3) != 3)
 		{
 			LOG_ERROR("VSLLink USB send data error");
 			exit(-1);
@@ -548,8 +545,8 @@ static int vsllink_quit(void)
 
 		// disconnect
 		vsllink_disconnect();
-		vsllink_usb_close(vsllink_jtag_handle);
-		vsllink_jtag_handle = NULL;
+		vsllink_usb_close(vsllink_handle);
+		vsllink_handle = NULL;
 	}
 
 	if (vsllink_usb_in_buffer != NULL)
@@ -580,8 +577,8 @@ static int vsllink_connect(void)
 
 	vsllink_usb_out_buffer[0] = VSLLINK_CMD_CONN;
 	vsllink_usb_out_buffer[1] = vsllink_mode;
-	vsllink_usb_message(vsllink_jtag_handle, 2, 0);
-	if (vsllink_usb_read(vsllink_jtag_handle) > 2)
+	vsllink_usb_message(vsllink_handle, 2, 0);
+	if (vsllink_usb_read(vsllink_handle) > 2)
 	{
 		strncpy(vsllink_str, (char *)vsllink_usb_in_buffer + 2, sizeof(vsllink_str));
 		LOG_INFO("%s", vsllink_str);
@@ -596,7 +593,7 @@ static void vsllink_append_tms(void)
 {
 	uint8_t tms_scan = VSLLINK_TAP_MOVE(tap_get_state(), tap_get_end_state());
 	uint16_t tms2;
-	insert_insignificant_operation_t *insert = \
+	struct insert_insignificant_operation *insert = \
 		&VSLLINK_TAP_MOVE_INSERT_INSIGNIFICANT[tap_move_ndx(tap_get_state())][tap_move_ndx(tap_get_end_state())];
 
 	if (((tap_get_state() != TAP_RESET) && (tap_get_state() != TAP_IDLE) && (tap_get_state() != TAP_DRPAUSE) && (tap_get_state() != TAP_IRPAUSE)) || \
@@ -657,7 +654,7 @@ static void vsllink_state_move_normal(void)
 static void vsllink_state_move_dma(void)
 {
 	int i, insert_length = (tap_length % 8) ? (8 - (tap_length % 8)) : 0;
-	insert_insignificant_operation_t *insert = \
+	struct insert_insignificant_operation *insert = \
 		&VSLLINK_TAP_MOVE_INSERT_INSIGNIFICANT[tap_move_ndx(tap_get_state())][tap_move_ndx(tap_get_end_state())];
 	uint8_t tms_scan = VSLLINK_TAP_MOVE(tap_get_state(), tap_get_end_state());
 
@@ -1140,7 +1137,7 @@ static void vsllink_runtest(int num_cycles)
 	}
 }
 
-static void vsllink_scan_normal(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command)
+static void vsllink_scan_normal(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command)
 {
 	tap_state_t saved_end_state;
 	uint8_t bits_left, tms_tmp, tdi_len;
@@ -1256,7 +1253,7 @@ static void vsllink_scan_normal(bool ir_scan, enum scan_type type, uint8_t *buff
 
 	tap_set_state(tap_get_end_state());
 }
-static void vsllink_scan_dma(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command)
+static void vsllink_scan_dma(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command)
 {
 	tap_state_t saved_end_state;
 
@@ -1303,7 +1300,7 @@ static void vsllink_reset(int trst, int srst)
 		vsllink_usb_out_buffer[2] |= JTAG_PINMSK_TRST;
 	}
 
-	result = vsllink_usb_write(vsllink_jtag_handle, 3);
+	result = vsllink_usb_write(vsllink_handle, 3);
 	if (result != 3)
 	{
 		LOG_ERROR("VSLLink command VSLLINK_CMD_SET_PORT failed (%d)", result);
@@ -1317,7 +1314,7 @@ static void vsllink_simple_command(uint8_t command)
 	DEBUG_JTAG_IO("0x%02x", command);
 
 	vsllink_usb_out_buffer[0] = command;
-	result = vsllink_usb_write(vsllink_jtag_handle, 1);
+	result = vsllink_usb_write(vsllink_handle, 1);
 
 	if (result != 1)
 	{
@@ -1486,9 +1483,9 @@ static void vsllink_tap_append_step(int tms, int tdi)
 	}
 }
 
-static void vsllink_tap_append_scan_normal(int length, uint8_t *buffer, scan_command_t *command, int offset)
+static void vsllink_tap_append_scan_normal(int length, uint8_t *buffer, struct scan_command *command, int offset)
 {
-	pending_scan_result_t *pending_scan_result = &pending_scan_results_buffer[pending_scan_results_length];
+	struct pending_scan_result *pending_scan_result = &pending_scan_results_buffer[pending_scan_results_length];
 	int i;
 
 	if (offset > 0)
@@ -1511,9 +1508,9 @@ static void vsllink_tap_append_scan_normal(int length, uint8_t *buffer, scan_com
 
 	pending_scan_results_length++;
 }
-static void vsllink_tap_append_scan_dma(int length, uint8_t *buffer, scan_command_t *command)
+static void vsllink_tap_append_scan_dma(int length, uint8_t *buffer, struct scan_command *command)
 {
-	pending_scan_result_t *pending_scan_result;
+	struct pending_scan_result *pending_scan_result;
 	int len_tmp, len_all, i;
 
 	len_all = 0;
@@ -1585,17 +1582,17 @@ static int vsllink_tap_execute_normal(void)
 			vsllink_usb_out_buffer[2] = (vsllink_usb_out_buffer_idx >> 8) & 0xff;
 		}
 
-		result = vsllink_usb_message(vsllink_jtag_handle, vsllink_usb_out_buffer_idx, vsllink_usb_in_want_length);
+		result = vsllink_usb_message(vsllink_handle, vsllink_usb_out_buffer_idx, vsllink_usb_in_want_length);
 
 		if (result == vsllink_usb_in_want_length)
 		{
 			for (i = 0; i < pending_scan_results_length; i++)
 			{
-				pending_scan_result_t *pending_scan_result = &pending_scan_results_buffer[i];
+				struct pending_scan_result *pending_scan_result = &pending_scan_results_buffer[i];
 				uint8_t *buffer = pending_scan_result->buffer;
 				int length = pending_scan_result->length;
 				int offset = pending_scan_result->offset;
-				scan_command_t *command = pending_scan_result->command;
+				struct scan_command *command = pending_scan_result->command;
 
 				if (buffer != NULL)
 				{
@@ -1659,17 +1656,17 @@ static int vsllink_tap_execute_dma(void)
 		memcpy(&vsllink_usb_out_buffer[3], tdi_buffer, byte_length);
 		memcpy(&vsllink_usb_out_buffer[3 + byte_length], tms_buffer, byte_length);
 
-		result = vsllink_usb_message(vsllink_jtag_handle, 3 + 2 * byte_length, byte_length);
+		result = vsllink_usb_message(vsllink_handle, 3 + 2 * byte_length, byte_length);
 		if (result == byte_length)
 		{
 			for (i = 0; i < pending_scan_results_length; i++)
 			{
-				pending_scan_result_t *pending_scan_result = &pending_scan_results_buffer[i];
+				struct pending_scan_result *pending_scan_result = &pending_scan_results_buffer[i];
 				uint8_t *buffer = pending_scan_result->buffer;
 				int length = pending_scan_result->length;
 				int first = pending_scan_result->offset;
 
-				scan_command_t *command = pending_scan_result->command;
+				struct scan_command *command = pending_scan_result->command;
 				buf_set_buf(vsllink_usb_in_buffer, first, buffer, 0, length);
 
 				DEBUG_JTAG_IO("JTAG scan read(%d bits, from %d bits):", length, first);
@@ -1704,16 +1701,16 @@ static int vsllink_tap_execute_dma(void)
 /*****************************************************************************/
 /* VSLLink USB low-level functions */
 
-static vsllink_jtag_t* vsllink_usb_open(void)
+static struct vsllink* vsllink_usb_open(void)
 {
 	struct usb_bus *busses;
 	struct usb_bus *bus;
 	struct usb_device *dev;
 	int ret;
 
-	vsllink_jtag_t *result;
+	struct vsllink *result;
 
-	result = (vsllink_jtag_t*) malloc(sizeof(vsllink_jtag_t));
+	result = (struct vsllink*) malloc(sizeof(struct vsllink));
 
 	usb_init();
 	usb_find_busses();
@@ -1721,7 +1718,7 @@ static vsllink_jtag_t* vsllink_usb_open(void)
 
 	busses = usb_get_busses();
 
-	/* find vsllink_jtag device in usb bus */
+	/* find vsllink device in usb bus */
 
 	for (bus = busses; bus; bus = bus->next)
 	{
@@ -1766,38 +1763,38 @@ static vsllink_jtag_t* vsllink_usb_open(void)
 	return NULL;
 }
 
-static void vsllink_usb_close(vsllink_jtag_t *vsllink_jtag)
+static void vsllink_usb_close(struct vsllink *vsllink)
 {
 	int ret;
 
-	ret = usb_release_interface(vsllink_jtag->usb_handle, vsllink_usb_interface);
+	ret = usb_release_interface(vsllink->usb_handle, vsllink_usb_interface);
 	if (ret != 0)
 	{
 		LOG_ERROR("fail to release interface %d, %d returned", vsllink_usb_interface, ret);
 		exit(-1);
 	}
 
-	ret = usb_close(vsllink_jtag->usb_handle);
+	ret = usb_close(vsllink->usb_handle);
 	if (ret != 0)
 	{
 		LOG_ERROR("fail to close usb, %d returned", ret);
 		exit(-1);
 	}
 
-	free(vsllink_jtag);
+	free(vsllink);
 }
 
 /* Send a message and receive the reply. */
-static int vsllink_usb_message(vsllink_jtag_t *vsllink_jtag, int out_length, int in_length)
+static int vsllink_usb_message(struct vsllink *vsllink, int out_length, int in_length)
 {
 	int result;
 
-	result = vsllink_usb_write(vsllink_jtag, out_length);
+	result = vsllink_usb_write(vsllink, out_length);
 	if (result == out_length)
 	{
 		if (in_length > 0)
 		{
-			result = vsllink_usb_read(vsllink_jtag);
+			result = vsllink_usb_read(vsllink);
 			if (result == in_length)
 			{
 				return result;
@@ -1818,17 +1815,17 @@ static int vsllink_usb_message(vsllink_jtag_t *vsllink_jtag, int out_length, int
 }
 
 /* Write data from out_buffer to USB. */
-static int vsllink_usb_write(vsllink_jtag_t *vsllink_jtag, int out_length)
+static int vsllink_usb_write(struct vsllink *vsllink, int out_length)
 {
 	int result;
 
 	if (out_length > VSLLINK_BufferSize)
 	{
-		LOG_ERROR("vsllink_jtag_write illegal out_length=%d (max=%d)", out_length, VSLLINK_BufferSize);
+		LOG_ERROR("vsllink_write illegal out_length=%d (max=%d)", out_length, VSLLINK_BufferSize);
 		return -1;
 	}
 
-	result = usb_bulk_write(vsllink_jtag->usb_handle, vsllink_usb_bulkout, \
+	result = usb_bulk_write(vsllink->usb_handle, vsllink_usb_bulkout, \
 		(char *)vsllink_usb_out_buffer, out_length, VSLLINK_USB_TIMEOUT);
 
 	DEBUG_JTAG_IO("vsllink_usb_write, out_length = %d, result = %d", out_length, result);
@@ -1846,9 +1843,9 @@ static int vsllink_usb_write(vsllink_jtag_t *vsllink_jtag, int out_length)
 }
 
 /* Read data from USB into in_buffer. */
-static int vsllink_usb_read(vsllink_jtag_t *vsllink_jtag)
+static int vsllink_usb_read(struct vsllink *vsllink)
 {
-	int result = usb_bulk_read(vsllink_jtag->usb_handle, vsllink_usb_bulkin, \
+	int result = usb_bulk_read(vsllink->usb_handle, vsllink_usb_bulkin, \
 		(char *)vsllink_usb_in_buffer, VSLLINK_BufferSize, VSLLINK_USB_TIMEOUT);
 
 	DEBUG_JTAG_IO("vsllink_usb_read, result = %d", result);
@@ -1883,7 +1880,7 @@ static void vsllink_debug_buffer(uint8_t *buffer, int length)
 }
 #endif // _DEBUG_USB_COMMS_ || _DEBUG_JTAG_IO_
 
-static int vsllink_register_commands(struct command_context_s *cmd_ctx)
+static int vsllink_register_commands(struct command_context *cmd_ctx)
 {
 	register_command(cmd_ctx, NULL, "vsllink_usb_vid",
 			vsllink_handle_usb_vid_command, COMMAND_CONFIG,