X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fbuspirate.c;h=59819513b4af151d99b6dff8a9e62583a000ca5a;hb=e4c0f45a5f01b202b916deb950485c67c4a6fb10;hp=020c4ce39025a713cde181ff59f9aa5711c7a302;hpb=efd1d642220a4f6d3b9a9607c186452b265400d2;p=openocd.git

diff --git a/src/jtag/drivers/buspirate.c b/src/jtag/drivers/buspirate.c
index 020c4ce390..59819513b4 100644
--- a/src/jtag/drivers/buspirate.c
+++ b/src/jtag/drivers/buspirate.c
@@ -58,6 +58,8 @@ static void buspirate_stableclocks(int num_cycles);
 #define CMD_RAW_SPEED     0x60
 #define CMD_RAW_MODE      0x80
 
+#define CMD_TAP_SHIFT_HEADER_LEN 3
+
 /* raw-wire mode configuration */
 #define CMD_RAW_CONFIG_HIZ 0x00
 #define CMD_RAW_CONFIG_3V3 0x08
@@ -71,6 +73,9 @@ static void buspirate_stableclocks(int num_cycles);
 #define  B1000000 0010010
 #endif
 
+#define SHORT_TIMEOUT  1  /* Must be at least 1. */
+#define NORMAL_TIMEOUT 10
+
 enum {
 	MODE_HIZ = 0,
 	MODE_JTAG = 1,		/* push-pull outputs */
@@ -107,9 +112,6 @@ static bool swd_mode;
 static int  queued_retval;
 static char swd_features;
 
-static const cc_t SHORT_TIMEOUT  = 1; /* Must be at least 1. */
-static const cc_t NORMAL_TIMEOUT = 10;
-
 static int buspirate_fd = -1;
 static int buspirate_pinmode = MODE_JTAG_OD;
 static int buspirate_baudrate = SERIAL_NORMAL;
@@ -214,7 +216,7 @@ static int buspirate_execute_queue(void)
 
 			break;
 		case JTAG_SLEEP:
-			LOG_DEBUG_IO("sleep %i", cmd->cmd.sleep->us);
+			LOG_DEBUG_IO("sleep %" PRIu32, cmd->cmd.sleep->us);
 			buspirate_tap_execute();
 			jtag_sleep(cmd->cmd.sleep->us);
 				break;
@@ -352,10 +354,8 @@ static int buspirate_quit(void)
 
 	buspirate_serial_close(buspirate_fd);
 
-	if (buspirate_port) {
-		free(buspirate_port);
-		buspirate_port = NULL;
-	}
+	free(buspirate_port);
+	buspirate_port = NULL;
 	return ERROR_OK;
 }
 
@@ -710,8 +710,6 @@ static void buspirate_tap_init(void)
 
 static int buspirate_tap_execute(void)
 {
-	static const int CMD_TAP_SHIFT_HEADER_LEN = 3;
-
 	uint8_t tmp[4096];
 	uint8_t *in_buf;
 	int i;
@@ -1049,7 +1047,7 @@ static void buspirate_jtag_reset(int fd)
 	tmp[0] = 0x00; /* exit OCD1 mode */
 	buspirate_serial_write(fd, tmp, 1);
 	usleep(10000);
-	/* We ignore the return value here purposly, nothing we can do */
+	/* We ignore the return value here on purpose, nothing we can do */
 	buspirate_serial_read(fd, tmp, 5);
 	if (strncmp((char *)tmp, "BBIO1", 5) == 0) {
 		tmp[0] = 0x0F; /*  reset BP */
@@ -1367,7 +1365,7 @@ static uint8_t buspirate_swd_write_header(uint8_t cmd)
 	tmp[5] = 0x07; /* write mode trn_1 */
 	tmp[6] = 0x07; /* write mode trn_2 */
 
-	to_send = ((cmd & SWD_CMD_RnW) == 0) ? 7 : 5;
+	to_send = ((cmd & SWD_CMD_RNW) == 0) ? 7 : 5;
 	buspirate_serial_write(buspirate_fd, tmp, to_send);
 
 	/* read ack */
@@ -1413,7 +1411,7 @@ static void buspirate_swd_read_reg(uint8_t cmd, uint32_t *value, uint32_t ap_del
 	uint8_t tmp[16];
 
 	LOG_DEBUG("buspirate_swd_read_reg");
-	assert(cmd & SWD_CMD_RnW);
+	assert(cmd & SWD_CMD_RNW);
 
 	if (queued_retval != ERROR_OK) {
 		LOG_DEBUG("Skip buspirate_swd_read_reg because queued_retval=%d", queued_retval);
@@ -1443,8 +1441,8 @@ static void buspirate_swd_read_reg(uint8_t cmd, uint32_t *value, uint32_t ap_del
 
 	LOG_DEBUG("%s %s %s reg %X = %08"PRIx32,
 			ack == SWD_ACK_OK ? "OK" : ack == SWD_ACK_WAIT ? "WAIT" : ack == SWD_ACK_FAULT ? "FAULT" : "JUNK",
-			cmd & SWD_CMD_APnDP ? "AP" : "DP",
-			cmd & SWD_CMD_RnW ? "read" : "write",
+			cmd & SWD_CMD_APNDP ? "AP" : "DP",
+			cmd & SWD_CMD_RNW ? "read" : "write",
 			(cmd & SWD_CMD_A32) >> 1,
 			data);
 
@@ -1457,7 +1455,7 @@ static void buspirate_swd_read_reg(uint8_t cmd, uint32_t *value, uint32_t ap_del
 		}
 		if (value)
 			*value = data;
-		if (cmd & SWD_CMD_APnDP)
+		if (cmd & SWD_CMD_APNDP)
 			buspirate_swd_idle_clocks(ap_delay_clk);
 		return;
 	 case SWD_ACK_WAIT:
@@ -1480,7 +1478,7 @@ static void buspirate_swd_write_reg(uint8_t cmd, uint32_t value, uint32_t ap_del
 	uint8_t tmp[16];
 
 	LOG_DEBUG("buspirate_swd_write_reg");
-	assert(!(cmd & SWD_CMD_RnW));
+	assert(!(cmd & SWD_CMD_RNW));
 
 	if (queued_retval != ERROR_OK) {
 		LOG_DEBUG("Skip buspirate_swd_write_reg because queued_retval=%d", queued_retval);
@@ -1501,14 +1499,14 @@ static void buspirate_swd_write_reg(uint8_t cmd, uint32_t value, uint32_t ap_del
 
 	LOG_DEBUG("%s %s %s reg %X = %08"PRIx32,
 			ack == SWD_ACK_OK ? "OK" : ack == SWD_ACK_WAIT ? "WAIT" : ack == SWD_ACK_FAULT ? "FAULT" : "JUNK",
-			cmd & SWD_CMD_APnDP ? "AP" : "DP",
-			cmd & SWD_CMD_RnW ? "read" : "write",
+			cmd & SWD_CMD_APNDP ? "AP" : "DP",
+			cmd & SWD_CMD_RNW ? "read" : "write",
 			(cmd & SWD_CMD_A32) >> 1,
 			value);
 
 	switch (ack) {
 	 case SWD_ACK_OK:
-		if (cmd & SWD_CMD_APnDP)
+		if (cmd & SWD_CMD_APNDP)
 			buspirate_swd_idle_clocks(ap_delay_clk);
 		return;
 	 case SWD_ACK_WAIT:
@@ -1538,5 +1536,3 @@ static int buspirate_swd_run_queue(void)
 	LOG_DEBUG("SWD queue return value: %02x", retval);
 	return retval;
 }
-
-