X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Farm-jtag-ew.c;h=18b353acf34a0a35a4f6efa20d2d9346bd6e8536;hb=7c393679c0cd8f7609a0d6b2329a1877de0f3d31;hp=b951f61bfcaabe681eeb91a3814416919aaad2bd;hpb=c18947b947064e7eceed8047c42d4c8dfd8ae964;p=openocd.git

diff --git a/src/jtag/arm-jtag-ew.c b/src/jtag/arm-jtag-ew.c
index b951f61bfc..18b353acf3 100644
--- a/src/jtag/arm-jtag-ew.c
+++ b/src/jtag/arm-jtag-ew.c
@@ -1,5 +1,3 @@
-// vim:ts=4 sw=4:
-
 /***************************************************************************
  *   Copyright (C) 2009 by Dimitar Dimitrov <dinuxbg@gmail.com>            *
  *   based on Dominic Rath's and Benedikt Sauter's usbprog.c               *
@@ -61,19 +59,16 @@ static uint8_t usb_out_buffer[ARMJTAGEW_OUT_BUFFER_SIZE];
 static int armjtagew_execute_queue(void);
 static int armjtagew_speed(int speed);
 static int armjtagew_khz(int khz, int *jtag_speed);
-static int armjtagew_register_commands(struct command_context_s *cmd_ctx);
+static int armjtagew_register_commands(struct command_context *cmd_ctx);
 static int armjtagew_init(void);
 static int armjtagew_quit(void);
 
-/* CLI command handler functions */
-static int armjtagew_handle_armjtagew_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-
 /* Queue command functions */
 static void armjtagew_end_state(tap_state_t state);
 static void armjtagew_state_move(void);
 static void armjtagew_path_move(int num_states, tap_state_t *path);
 static void armjtagew_runtest(int num_cycles);
-static void armjtagew_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command);
+static void armjtagew_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command);
 static void armjtagew_reset(int trst, int srst);
 //static void armjtagew_simple_command(uint8_t command);
 static int armjtagew_get_status(void);
@@ -83,19 +78,18 @@ static void armjtagew_tap_init(void);
 static int armjtagew_tap_execute(void);
 static void armjtagew_tap_ensure_space(int scans, int bits);
 static void armjtagew_tap_append_step(int tms, int tdi);
-static void armjtagew_tap_append_scan(int length, uint8_t *buffer, scan_command_t *command);
+static void armjtagew_tap_append_scan(int length, uint8_t *buffer, struct scan_command *command);
 
 /* ARM-JTAG-EW lowlevel functions */
-typedef struct armjtagew_jtag
-{
+struct armjtagew {
 	struct usb_dev_handle* usb_handle;
-} armjtagew_jtag_t;
+};
 
-static armjtagew_jtag_t *armjtagew_usb_open(void);
-static void armjtagew_usb_close(armjtagew_jtag_t *armjtagew_jtag);
-static int armjtagew_usb_message(armjtagew_jtag_t *armjtagew_jtag, int out_length, int in_length);
-static int armjtagew_usb_write(armjtagew_jtag_t *armjtagew_jtag, int out_length);
-static int armjtagew_usb_read(armjtagew_jtag_t *armjtagew_jtag, int exp_in_length);
+static struct armjtagew *armjtagew_usb_open(void);
+static void armjtagew_usb_close(struct armjtagew *armjtagew);
+static int armjtagew_usb_message(struct armjtagew *armjtagew, int out_length, int in_length);
+static int armjtagew_usb_write(struct armjtagew *armjtagew, int out_length);
+static int armjtagew_usb_read(struct armjtagew *armjtagew, int exp_in_length);
 
 /* helper functions */
 static int armjtagew_get_version_info(void);
@@ -104,14 +98,14 @@ static int armjtagew_get_version_info(void);
 static void armjtagew_debug_buffer(uint8_t *buffer, int length);
 #endif
 
-static armjtagew_jtag_t* armjtagew_jtag_handle;
+static struct armjtagew* armjtagew_handle;
 
 
 
 /***************************************************************************/
 /* External interface implementation */
 
