build: cleanup src/jtag/drivers directory

Change-Id: I99c08ec0132d5a15250050e718310f1ddd9fe546
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/425
Tested-by: jenkins

1 files changed, 128 insertions, 207 deletions

diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index 43062fa3..35c1a5c4 100644
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -33,11 +33,10 @@
 #include "libusb_common.h"
 
 /* See Segger's public documentation:
- *	Reference manual for J-Link USB Protocol
- *	Document RM08001-R6 Date: June 16, 2009
- *      (Or newer, with some SWD information).
- 
-http://www.segger.com/cms/admin/uploads/productDocs/RM08001_JLinkUSBProtocol.pdf
+ * Reference manual for J-Link USB Protocol
+ * Document RM08001-R6 Date: June 16, 2009
+ * (Or newer, with some SWD information).
+ * http://www.segger.com/cms/admin/uploads/productDocs/RM08001_JLinkUSBProtocol.pdf
  */
 
 /*
@@ -46,6 +45,7 @@ http://www.segger.com/cms/admin/uploads/productDocs/RM08001_JLinkUSBProtocol.pdf
  *
  * pid = ( usb_address > 0x4) ? 0x0101 : (0x101 + usb_address)
  */
+
 #define VID 0x1366, 0x1366, 0x1366, 0x1366
 #define PID 0x0101, 0x0102, 0x0103, 0x0104
 
@@ -56,16 +56,16 @@ static unsigned int jlink_write_ep = JLINK_WRITE_ENDPOINT;
 static unsigned int jlink_read_ep = JLINK_READ_ENDPOINT;
 static unsigned int jlink_hw_jtag_version = 2;
 
-#define JLINK_USB_TIMEOUT		1000
+#define JLINK_USB_TIMEOUT 1000
 
-// See Section 3.3.2 of the Segger JLink USB protocol manual
+/* See Section 3.3.2 of the Segger JLink USB protocol manual */
 /* 2048 is the max value we can use here */
 #define JLINK_TAP_BUFFER_SIZE 2048
-//#define JLINK_TAP_BUFFER_SIZE 256
-//#define JLINK_TAP_BUFFER_SIZE 384
+/*#define JLINK_TAP_BUFFER_SIZE 256*/
+/*#define JLINK_TAP_BUFFER_SIZE 384*/
 
 #define JLINK_IN_BUFFER_SIZE			2048
-#define JLINK_OUT_BUFFER_SIZE			2*2048 + 4
+#define JLINK_OUT_BUFFER_SIZE			(2*2048 + 4)
 #define JLINK_EMU_RESULT_BUFFER_SIZE	64
 
 /* Global USB buffers */
@@ -222,7 +222,7 @@ static inline void jlink_debug_buffer(uint8_t *buffer, int length)
 
 static enum tap_state jlink_last_state = TAP_RESET;
 
-static struct jlink* jlink_handle;
+static struct jlink *jlink_handle;
 
 /* pid could be specified at runtime */
 static uint16_t vids[] = { VID, 0 };
