[Openocd-svn] r1800 - in trunk/src/jtag: . rlink

[<oh...@ma...>]

Author: oharboe
Date: 2009-05-16 22:09:07 +0200 (Sat, 16 May 2009)
New Revision: 1800

Modified:
   trunk/src/jtag/amt_jtagaccel.c
   trunk/src/jtag/arm-jtag-ew.c
   trunk/src/jtag/bitbang.c
   trunk/src/jtag/ft2232.c
   trunk/src/jtag/gw16012.c
   trunk/src/jtag/jlink.c
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
   trunk/src/jtag/rlink/rlink.c
   trunk/src/jtag/usbprog.c
   trunk/src/jtag/vsllink.c
Log:
Michael Bruck <mb...@di...> change 'ir_scan' from 'int' to 'bool' to document its semantics

Modified: trunk/src/jtag/amt_jtagaccel.c
===================================================================
--- trunk/src/jtag/amt_jtagaccel.c	2009-05-16 14:59:10 UTC (rev 1799)
+++ trunk/src/jtag/amt_jtagaccel.c	2009-05-16 20:09:07 UTC (rev 1800)
@@ -233,7 +233,7 @@
 		amt_jtagaccel_state_move();
 }
 
-static void amt_jtagaccel_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size)
+static void amt_jtagaccel_scan(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size)
 {
 	int bits_left = scan_size;
 	int bit_count = 0;

Modified: trunk/src/jtag/arm-jtag-ew.c
===================================================================
--- trunk/src/jtag/arm-jtag-ew.c	2009-05-16 14:59:10 UTC (rev 1799)
+++ trunk/src/jtag/arm-jtag-ew.c	2009-05-16 20:09:07 UTC (rev 1800)
@@ -72,7 +72,7 @@
 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(int ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command);
+static void armjtagew_scan(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command);
 static void armjtagew_reset(int trst, int srst);
 //static void armjtagew_simple_command(u8 command);
 static int armjtagew_get_status(void);
@@ -401,7 +401,7 @@
 	}
 }
 
-static void armjtagew_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command)
+static void armjtagew_scan(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command)
 {
 	tap_state_t saved_end_state;
 

Modified: trunk/src/jtag/bitbang.c
===================================================================
--- trunk/src/jtag/bitbang.c	2009-05-16 14:59:10 UTC (rev 1799)
+++ trunk/src/jtag/bitbang.c	2009-05-16 20:09:07 UTC (rev 1800)
@@ -168,7 +168,7 @@
 
 
 
-static void bitbang_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size)
+static void bitbang_scan(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size)
 {
 	tap_state_t saved_end_state = tap_get_end_state();
 	int bit_cnt;

Modified: trunk/src/jtag/ft2232.c
===================================================================
--- trunk/src/jtag/ft2232.c	2009-05-16 14:59:10 UTC (rev 1799)
+++ trunk/src/jtag/ft2232.c	2009-05-16 20:09:07 UTC (rev 1800)
@@ -573,7 +573,7 @@
 }
 
 
-void ft2232_add_scan(int ir_scan, enum scan_type type, u8* buffer, int scan_size)
+void ft2232_add_scan(bool ir_scan, enum scan_type type, u8* buffer, int scan_size)
 {
 	int num_bytes = (scan_size + 7) / 8;
 	int bits_left = scan_size;

Modified: trunk/src/jtag/gw16012.c
===================================================================
--- trunk/src/jtag/gw16012.c	2009-05-16 14:59:10 UTC (rev 1799)
+++ trunk/src/jtag/gw16012.c	2009-05-16 20:09:07 UTC (rev 1800)
@@ -263,7 +263,7 @@
 		gw16012_state_move();
 }
 
-static void gw16012_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size)
+static void gw16012_scan(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size)
 {
 	int bits_left = scan_size;
 	int bit_count = 0;

Modified: trunk/src/jtag/jlink.c
===================================================================
--- trunk/src/jtag/jlink.c	2009-05-16 14:59:10 UTC (rev 1799)
+++ trunk/src/jtag/jlink.c	2009-05-16 20:09:07 UTC (rev 1800)
@@ -83,7 +83,7 @@
 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(int ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command);
+static void jlink_scan(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command);
 static void jlink_reset(int trst, int srst);
 static void jlink_simple_command(u8 command);
 static int jlink_get_status(void);
@@ -434,7 +434,7 @@
 	}
 }
 