-jtag_interface_t armjtagew_interface =
+struct jtag_interface armjtagew_interface =
 {
 	.name = "arm-jtag-ew",
 	.execute_queue = armjtagew_execute_queue,
@@ -125,7 +119,7 @@ jtag_interface_t armjtagew_interface =
 
 static int armjtagew_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;
@@ -135,7 +129,7 @@ static int armjtagew_execute_queue(void)
 		switch (cmd->type)
 		{
 			case JTAG_RUNTEST:
-				DEBUG_JTAG_IO( "runtest %i cycles, end in %i", cmd->cmd.runtest->num_cycles, \
+				DEBUG_JTAG_IO("runtest %i cycles, end in %i", cmd->cmd.runtest->num_cycles, \
 					cmd->cmd.runtest->end_state);
 
 				armjtagew_end_state(cmd->cmd.runtest->end_state);
@@ -209,9 +203,9 @@ static int armjtagew_speed(int speed)
 
 
     usb_out_buffer[0] = CMD_SET_TCK_FREQUENCY;
-	buf_set_u32(usb_out_buffer+1, 0, 32, speed);
+	buf_set_u32(usb_out_buffer + 1, 0, 32, speed);
 
-    result = armjtagew_usb_message(armjtagew_jtag_handle, 4, 4);
+    result = armjtagew_usb_message(armjtagew_handle, 4, 4);
 
     if (result < 0)
     {
@@ -220,9 +214,9 @@ static int armjtagew_speed(int speed)
     }
 
 	usb_out_buffer[0] = CMD_GET_TCK_FREQUENCY;
-    result = armjtagew_usb_message(armjtagew_jtag_handle, 1, 4);
+    result = armjtagew_usb_message(armjtagew_handle, 1, 4);
 	speed_real = (int)buf_get_u32(usb_in_buffer,0,32);
-	if(result < 0)
+	if (result < 0)
 	{
         LOG_ERROR("ARM-JTAG-EW getting speed failed (%d)", result);
         return ERROR_JTAG_DEVICE_ERROR;
@@ -243,20 +237,13 @@ static int armjtagew_khz(int khz, int *jtag_speed)
 	return ERROR_OK;
 }
 
-static int armjtagew_register_commands(struct command_context_s *cmd_ctx)
-{
-	register_command(cmd_ctx, NULL, "armjtagew_info", armjtagew_handle_armjtagew_info_command, COMMAND_EXEC,
-		"query armjtagew info");
-	return ERROR_OK;
-}
-
 static int armjtagew_init(void)
 {
 	int check_cnt;
 
-	armjtagew_jtag_handle = armjtagew_usb_open();
+	armjtagew_handle = armjtagew_usb_open();
 
-	if (armjtagew_jtag_handle == 0)
+	if (armjtagew_handle == 0)
 	{
 		LOG_ERROR("Cannot find ARM-JTAG-EW Interface! Please check connection and permissions.");
 		return ERROR_JTAG_INIT_FAILED;
@@ -290,7 +277,7 @@ static int armjtagew_init(void)
 
 static int armjtagew_quit(void)
 {
-	armjtagew_usb_close(armjtagew_jtag_handle);
+	armjtagew_usb_close(armjtagew_handle);
 	return ERROR_OK;
 }
 
@@ -385,7 +372,7 @@ static void armjtagew_runtest(int num_cycles)
 	}
 }
 
-static void armjtagew_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command)
+static void armjtagew_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command)
 {
 	tap_state_t saved_end_state;
 
@@ -415,8 +402,8 @@ static void armjtagew_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, i
 
 static void armjtagew_reset(int trst, int srst)
 {
-	const uint8_t trst_mask = (1u<<5);
-	const uint8_t srst_mask = (1u<<6);
+	const uint8_t trst_mask = (1u << 5);
+	const uint8_t srst_mask = (1u << 6);
 	uint8_t val = 0;
 	uint8_t outp_en = 0;
 	uint8_t change_mask = 0;
@@ -454,7 +441,7 @@ static void armjtagew_reset(int trst, int srst)
 	usb_out_buffer[1] = val;
 	usb_out_buffer[2] = outp_en;
 	usb_out_buffer[3] = change_mask;
-	result = armjtagew_usb_write(armjtagew_jtag_handle, 4);
+	result = armjtagew_usb_write(armjtagew_handle, 4);
 	if (result != 4)
 	{
 		LOG_ERROR("ARM-JTAG-EW TRST/SRST pin set failed failed (%d)", result);
@@ -467,19 +454,19 @@ static int armjtagew_get_status(void)
 	int result;
 
 	usb_out_buffer[0] = CMD_GET_TAPHW_STATE;
-	result = armjtagew_usb_message(armjtagew_jtag_handle, 1, 12);
+	result = armjtagew_usb_message(armjtagew_handle, 1, 12);
 
 	if (result == 0)
 	{
 		unsigned int u_tg = buf_get_u32(usb_in_buffer, 0, 16);
-		LOG_INFO("U_tg = %d mV, U_aux = %d mV, U_tgpwr = %d mV, I_tgpwr = %d mA, D1 = %d, Target power %s %s\n", \
-			buf_get_u32(usb_in_buffer + 0, 0, 16), \
-			buf_get_u32(usb_in_buffer + 2, 0, 16), \
-			buf_get_u32(usb_in_buffer + 4, 0, 16), \
-			buf_get_u32(usb_in_buffer + 6, 0, 16), \
-			usb_in_buffer[9], \
-			usb_in_buffer[11] ? "OVERCURRENT" : "OK", \
-			usb_in_buffer[10] ? "enabled" : "disabled");
+		LOG_INFO("U_tg = %d mV, U_aux = %d mV, U_tgpwr = %d mV, I_tgpwr = %d mA, D1 = %d, Target power %s %s\n",
+			 (int)(buf_get_u32(usb_in_buffer + 0, 0, 16)),
+			 (int)(buf_get_u32(usb_in_buffer + 2, 0, 16)),
+			 (int)(buf_get_u32(usb_in_buffer + 4, 0, 16)),
+			 (int)(buf_get_u32(usb_in_buffer + 6, 0, 16)),
+			 usb_in_buffer[9],
+			 usb_in_buffer[11] ? "OVERCURRENT" : "OK",
+			 usb_in_buffer[10] ? "enabled" : "disabled");
 
 		if (u_tg < 1500)
 		{
@@ -502,7 +489,7 @@ static int armjtagew_get_version_info(void)
 
 	/* query hardware version */
 	usb_out_buffer[0] = CMD_GET_VERSION;
-	result = armjtagew_usb_message(armjtagew_jtag_handle, 1, 4+15+256);
+	result = armjtagew_usb_message(armjtagew_handle, 1, 4 + 15 + 256);
 
 	if (result != 0)
 	{
@@ -511,9 +498,9 @@ static int armjtagew_get_version_info(void)
 	}
 
 
-	memcpy(sn, usb_in_buffer+4, 15);
+	memcpy(sn, usb_in_buffer + 4, 15);
 	sn[15] = '\0';
-	memcpy(auxinfo, usb_in_buffer+4+15, 256);
+	memcpy(auxinfo, usb_in_buffer + 4+15, 256);
 	auxinfo[256] = '\0';
 
 	LOG_INFO("ARM-JTAG-EW firmware version %d.%d, hardware revision %c, SN=%s, Additional info: %s", \
@@ -523,7 +510,7 @@ static int armjtagew_get_version_info(void)
 	return ERROR_OK;
 }
 
-static int armjtagew_handle_armjtagew_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(armjtagew_handle_armjtagew_info_command)
 {
 	if (armjtagew_get_version_info() == ERROR_OK)
 	{
@@ -534,6 +521,14 @@ static int armjtagew_handle_armjtagew_info_command(struct command_context_s *cmd
 	return ERROR_OK;
 }
 
+static int armjtagew_register_commands(struct command_context *cmd_ctx)
+{
+	register_command(cmd_ctx, NULL, "armjtagew_info", 
+			&armjtagew_handle_armjtagew_info_command, COMMAND_EXEC,
+			"query armjtagew info");
+	return ERROR_OK;
+}
+
 /***************************************************************************/
 /* ARM-JTAG-EW tap functions */
 
@@ -545,18 +540,17 @@ static uint8_t tms_buffer[ARMJTAGEW_TAP_BUFFER_SIZE];
 static uint8_t tdi_buffer[ARMJTAGEW_TAP_BUFFER_SIZE];
 static uint8_t tdo_buffer[ARMJTAGEW_TAP_BUFFER_SIZE];
 
-typedef struct
-{
+struct pending_scan_result {
 	int first;	/* First bit position in tdo_buffer to read */
 	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];
 
 static int last_tms;
 
@@ -613,9 +607,9 @@ static void armjtagew_tap_append_step(int tms, int tdi)
 	}
 }
 
-void armjtagew_tap_append_scan(int length, uint8_t *buffer, scan_command_t *command)
+void armjtagew_tap_append_scan(int length, uint8_t *buffer, struct scan_command *command)
 {
-	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;
 
 	pending_scan_result->first = tap_length;
@@ -653,7 +647,7 @@ static int armjtagew_tap_execute(void)
 		byte_length = tap_length / 8;
 
 		usb_out_buffer[0] = CMD_TAP_SHIFT;
-		buf_set_u32(usb_out_buffer+1, 0, 16, byte_length);
+		buf_set_u32(usb_out_buffer + 1, 0, 16, byte_length);
 
 		tms_offset = 3;
 		for (i = 0; i < byte_length; i++)
@@ -667,14 +661,14 @@ static int armjtagew_tap_execute(void)
 			usb_out_buffer[tdi_offset + i] = flip_u32(tdi_buffer[i],8);
 		}
 
-		result = armjtagew_usb_message(armjtagew_jtag_handle, 3 + 2 * byte_length, byte_length + 4);
+		result = armjtagew_usb_message(armjtagew_handle, 3 + 2 * byte_length, byte_length + 4);
 
 		if (result == 0)
 		{
 			int stat;
 
 			stat = (int)buf_get_u32(usb_in_buffer + byte_length, 0, 32);
-			if(stat) {
+			if (stat) {
 				LOG_ERROR("armjtagew_tap_execute, emulator returned error code %d for a CMD_TAP_SHIFT command", stat);
 				return ERROR_JTAG_QUEUE_FAILED;
 			}
@@ -686,11 +680,11 @@ static int armjtagew_tap_execute(void)
 
 			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->first;
-				scan_command_t *command = pending_scan_result->command;
+				struct scan_command *command = pending_scan_result->command;
 
 				/* Copy to buffer */
 				buf_set_buf(tdo_buffer, first, buffer, 0, length);
@@ -728,15 +722,15 @@ static int armjtagew_tap_execute(void)
 /*****************************************************************************/
 /* JLink USB low-level functions */
 
-static armjtagew_jtag_t* armjtagew_usb_open()
+static struct armjtagew* armjtagew_usb_open()
 {
 	struct usb_bus *busses;
 	struct usb_bus *bus;
 	struct usb_device *dev;
 
-	armjtagew_jtag_t *result;
+	struct armjtagew *result;
 
-	result = (armjtagew_jtag_t*) malloc(sizeof(armjtagew_jtag_t));
+	result = (struct armjtagew*) malloc(sizeof(struct armjtagew));
 
 	usb_init();
 	usb_find_busses();
@@ -744,7 +738,7 @@ static armjtagew_jtag_t* armjtagew_usb_open()
 
 	busses = usb_get_busses();
 
-	/* find armjtagew_jtag device in usb bus */
+	/* find armjtagew device in usb bus */
 
 	for (bus = busses; bus; bus = bus->next)
 	{
@@ -776,21 +770,21 @@ static armjtagew_jtag_t* armjtagew_usb_open()
 	return NULL;
 }
 
-static void armjtagew_usb_close(armjtagew_jtag_t *armjtagew_jtag)
+static void armjtagew_usb_close(struct armjtagew *armjtagew)
 {
-	usb_close(armjtagew_jtag->usb_handle);
-	free(armjtagew_jtag);
+	usb_close(armjtagew->usb_handle);
+	free(armjtagew);
 }
 
 /* Send a message and receive the reply. */
-static int armjtagew_usb_message(armjtagew_jtag_t *armjtagew_jtag, int out_length, int in_length)
+static int armjtagew_usb_message(struct armjtagew *armjtagew, int out_length, int in_length)
 {
 	int result;
 
-	result = armjtagew_usb_write(armjtagew_jtag, out_length);
+	result = armjtagew_usb_write(armjtagew, out_length);
 	if (result == out_length)
 	{
-		result = armjtagew_usb_read(armjtagew_jtag, in_length);
+		result = armjtagew_usb_read(armjtagew, in_length);
 		if (result != in_length)
 		{
 			LOG_ERROR("usb_bulk_read failed (requested=%d, result=%d)", in_length, result);
@@ -806,17 +800,17 @@ static int armjtagew_usb_message(armjtagew_jtag_t *armjtagew_jtag, int out_lengt
 }
 
 /* Write data from out_buffer to USB. */
-static int armjtagew_usb_write(armjtagew_jtag_t *armjtagew_jtag, int out_length)
+static int armjtagew_usb_write(struct armjtagew *armjtagew, int out_length)
 {
 	int result;
 
 	if (out_length > ARMJTAGEW_OUT_BUFFER_SIZE)
 	{
-		LOG_ERROR("armjtagew_jtag_write illegal out_length=%d (max=%d)", out_length, ARMJTAGEW_OUT_BUFFER_SIZE);
+		LOG_ERROR("armjtagew_write illegal out_length=%d (max=%d)", out_length, ARMJTAGEW_OUT_BUFFER_SIZE);
 		return -1;
 	}
 
-	result = usb_bulk_write(armjtagew_jtag->usb_handle, ARMJTAGEW_EPT_BULK_OUT, \
+	result = usb_bulk_write(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_OUT, \
 		(char*)usb_out_buffer, out_length, ARMJTAGEW_USB_TIMEOUT);
 
 	DEBUG_JTAG_IO("armjtagew_usb_write, out_length = %d, result = %d", out_length, result);
@@ -828,9 +822,9 @@ static int armjtagew_usb_write(armjtagew_jtag_t *armjtagew_jtag, int out_length)
 }
 
 /* Read data from USB into in_buffer. */
-static int armjtagew_usb_read(armjtagew_jtag_t *armjtagew_jtag, int exp_in_length)
+static int armjtagew_usb_read(struct armjtagew *armjtagew, int exp_in_length)
 {
-	int result = usb_bulk_read(armjtagew_jtag->usb_handle, ARMJTAGEW_EPT_BULK_IN, \
+	int result = usb_bulk_read(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_IN, \
 		(char*)usb_in_buffer, exp_in_length, ARMJTAGEW_USB_TIMEOUT);
 
 	DEBUG_JTAG_IO("armjtagew_usb_read, result = %d", result);