@@ -320,17 +320,28 @@ static void jlink_execute_sleep(struct jtag_command *cmd)
 
 static void jlink_execute_command(struct jtag_command *cmd)
 {
-	switch (cmd->type)
-	{
-	case JTAG_RUNTEST:   jlink_execute_runtest(cmd); break;
-	case JTAG_TLR_RESET: jlink_execute_statemove(cmd); break;
-	case JTAG_PATHMOVE:  jlink_execute_pathmove(cmd); break;
-	case JTAG_SCAN:      jlink_execute_scan(cmd); break;
-	case JTAG_RESET:     jlink_execute_reset(cmd); break;
-	case JTAG_SLEEP:     jlink_execute_sleep(cmd); break;
-	default:
-		LOG_ERROR("BUG: unknown JTAG command type encountered");
-		exit(-1);
+	switch (cmd->type) {
+		case JTAG_RUNTEST:
+			jlink_execute_runtest(cmd);
+			break;
+		case JTAG_TLR_RESET:
+			jlink_execute_statemove(cmd);
+			break;
+		case JTAG_PATHMOVE:
+			jlink_execute_pathmove(cmd);
+			break;
+		case JTAG_SCAN:
+			jlink_execute_scan(cmd);
+			break;
+		case JTAG_RESET:
+			jlink_execute_reset(cmd);
+			break;
+		case JTAG_SLEEP:
+			jlink_execute_sleep(cmd);
+			break;
+		default:
+			LOG_ERROR("BUG: unknown JTAG command type encountered");
+			exit(-1);
 	}
 }
 
@@ -338,8 +349,7 @@ static int jlink_execute_queue(void)
 {
 	struct jtag_command *cmd = jtag_command_queue;
 
-	while (cmd != NULL)
-	{
+	while (cmd != NULL) {
 		jlink_execute_command(cmd);
 		cmd = cmd->next;
 	}
@@ -352,8 +362,7 @@ static int jlink_speed(int speed)
 {
 	int result;
 
-	if (speed > JLINK_MAX_SPEED)
-	{
+	if (speed > JLINK_MAX_SPEED) {
 		LOG_INFO("reduce speed request: %dkHz to %dkHz maximum",
 				speed, JLINK_MAX_SPEED);
 		speed = JLINK_MAX_SPEED;
@@ -368,8 +377,7 @@ static int jlink_speed(int speed)
 	usb_out_buffer[2] = (speed >> 8) & 0xff;
 
 	result = jlink_usb_write(jlink_handle, 3);
-	if (result != 3)
-	{
+	if (result != 3) {
 		LOG_ERROR("J-Link setting speed failed (%d)", result);
 		return ERROR_JTAG_DEVICE_ERROR;
 	}
@@ -377,7 +385,7 @@ static int jlink_speed(int speed)
 	return ERROR_OK;
 }
 
-static int jlink_speed_div(int speed, int* khz)
+static int jlink_speed_div(int speed, int *khz)
 {
 	*khz = speed;
 
@@ -397,8 +405,7 @@ static int jlink_init(void)
 
 	jlink_handle = jlink_usb_open();
 
-	if (jlink_handle == 0)
-	{
+	if (jlink_handle == 0) {
 		LOG_ERROR("Cannot find jlink Interface! Please check "
 				"connection and permissions.");
 		return ERROR_JTAG_INIT_FAILED;
@@ -428,8 +435,7 @@ static int jlink_init(void)
 
 	jlink_hw_jtag_version = 2;
 
-	if (jlink_get_version_info() == ERROR_OK)
-	{
+	if (jlink_get_version_info() == ERROR_OK) {
 		/* attempt to get status */
 		jlink_get_status();
 	}
@@ -442,9 +448,8 @@ static int jlink_init(void)
 
 	/* v5/6 jlink seems to have an issue if the first tap move
 	 * is not divisible by 8, so we send a TLR on first power up */
-	for (i = 0; i < 8; i++) {
+	for (i = 0; i < 8; i++)
 		jlink_tap_append_step(1, 0);
-	}
 	jlink_tap_execute();
 
 	return ERROR_OK;
@@ -462,11 +467,8 @@ static int jlink_quit(void)
 static void jlink_end_state(tap_state_t state)
 {
 	if (tap_is_state_stable(state))
-	{
 		tap_set_end_state(state);
-	}
-	else
-	{
+	else {
 		LOG_ERROR("BUG: %i is not a valid end state", state);
 		exit(-1);
 	}
@@ -480,8 +482,7 @@ static void jlink_state_move(void)
 	uint8_t tms_scan = tap_get_tms_path(tap_get_state(), tap_get_end_state());
 	uint8_t tms_scan_bits = tap_get_tms_path_len(tap_get_state(), tap_get_end_state());
 
-	for (i = 0; i < tms_scan_bits; i++)
-	{
+	for (i = 0; i < tms_scan_bits; i++) {
 		tms = (tms_scan >> i) & 1;
 		jlink_tap_append_step(tms, 0);
 	}
@@ -493,18 +494,12 @@ static void jlink_path_move(int num_states, tap_state_t *path)
 {
 	int i;
 
-	for (i = 0; i < num_states; i++)
-	{
+	for (i = 0; i < num_states; i++) {
 		if (path[i] == tap_state_transition(tap_get_state(), false))
-		{
 			jlink_tap_append_step(0, 0);
-		}
 		else if (path[i] == tap_state_transition(tap_get_state(), true))
-		{
 			jlink_tap_append_step(1, 0);
-		}
-		else
-		{
+		else {
 			LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition",
 					tap_state_name(tap_get_state()), tap_state_name(path[i]));
 			exit(-1);
@@ -522,28 +517,23 @@ static void jlink_runtest(int num_cycles)
 
 	tap_state_t saved_end_state = tap_get_end_state();
 
-	jlink_tap_ensure_space(1,num_cycles + 16);
+	jlink_tap_ensure_space(1, num_cycles + 16);
 
 	/* only do a state_move when we're not already in IDLE */
-	if (tap_get_state() != TAP_IDLE)
-	{
+	if (tap_get_state() != TAP_IDLE) {
 		jlink_end_state(TAP_IDLE);
 		jlink_state_move();
-//		num_cycles--;
+		/* num_cycles--; */
 	}
 
 	/* execute num_cycles */
 	for (i = 0; i < num_cycles; i++)
-	{
 		jlink_tap_append_step(0, 0);
-	}
 
 	/* finish in end_state */
 	jlink_end_state(saved_end_state);
 	if (tap_get_state() != tap_get_end_state())
-	{
 		jlink_state_move();
-	}
 }
 
 static void jlink_scan(bool ir_scan, enum scan_type type, uint8_t *buffer,
@@ -573,9 +563,7 @@ static void jlink_scan(bool ir_scan, enum scan_type type, uint8_t *buffer,
 	tap_set_state(ir_scan ? TAP_IRPAUSE : TAP_DRPAUSE);
 
 	if (tap_get_state() != tap_get_end_state())
-	{
 		jlink_state_move();
-	}
 }
 
 static void jlink_reset(int trst, int srst)
@@ -584,23 +572,16 @@ static void jlink_reset(int trst, int srst)
 
 	/* Signals are active low */
 	if (srst == 0)
-	{
 		jlink_simple_command(EMU_CMD_HW_RESET1);
-	}
+
 	if (srst == 1)
-	{
 		jlink_simple_command(EMU_CMD_HW_RESET0);
-	}
 
 	if (trst == 1)
-	{
 		jlink_simple_command(EMU_CMD_HW_TRST0);
-	}
 
 	if (trst == 0)
-	{
 		jlink_simple_command(EMU_CMD_HW_TRST1);
-	}
 }
 
 static void jlink_simple_command(uint8_t command)
@@ -613,9 +594,7 @@ static void jlink_simple_command(uint8_t command)
 	result = jlink_usb_write(jlink_handle, 1);
 
 	if (result != 1)
-	{
 		LOG_ERROR("J-Link command 0x%02x failed (%d)", command, result);
-	}
 }
 
 static int jlink_get_status(void)
@@ -625,8 +604,7 @@ static int jlink_get_status(void)
 	jlink_simple_command(EMU_CMD_GET_STATE);
 
 	result = jlink_usb_read(jlink_handle, 8);
-	if (result != 8)
-	{
+	if (result != 8) {
 		LOG_ERROR("J-Link command EMU_CMD_GET_STATE failed (%d)", result);
 		return ERROR_JTAG_DEVICE_ERROR;
 	}
@@ -643,14 +621,13 @@ static int jlink_get_status(void)
 	return ERROR_OK;
 }
 
-#define jlink_dump_printf(context, expr ...)	\
-	do {					\
-	if (context)				\
-		command_print(context, expr);	\
-	else					\
-		LOG_INFO(expr);			\
-	} while(0);
-
+#define jlink_dump_printf(context, expr ...) \
+	do { \
+		if (context) \
+			command_print(context, expr); \
+			else \
+			LOG_INFO(expr); \
+	} while (0);
 
 static void jlink_caps_dump(struct command_context *ctx)
 {
@@ -713,8 +690,7 @@ static void jlink_config_dump(struct command_context *ctx, struct jlink_config *
 	jlink_config_usb_address_dump(ctx, cfg);
 	jlink_config_kickstart_dump(ctx, cfg);
 
-	if (jlink_hw_type == JLINK_HW_TYPE_JLINK_PRO)
-	{
+	if (jlink_hw_type == JLINK_HW_TYPE_JLINK_PRO) {
 		jlink_config_ip_dump(ctx, cfg);
 		jlink_config_mac_address_dump(ctx, cfg);
 	}
@@ -728,8 +704,7 @@ static int jlink_get_config(struct jlink_config *cfg)
 	jlink_simple_command(EMU_CMD_READ_CONFIG);
 
 	result = jlink_usb_read(jlink_handle, size);
-	if (size != result)
-	{
+	if (size != result) {
 		LOG_ERROR("jlink_usb_read failed (requested=%d, result=%d)", size, result);
 		return ERROR_FAIL;
 	}
@@ -755,8 +730,7 @@ static int jlink_set_config(struct jlink_config *cfg)
 	memcpy(usb_out_buffer, cfg, size);
 
 	result = jlink_usb_write(jlink_handle, size);
-	if (result != size)
-	{
+	if (result != size) {
 		LOG_ERROR("jlink_usb_write failed (requested=%d, result=%d)", 256, result);
 		return ERROR_FAIL;
 	}
@@ -774,22 +748,19 @@ static int jlink_get_version_info(void)
 	jlink_simple_command(EMU_CMD_VERSION);
 
 	result = jlink_usb_read(jlink_handle, 2);
-	if (2 != result)
-	{
+	if (2 != result) {
 		LOG_ERROR("J-Link command EMU_CMD_VERSION failed (%d)", result);
 		return ERROR_JTAG_DEVICE_ERROR;
 	}
 
 	len = buf_get_u32(usb_in_buffer, 0, 16);
-	if (len > JLINK_IN_BUFFER_SIZE)
-	{
+	if (len > JLINK_IN_BUFFER_SIZE) {
 		LOG_ERROR("J-Link command EMU_CMD_VERSION impossible return length 0x%0x", len);
 		len = JLINK_IN_BUFFER_SIZE;
 	}
 
 	result = jlink_usb_read(jlink_handle, len);
-	if (result != len)
-	{
+	if (result != len) {
 		LOG_ERROR("J-Link command EMU_CMD_VERSION failed (%d)", result);
 		return ERROR_JTAG_DEVICE_ERROR;
 	}
@@ -801,8 +772,7 @@ static int jlink_get_version_info(void)
 	jlink_simple_command(EMU_CMD_GET_CAPS);
 
 	result = jlink_usb_read(jlink_handle, 4);
-	if (4 != result)
-	{
+	if (4 != result) {
 		LOG_ERROR("J-Link command EMU_CMD_GET_CAPS failed (%d)", result);
 		return ERROR_JTAG_DEVICE_ERROR;
 	}
@@ -810,14 +780,12 @@ static int jlink_get_version_info(void)
 	jlink_caps = buf_get_u32(usb_in_buffer, 0, 32);
 	LOG_INFO("J-Link caps 0x%x", (unsigned)jlink_caps);
 
-	if (jlink_caps & (1 << EMU_CAP_GET_HW_VERSION))
-	{
+	if (jlink_caps & (1 << EMU_CAP_GET_HW_VERSION)) {
 		/* query hardware version */
 		jlink_simple_command(EMU_CMD_GET_HW_VERSION);
 
 		result = jlink_usb_read(jlink_handle, 4);
-		if (4 != result)
-		{
+		if (4 != result) {
 			LOG_ERROR("J-Link command EMU_CMD_GET_HW_VERSION failed (%d)", result);
 			return ERROR_JTAG_DEVICE_ERROR;
 		}
@@ -836,14 +804,12 @@ static int jlink_get_version_info(void)
 			LOG_INFO("J-Link hw type %s", jlink_hw_type_str[jlink_hw_type]);
 	}
 
-	if (jlink_caps & (1 << EMU_CAP_GET_MAX_BLOCK_SIZE))
-	{
+	if (jlink_caps & (1 << EMU_CAP_GET_MAX_BLOCK_SIZE)) {
 		/* query hardware maximum memory block */
 		jlink_simple_command(EMU_CMD_GET_MAX_MEM_BLOCK);
 
 		result = jlink_usb_read(jlink_handle, 4);
-		if (4 != result)
-		{
+		if (4 != result) {
 			LOG_ERROR("J-Link command EMU_CMD_GET_MAX_MEM_BLOCK failed (%d)", result);
 			return ERROR_JTAG_DEVICE_ERROR;
 		}
@@ -852,8 +818,7 @@ static int jlink_get_version_info(void)
 		LOG_INFO("J-Link max mem block %i", (int)jlink_max_size);
 	}
 
-	if (jlink_caps & (1 << EMU_CAP_READ_CONFIG))
-	{
+	if (jlink_caps & (1 << EMU_CAP_READ_CONFIG)) {
 		if (jlink_get_config(&jlink_cfg) != ERROR_OK)
 			return ERROR_JTAG_DEVICE_ERROR;
 
@@ -865,8 +830,7 @@ static int jlink_get_version_info(void)
 
 COMMAND_HANDLER(jlink_pid_command)
 {
-	if (CMD_ARGC != 1)
-	{
+	if (CMD_ARGC != 1) {
 		LOG_ERROR("Need exactly one argument to jlink_pid");
 		return ERROR_FAIL;
 	}
@@ -880,8 +844,7 @@ COMMAND_HANDLER(jlink_pid_command)
 
 COMMAND_HANDLER(jlink_handle_jlink_info_command)
 {
-	if (jlink_get_version_info() == ERROR_OK)
-	{
+	if (jlink_get_version_info() == ERROR_OK) {
 		/* attempt to get status */
 		jlink_get_status();
 	}
@@ -899,22 +862,23 @@ COMMAND_HANDLER(jlink_handle_jlink_caps_command)
 COMMAND_HANDLER(jlink_handle_jlink_hw_jtag_command)
 {
 	switch (CMD_ARGC) {
-	case 0:
-		command_print(CMD_CTX, "J-Link hw jtag  %i", jlink_hw_jtag_version);
-		break;
-	case 1: {
-		int request_version = atoi(CMD_ARGV[0]);
-		switch (request_version) {
-		case 2: case 3:
-			jlink_hw_jtag_version = request_version;
+		case 0:
+			command_print(CMD_CTX, "J-Link hw jtag  %i", jlink_hw_jtag_version);
 			break;
+		case 1: {
+			int request_version = atoi(CMD_ARGV[0]);
+			switch (request_version) {
+				case 2:
+				case 3:
+					jlink_hw_jtag_version = request_version;
+					break;
+				default:
+					return ERROR_COMMAND_SYNTAX_ERROR;
+			}
+			break;
+		}
 		default:
 			return ERROR_COMMAND_SYNTAX_ERROR;
-		}
-		break;
-	}
-	default:
-		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	return ERROR_OK;
@@ -924,8 +888,7 @@ COMMAND_HANDLER(jlink_handle_jlink_kickstart_command)
 {
 	uint32_t kickstart;
 
-	if (CMD_ARGC < 1)
-	{
+	if (CMD_ARGC < 1) {
 		jlink_config_kickstart_dump(CMD_CTX, &jlink_cfg);
 		return ERROR_OK;
 	}
@@ -943,8 +906,7 @@ COMMAND_HANDLER(jlink_handle_jlink_mac_address_command)
 	char *e;
 	const char *str;
 
-	if (CMD_ARGC < 1)
-	{
+	if (CMD_ARGC < 1) {
 		jlink_config_mac_address_dump(CMD_CTX, &jlink_cfg);
 		return ERROR_OK;
 	}
@@ -952,26 +914,22 @@ COMMAND_HANDLER(jlink_handle_jlink_mac_address_command)
 	str = CMD_ARGV[0];
 
 	if ((strlen(str) != 17) || (str[2] != ':' || str[5] != ':' || str[8] != ':' ||
-		str[11] != ':' || str[14] != ':'))
-	{
+		str[11] != ':' || str[14] != ':')) {
 		command_print(CMD_CTX, "ethaddr miss format ff:ff:ff:ff:ff:ff");
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
-	for (i = 5; i >= 0; i--)
-	{
+	for (i = 5; i >= 0; i--) {
 		addr[i] = strtoul(str, &e, 16);
 		str = e + 1;
 	}
 
-	if (!(addr[0] | addr[1] | addr[2] | addr[3] | addr[4] | addr[5]))
-	{
+	if (!(addr[0] | addr[1] | addr[2] | addr[3] | addr[4] | addr[5])) {
 		command_print(CMD_CTX, "invalid it's zero mac_address");
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
-	if (!(0x01 & addr[0]))
-	{
+	if (!(0x01 & addr[0])) {
 		command_print(CMD_CTX, "invalid it's a multicat mac_address");
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
@@ -1022,13 +980,12 @@ COMMAND_HANDLER(jlink_handle_jlink_ip_command)
 	int ret;
 	uint8_t subnet_bits = 24;
 
-	if (CMD_ARGC < 1)
-	{
+	if (CMD_ARGC < 1) {
 		jlink_config_ip_dump(CMD_CTX, &jlink_cfg);
 		return ERROR_OK;
 	}
 
-	ret = string_to_ip(CMD_ARGV[0], (uint8_t*)&ip_address, &i);
+	ret = string_to_ip(CMD_ARGV[0], (uint8_t *)&ip_address, &i);
 	if (ret != ERROR_OK)
 		return ret;
 
@@ -1036,18 +993,14 @@ COMMAND_HANDLER(jlink_handle_jlink_ip_command)
 
 	/* check for this format A.B.C.D/E */
 
-	if (i < len)
-	{
+	if (i < len) {
 		if (CMD_ARGV[0][i] != '/')
 			return ERROR_COMMAND_SYNTAX_ERROR;
 
 		COMMAND_PARSE_NUMBER(u8, CMD_ARGV[0] + i + 1, subnet_bits);
-	}
-	else
-	{
-		if (CMD_ARGC > 1)
-		{
-			ret = string_to_ip(CMD_ARGV[1], (uint8_t*)&subnet_mask, &i);
+	} else {
+		if (CMD_ARGC > 1) {
+			ret = string_to_ip(CMD_ARGV[1], (uint8_t *)&subnet_mask, &i);
 			if (ret != ERROR_OK)
 				return ret;
 		}
@@ -1055,10 +1008,10 @@ COMMAND_HANDLER(jlink_handle_jlink_ip_command)
 
 	if (!subnet_mask)
 		subnet_mask = (uint32_t)(subnet_bits < 32 ?
-				((1ULL << subnet_bits) -1) : 0xffffffff);
+				((1ULL << subnet_bits) - 1) : 0xffffffff);
 
-	cpy_ip(jlink_cfg.ip_address, (uint8_t*)&ip_address);
-	cpy_ip(jlink_cfg.subnet_mask, (uint8_t*)&subnet_mask);
+	cpy_ip(jlink_cfg.ip_address, (uint8_t *)&ip_address);
+	cpy_ip(jlink_cfg.subnet_mask, (uint8_t *)&subnet_mask);
 
 	return ERROR_OK;
 }
@@ -1071,8 +1024,7 @@ COMMAND_HANDLER(jlink_handle_jlink_reset_command)
 
 COMMAND_HANDLER(jlink_handle_jlink_save_command)
 {
-	if (!(jlink_caps & (1 << EMU_CAP_WRITE_CONFIG)))
-	{
+	if (!(jlink_caps & (1 << EMU_CAP_WRITE_CONFIG))) {
 		command_print(CMD_CTX, "J-Link write emulator configuration not supported");
 		return ERROR_OK;
 	}
@@ -1085,16 +1037,14 @@ COMMAND_HANDLER(jlink_handle_jlink_usb_address_command)
 {
 	uint32_t address;
 
-	if (CMD_ARGC < 1)
-	{
+	if (CMD_ARGC < 1) {
 		jlink_config_usb_address_dump(CMD_CTX, &jlink_cfg);
 		return ERROR_OK;
 	}
 
 	COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
 
-	if (address > 0x3 && address != 0xff)
-	{
+	if (address > 0x3 && address != 0xff) {
 		command_print(CMD_CTX, "USB Address must be between 0x00 and 0x03 or 0xff");
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
@@ -1108,17 +1058,15 @@ COMMAND_HANDLER(jlink_handle_jlink_config_command)
 	struct jlink_config cfg;
 	int ret = ERROR_OK;
 
-	if (CMD_ARGC == 0)
-	{
-		if (!(jlink_caps & (1 << EMU_CAP_READ_CONFIG)))
-		{
+	if (CMD_ARGC == 0) {
+		if (!(jlink_caps & (1 << EMU_CAP_READ_CONFIG))) {
 			command_print(CMD_CTX, "J-Link read emulator configuration not supported");
 			goto exit;
 		}
 
 		ret = jlink_get_config(&cfg);
 
-		if ( ret != ERROR_OK)
+		if (ret != ERROR_OK)
 			command_print(CMD_CTX, "J-Link read emulator configuration failled");
 		else
 			jlink_config_dump(CMD_CTX, &jlink_cfg);
@@ -1239,7 +1187,7 @@ struct jtag_interface jlink_interface = {
 /* J-Link tap functions */
 
 
-static unsigned tap_length = 0;
+static unsigned tap_length;
 static uint8_t tms_buffer[JLINK_TAP_BUFFER_SIZE];
 static uint8_t tdi_buffer[JLINK_TAP_BUFFER_SIZE];
 static uint8_t tdo_buffer[JLINK_TAP_BUFFER_SIZE];
@@ -1268,17 +1216,14 @@ static void jlink_tap_ensure_space(int scans, int bits)
 	int available_bits = JLINK_TAP_BUFFER_SIZE * 8 - tap_length - 32;
 
 	if (scans > available_scans || bits > available_bits)
-	{
 		jlink_tap_execute();
-	}
 }
 
 static void jlink_tap_append_step(int tms, int tdi)
 {
 	int index_var = tap_length / 8;
 
-	if (index_var >= JLINK_TAP_BUFFER_SIZE)
-	{
+	if (index_var >= JLINK_TAP_BUFFER_SIZE) {
 		LOG_ERROR("jlink_tap_append_step: overflow");
 		*(uint32_t *)0xFFFFFFFF = 0;
 		exit(-1);
@@ -1287,11 +1232,9 @@ static void jlink_tap_append_step(int tms, int tdi)
 	int bit_index = tap_length % 8;
 	uint8_t bit = 1 << bit_index;
 
-	// we do not pad TMS, so be sure to initialize all bits
+	/* we do not pad TMS, so be sure to initialize all bits */
 	if (0 == bit_index)
-	{
 		tms_buffer[index_var] = tdi_buffer[index_var] = 0;
-	}
 
 	if (tms)
 		tms_buffer[index_var] |= bit;
@@ -1318,8 +1261,7 @@ static void jlink_tap_append_scan(int length, uint8_t *buffer,
 	pending_scan_result->command = command;
 	pending_scan_result->buffer = buffer;
 
-	for (i = 0; i < length; i++)
-	{
+	for (i = 0; i < length; i++) {
 		int tms = (i < (length - 1)) ? 0 : 1;
 		int tdi = (buffer[i / 8] & (1 << (i % 8))) != 0;
 		jlink_tap_append_step(tms, tdi);
@@ -1342,11 +1284,9 @@ static int jlink_tap_execute(void)
 	 * message is a multiple of 64, creates problems with USB comms.
 	 * WARNING: This will interfere with tap state counting. */
 	while ((DIV_ROUND_UP(tap_length, 8) % 64) == 0)
-	{
 		jlink_tap_append_step((tap_get_state() == TAP_RESET) ? 1 : 0, 0);
-	}
 
-	// number of full bytes (plus one if some would be left over)
+	/* number of full bytes (plus one if some would be left over) */
 	byte_length = DIV_ROUND_UP(tap_length, 8);
 
 	bool use_jtag3 = jlink_hw_jtag_version >= 3;
@@ -1361,8 +1301,7 @@ static int jlink_tap_execute(void)
 			tap_length, jlink_last_state);
 
 	result = jlink_usb_message(jlink_handle, 4 + 2 * byte_length, byte_length);
-	if (result != byte_length)
-	{
+	if (result != byte_length) {
 		LOG_ERROR("jlink_tap_execute, wrong result %d (expected %d)",
 				result, byte_length);
 		jlink_tap_init();
@@ -1371,8 +1310,7 @@ static int jlink_tap_execute(void)
 
 	memcpy(tdo_buffer, usb_in_buffer, byte_length);
 
-	for (i = 0; i < pending_scan_results_length; i++)
-	{
+	for (i = 0; i < pending_scan_results_length; 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;
@@ -1386,16 +1324,13 @@ static int jlink_tap_execute(void)
 
 		jlink_debug_buffer(buffer, DIV_ROUND_UP(length, 8));
 
-		if (jtag_read_buffer(buffer, command) != ERROR_OK)
-		{
+		if (jtag_read_buffer(buffer, command) != ERROR_OK) {
 			jlink_tap_init();
 			return ERROR_JTAG_QUEUE_FAILED;
 		}
 
 		if (pending_scan_result->buffer != NULL)
-		{
 			free(pending_scan_result->buffer);
-		}
 	}
 
 	jlink_tap_init();
@@ -1405,7 +1340,7 @@ static int jlink_tap_execute(void)
 /*****************************************************************************/
 /* JLink USB low-level functions */
 
-static struct jlink* jlink_usb_open()
+static struct jlink *jlink_usb_open()
 {
 	struct jtag_libusb_device_handle *devh;
 	if (jtag_libusb_open(vids, pids, &devh) != ERROR_OK)
@@ -1432,13 +1367,11 @@ static struct jlink* jlink_usb_open()
 	/* reopen jlink after usb_reset
 	 * on win32 this may take a second or two to re-enumerate */
 	int retval;
-	while ((retval = jtag_libusb_open(vids, pids, &devh)) != ERROR_OK)
-	{
+	while ((retval = jtag_libusb_open(vids, pids, &devh)) != ERROR_OK) {
 		usleep(1000);
 		timeout--;
-		if (!timeout) {
+		if (!timeout)
 			break;
-		}
 	}
 	if (ERROR_OK != retval)
 		return NULL;
@@ -1478,16 +1411,14 @@ static int jlink_usb_message(struct jlink *jlink, int out_length, int in_length)
 	int result;
 
 	result = jlink_usb_write(jlink, out_length);
-	if (result != out_length)
-	{
+	if (result != out_length) {
 		LOG_ERROR("usb_bulk_write failed (requested=%d, result=%d)",
 				out_length, result);
 		return ERROR_JTAG_DEVICE_ERROR;
 	}
 
 	result = jlink_usb_read(jlink, in_length);
-	if ((result != in_length) && (result != (in_length + 1)))
-	{
+	if ((result != in_length) && (result != (in_length + 1))) {
 		LOG_ERROR("usb_bulk_read failed (requested=%d, result=%d)",
 				in_length, result);
 		return ERROR_JTAG_DEVICE_ERROR;
@@ -1497,18 +1428,15 @@ static int jlink_usb_message(struct jlink *jlink, int out_length, int in_length)
 		return result;
 
 	int result2 = ERROR_OK;
-	if (result == in_length)
-	{
+	if (result == in_length) {
 		/* Must read the result from the EMU too */
 		result2 = jlink_usb_read_emu_result(jlink);
-		if (1 != result2)
-		{
+		if (1 != result2) {
 			LOG_ERROR("jlink_usb_read_emu_result retried requested = 1, "
 					"result=%d, in_length=%i", result2, in_length);
 			/* Try again once, should only happen if (in_length%64 == 0) */
 			result2 = jlink_usb_read_emu_result(jlink);
-			if (1 != result2)
-			{
+			if (1 != result2) {
 				LOG_ERROR("jlink_usb_read_emu_result failed "
 					"(requested = 1, result=%d)", result2);
 				return ERROR_JTAG_DEVICE_ERROR;
@@ -1517,15 +1445,12 @@ static int jlink_usb_message(struct jlink *jlink, int out_length, int in_length)
 
 		/* Check the result itself */
 		result2 = usb_emu_result_buffer[0];
-	}
-	else
-	{
+	} else {
 		/* Save the result, then remove it from return value */
 		result2 = usb_in_buffer[result--];
 	}
 
-	if (result2)
-	{
+	if (result2) {
 		LOG_ERROR("jlink_usb_message failed with result=%d)", result2);
 		return ERROR_JTAG_DEVICE_ERROR;
 	}
@@ -1542,8 +1467,7 @@ static int usb_bulk_with_retries(
 {
 	int tries = 3, count = 0;
 
-	while (tries && (count < size))
-	{
+	while (tries && (count < size)) {
 		int result = f(dev, ep, bytes + count, size - count, timeout);
 		if (result > 0)
 			count += result;
@@ -1554,7 +1478,7 @@ static int usb_bulk_with_retries(
 }
 
 static int wrap_usb_bulk_write(jtag_libusb_device_handle *dev, int ep,
-			       char *buff, int size, int timeout)
+		char *buff, int size, int timeout)
 {
 	/* usb_bulk_write() takes const char *buff */
 	return jtag_libusb_bulk_write(dev, ep, buff, size, timeout);
@@ -1579,8 +1503,7 @@ static int jlink_usb_write(struct jlink *jlink, int out_length)
 {
 	int result;
 
-	if (out_length > JLINK_OUT_BUFFER_SIZE)
-	{
+	if (out_length > JLINK_OUT_BUFFER_SIZE) {
 		LOG_ERROR("jlink_write illegal out_length=%d (max=%d)",
 				out_length, JLINK_OUT_BUFFER_SIZE);
 		return -1;
@@ -1631,11 +1554,9 @@ static void jlink_debug_buffer(uint8_t *buffer, int length)
 	int i;
 	int j;
 
-	for (i = 0; i < length; i += BYTES_PER_LINE)
-	{
+	for (i = 0; i < length; i += BYTES_PER_LINE) {
 		snprintf(line, 5, "%04x", i);
-		for (j = i; j < i + BYTES_PER_LINE && j < length; j++)
-		{
+		for (j = i; j < i + BYTES_PER_LINE && j < length; j++) {
 			snprintf(s, 4, " %02x", buffer[j]);
 			strcat(line, s);
 		}