X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fjtag%2Fjlink.c;h=140949a445d7cd03b1479525f90710ffab05134a;hb=2ddeec9db5a8771c948294b7194778a95295b7a0;hp=78efc5ef0bf66d4b494bd5c7521679763e55d5dd;hpb=4bc155398e88c9cc4393e4113496d088b7ff7ab0;p=openocd

diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c
index 78efc5ef..140949a4 100644
--- a/src/jtag/jlink.c
+++ b/src/jtag/jlink.c
@@ -100,7 +100,7 @@ static void jlink_end_state(tap_state_t state);
 static void jlink_state_move(void);
 static void jlink_path_move(int num_states, tap_state_t *path);
 static void jlink_runtest(int num_cycles);
-static void jlink_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command);
+static void jlink_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command);
 static void jlink_reset(int trst, int srst);
 static void jlink_simple_command(uint8_t command);
 static int jlink_get_status(void);
@@ -110,7 +110,7 @@ static void jlink_tap_init(void);
 static int jlink_tap_execute(void);
 static void jlink_tap_ensure_space(int scans, int bits);
 static void jlink_tap_append_step(int tms, int tdi);
-static void jlink_tap_append_scan(int length, uint8_t *buffer, scan_command_t *command);
+static void jlink_tap_append_scan(int length, uint8_t *buffer, struct scan_command *command);
 
 /* Jlink lowlevel functions */
 struct jlink {
@@ -449,7 +449,7 @@ static void jlink_runtest(int num_cycles)
 	}
 }
 
-static void jlink_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, scan_command_t *command)
+static void jlink_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size, struct scan_command *command)
 {
 	tap_state_t saved_end_state;
 
@@ -677,7 +677,7 @@ static uint8_t tdo_buffer[JLINK_TAP_BUFFER_SIZE];
 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;
 };
 
@@ -736,7 +736,7 @@ static void jlink_tap_append_step(int tms, int tdi)
 	tap_length++;
 }
 
-static void jlink_tap_append_scan(int length, uint8_t *buffer, scan_command_t *command)
+static void jlink_tap_append_scan(int length, uint8_t *buffer, struct scan_command *command)
 {
 	struct pending_scan_result *pending_scan_result =
 		&pending_scan_results_buffer[pending_scan_results_length];
@@ -804,7 +804,7 @@ static int jlink_tap_execute(void)
 		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);