X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fxds110.c;h=23a431cf79d21ab4302914d7c8fe474330b82410;hb=1887e2a273797af3d5625ea3d78df3f9ce27ead3;hp=85a1b81db1339a3b03b35881442bbac5ed388974;hpb=20ee64ae4bc70b836664465daebe828caca7ccbc;p=fw%2Fopenocd

diff --git a/src/jtag/drivers/xds110.c b/src/jtag/drivers/xds110.c
index 85a1b81db..23a431cf7 100644
--- a/src/jtag/drivers/xds110.c
+++ b/src/jtag/drivers/xds110.c
@@ -1165,9 +1165,9 @@ static int xds110_swd_switch_seq(enum swd_special_seq seq)
 static bool xds110_legacy_read_reg(uint8_t cmd, uint32_t *value)
 {
 	/* Make sure this is a read request */
-	bool is_read_request = (0 != (SWD_CMD_RnW & cmd));
+	bool is_read_request = (0 != (SWD_CMD_RNW & cmd));
 	/* Determine whether this is a DP or AP register access */
-	uint32_t type = (0 != (SWD_CMD_APnDP & cmd)) ? DAP_AP : DAP_DP;
+	uint32_t type = (0 != (SWD_CMD_APNDP & cmd)) ? DAP_AP : DAP_DP;
 	/* Determine the AP number from cached SELECT value */
 	uint32_t ap_num = (xds110.select & 0xff000000) >> 24;
 	/* Extract register address from command */
@@ -1227,9 +1227,9 @@ static bool xds110_legacy_read_reg(uint8_t cmd, uint32_t *value)
 static bool xds110_legacy_write_reg(uint8_t cmd, uint32_t value)
 {
 	/* Make sure this isn't a read request */
-	bool is_read_request = (0 != (SWD_CMD_RnW & cmd));
+	bool is_read_request = (0 != (SWD_CMD_RNW & cmd));
 	/* Determine whether this is a DP or AP register access */
-	uint32_t type = (0 != (SWD_CMD_APnDP & cmd)) ? DAP_AP : DAP_DP;
+	uint32_t type = (0 != (SWD_CMD_APNDP & cmd)) ? DAP_AP : DAP_DP;
 	/* Determine the AP number from cached SELECT value */
 	uint32_t ap_num = (xds110.select & 0xff000000) >> 24;
 	/* Extract register address from command */
@@ -1296,7 +1296,7 @@ static int xds110_swd_run_queue(void)
 		result = 0;
 		while (xds110.txn_requests[request] != 0) {
 			cmd = xds110.txn_requests[request++];
-			if (0 == (SWD_CMD_RnW & cmd)) {
+			if (0 == (SWD_CMD_RNW & cmd)) {
 				/* DAP register write command */
 				value  = (uint32_t)(xds110.txn_requests[request++]) <<  0;
 				value |= (uint32_t)(xds110.txn_requests[request++]) <<  8;
@@ -1329,9 +1329,9 @@ static int xds110_swd_run_queue(void)
 static void xds110_swd_queue_cmd(uint8_t cmd, uint32_t *value)
 {
 	/* Check if this is a read or write request */
-	bool is_read_request = (0 != (SWD_CMD_RnW & cmd));
+	bool is_read_request = (0 != (SWD_CMD_RNW & cmd));
 	/* Determine whether this is a DP or AP register access */
-	uint32_t type = (0 != (SWD_CMD_APnDP & cmd)) ? DAP_AP : DAP_DP;
+	uint32_t type = (0 != (SWD_CMD_APNDP & cmd)) ? DAP_AP : DAP_DP;
 	/* Extract register address from command */
 	uint32_t address = ((cmd & SWD_CMD_A32) >> 1);
 	uint32_t request_size = (is_read_request) ? 1 : 5;