-static void jlink_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command)
+static void jlink_scan(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command)
 {
 	tap_state_t saved_end_state;
 

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-05-16 14:59:10 UTC (rev 1799)
+++ trunk/src/jtag/jtag.c	2009-05-16 20:09:07 UTC (rev 1800)
@@ -592,7 +592,7 @@
 
 	/* allocate memory for ir scan command */
 	(*last_cmd)->cmd.scan = cmd_queue_alloc(sizeof(scan_command_t));
-	(*last_cmd)->cmd.scan->ir_scan = 1;
+	(*last_cmd)->cmd.scan->ir_scan = true;
 	x = jtag_NumEnabledTaps();
 	(*last_cmd)->cmd.scan->num_fields = x;	/* one field per device */
 	(*last_cmd)->cmd.scan->fields = cmd_queue_alloc(x  * sizeof(scan_field_t));
@@ -672,7 +672,7 @@
 
 	/* allocate memory for ir scan command */
 	(*last_cmd)->cmd.scan = cmd_queue_alloc(sizeof(scan_command_t));
-	(*last_cmd)->cmd.scan->ir_scan = 1;
+	(*last_cmd)->cmd.scan->ir_scan = true;
 	(*last_cmd)->cmd.scan->num_fields = num_fields;
 	(*last_cmd)->cmd.scan->fields = cmd_queue_alloc(num_fields * sizeof(scan_field_t));
 	(*last_cmd)->cmd.scan->end_state = state;
@@ -797,7 +797,7 @@
 
 	/* allocate memory for dr scan command */
 	(*last_cmd)->cmd.scan = cmd_queue_alloc(sizeof(scan_command_t));
-	(*last_cmd)->cmd.scan->ir_scan = 0;
+	(*last_cmd)->cmd.scan->ir_scan = false;
 	(*last_cmd)->cmd.scan->num_fields = num_fields + bypass_devices;
 	(*last_cmd)->cmd.scan->fields = cmd_queue_alloc((num_fields + bypass_devices) * sizeof(scan_field_t));
 	(*last_cmd)->cmd.scan->end_state = state;
@@ -891,7 +891,7 @@
 
 	/* allocate memory for dr scan command */
 	(*last_cmd)->cmd.scan = cmd_queue_alloc(sizeof(scan_command_t));
-	(*last_cmd)->cmd.scan->ir_scan = 0;
+	(*last_cmd)->cmd.scan->ir_scan = false;
 	(*last_cmd)->cmd.scan->num_fields = num_fields + bypass_devices;
 	(*last_cmd)->cmd.scan->fields = cmd_queue_alloc((num_fields + bypass_devices) * sizeof(scan_field_t));
 	(*last_cmd)->cmd.scan->end_state = end_state;
@@ -970,7 +970,7 @@
 
 	/* allocate memory for scan command */
 	(*last_cmd)->cmd.scan = cmd_queue_alloc(sizeof(scan_command_t));
-	(*last_cmd)->cmd.scan->ir_scan = 0;
+	(*last_cmd)->cmd.scan->ir_scan = false;
 	(*last_cmd)->cmd.scan->num_fields = num_fields;
 	(*last_cmd)->cmd.scan->fields = cmd_queue_alloc(num_fields * sizeof(scan_field_t));
 	(*last_cmd)->cmd.scan->end_state = state;

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-05-16 14:59:10 UTC (rev 1799)
+++ trunk/src/jtag/jtag.h	2009-05-16 20:09:07 UTC (rev 1800)
@@ -287,7 +287,7 @@
 
 typedef struct scan_command_s
 {
-	int           ir_scan;      /* instruction/not data scan */
+	bool          ir_scan;      /* instruction/not data scan */
 	int           num_fields;   /* number of fields in *fields array */
 	scan_field_t* fields;       /* pointer to an array of data scan fields */
 	tap_state_t   end_state;    /* TAP state in which JTAG commands should finish */

Modified: trunk/src/jtag/rlink/rlink.c
===================================================================
--- trunk/src/jtag/rlink/rlink.c	2009-05-16 14:59:10 UTC (rev 1799)
+++ trunk/src/jtag/rlink/rlink.c	2009-05-16 20:09:07 UTC (rev 1800)
@@ -1094,7 +1094,7 @@
 	u8			*buffer,
 	int			scan_size
 ) {
-	int			ir_scan;
+	bool		ir_scan;
 	tap_state_t	saved_end_state;
 	int			byte_bits;
 	int			extra_bits;

Modified: trunk/src/jtag/usbprog.c
===================================================================
--- trunk/src/jtag/usbprog.c	2009-05-16 14:59:10 UTC (rev 1799)
+++ trunk/src/jtag/usbprog.c	2009-05-16 20:09:07 UTC (rev 1800)
@@ -58,7 +58,7 @@
 static void usbprog_state_move(void);
 static void usbprog_path_move(pathmove_command_t *cmd);
 static void usbprog_runtest(int num_cycles);
-static void usbprog_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size);
+static void usbprog_scan(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size);
 
 jtag_interface_t usbprog_interface =
 {
@@ -336,7 +336,7 @@
 	*/
 }
 
-static void usbprog_scan(int ir_scan, enum scan_type type, u8 *buffer, int scan_size)
+static void usbprog_scan(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size)
 {
 	tap_state_t saved_end_state = tap_get_end_state();
 

Modified: trunk/src/jtag/vsllink.c
===================================================================
--- trunk/src/jtag/vsllink.c	2009-05-16 14:59:10 UTC (rev 1799)
+++ trunk/src/jtag/vsllink.c	2009-05-16 20:09:07 UTC (rev 1800)
@@ -204,9 +204,9 @@
 static void vsllink_stableclocks_dma(int num_cycles, int tms);
 static void vsllink_stableclocks_normal(int num_cycles, int tms);
 static void (*vsllink_stableclocks)(int num_cycles, int tms);
-static void vsllink_scan_dma(int ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command);
-static void vsllink_scan_normal(int ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command);
-static void (*vsllink_scan)(int ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command);
+static void vsllink_scan_dma(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command);
+static void vsllink_scan_normal(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command);
+static void (*vsllink_scan)(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command);
 static void vsllink_reset(int trst, int srst);
 static void vsllink_simple_command(u8 command);
 static int vsllink_connect(void);
@@ -1189,7 +1189,7 @@
 	}
 }
 
-static void vsllink_scan_normal(int ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command)
+static void vsllink_scan_normal(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command)
 {
 	tap_state_t saved_end_state;
 	u8 bits_left, tms_tmp, tdi_len;
@@ -1305,7 +1305,7 @@
 	
 	tap_set_state(tap_get_end_state());
 }
-static void vsllink_scan_dma(int ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command)
+static void vsllink_scan_dma(bool ir_scan, enum scan_type type, u8 *buffer, int scan_size, scan_command_t *command)
 {
 	tap_state_t saved_end_state;