X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fjtag%2Fzy1000%2Fzy1000.c;h=5e4bda0f19ffb98b31064efad6671e9c4b52ff94;hb=d61714f4d5d72f9f39fbccbb1c3ba5f3d8982020;hp=8f7edc70bbbc7347829dc4af02e5c9974eee1c8a;hpb=86e4324f1bd4cd8135cb857e4b940b1f2e872dc3;p=fw%2Fopenocd

diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index 8f7edc70b..5e4bda0f1 100644
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -36,8 +36,6 @@
 
 /* low level command set
  */
-int zy1000_read(void);
-static void zy1000_write(int tck, int tms, int tdi);
 void zy1000_reset(int trst, int srst);
 
 
@@ -126,34 +124,22 @@ jtag_interface_t zy1000_interface =
 	.srst_asserted = zy1000_srst_asserted,
 };
 
-static void zy1000_write(int tck, int tms, int tdi)
-{
-
-}
-
-int zy1000_read(void)
-{
-	return -1;
-}
-
-extern bool readSRST(void);
-
 void zy1000_reset(int trst, int srst)
 {
 	LOG_DEBUG("zy1000 trst=%d, srst=%d", trst, srst);
-	if(!srst)
+	if (!srst)
 	{
 		ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x00000001);
 	}
 	else
 	{
-		/* Danger!!! if clk!=0 when in
+		/* Danger!!! if clk != 0 when in
 		 * idle in TAP_IDLE, reset halt on str912 will fail.
 		 */
 		ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x00000001);
 	}
 
-	if(!trst)
+	if (!trst)
 	{
 		ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x00000002);
 	}
@@ -202,7 +188,7 @@ void zy1000_reset(int trst, int srst)
 
 int zy1000_speed(int speed)
 {
-	if(speed == 0)
+	if (speed == 0)
 	{
 		/*0 means RCLK*/
 		speed = 0;
@@ -211,7 +197,7 @@ int zy1000_speed(int speed)
 	}
 	else
 	{
-		if(speed > 8190 || speed < 2)
+		if (speed > 8190 || speed < 2)
 		{
 			LOG_USER("valid ZY1000 jtag_speed=[8190,2]. Divisor is 64MHz / even values between 8190-2, i.e. min 7814Hz, max 32MHz");
 			return ERROR_INVALID_ARGUMENTS;
@@ -323,7 +309,7 @@ zylinjtag_Jim_Command_powerstatus(Jim_Interp *interp,
 	cyg_uint32 status;
 	ZY1000_PEEK(ZY1000_JTAG_BASE+0x10, status);
 
-	Jim_SetResult(interp, Jim_NewIntObj(interp, (status&0x80)!=0));
+	Jim_SetResult(interp, Jim_NewIntObj(interp, (status&0x80) != 0));
 
 	return JIM_OK;
 }
@@ -377,7 +363,7 @@ int interface_jtag_execute_queue(void)
 	/* clear JTAG error register */
 	ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x400);
 
-	if ((empty&0x400)!=0)
+	if ((empty&0x400) != 0)
 	{
 		LOG_WARNING("RCLK timeout");
 		/* the error is informative only as we don't want to break the firmware if there
@@ -426,7 +412,7 @@ static void shiftValueInnerFlip(const tap_state_t state, const tap_state_t endSt
 
 extern int jtag_check_value(uint8_t *captured, void *priv);
 
-static __inline void scanFields(int num_fields, scan_field_t *fields, tap_state_t shiftState, tap_state_t end_state)
+static __inline void scanFields(int num_fields, const scan_field_t *fields, tap_state_t shiftState, tap_state_t end_state)
 {
 	int i;
 	int j;
@@ -436,14 +422,12 @@ static __inline void scanFields(int num_fields, scan_field_t *fields, tap_state_
 	{
 		cyg_uint32 value;
 
-		static uint8_t *in_buff=NULL; /* pointer to buffer for scanned data */
-		static int in_buff_size=0;
 		uint8_t *inBuffer=NULL;
 
 
 		// figure out where to store the input data
 		int num_bits=fields[i].num_bits;
-		if (fields[i].in_value!=NULL)
+		if (fields[i].in_value != NULL)
 		{
 			inBuffer=fields[i].in_value;
 		}
@@ -469,9 +453,9 @@ static __inline void scanFields(int num_fields, scan_field_t *fields, tap_state_
 			// we have (num_bits+7)/8 bytes of bits to toggle out.
 			// bits are pushed out LSB to MSB
 			value=0;
-			if (fields[i].out_value!=NULL)
+			if (fields[i].out_value != NULL)
 			{
-				for (l=0; l<k; l+=8)
+				for (l=0; l<k; l += 8)
 				{
 					value|=fields[i].out_value[(j+l)/8]<<l;
 				}
@@ -481,19 +465,19 @@ static __inline void scanFields(int num_fields, scan_field_t *fields, tap_state_
 
 			shiftValueInner(shiftState, pause_state, k, value);
 
-			if (inBuffer!=NULL)
+			if (inBuffer != NULL)
 			{
 				// data in, LSB to MSB
 				value=getShiftValue();
 				// we're shifting in data to MSB, shift data to be aligned for returning the value
 				value >>= 32-k;
 
-				for (l=0; l<k; l+=8)
+				for (l=0; l<k; l += 8)
 				{
 					inBuffer[(j+l)/8]=(value>>l)&0xff;
 				}
 			}
-			j+=k;
+			j += k;
 		}
 	}
 }
@@ -510,7 +494,7 @@ int interface_jtag_add_ir_scan(int num_fields, const scan_field_t *fields, tap_s
 	int j;
 	int scan_size = 0;
 	jtag_tap_t *tap, *nextTap;
-	for(tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap=nextTap)
+	for (tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap=nextTap)
 	{
 		nextTap=jtag_tap_next_enabled(tap);
 		tap_state_t end_state;
@@ -579,7 +563,7 @@ int interface_jtag_add_dr_scan(int num_fields, const scan_field_t *fields, tap_s
 
 	int j;
 	jtag_tap_t *tap, *nextTap;
-	for(tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap=nextTap)
+	for (tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap=nextTap)
 	{
 		nextTap=jtag_tap_next_enabled(tap);
 		int found=0;
@@ -650,7 +634,7 @@ static int zy1000_jtag_add_clocks(int num_cycles, tap_state_t state, tap_state_t
 
 	/* execute num_cycles, 32 at the time. */
 	int i;
-	for (i=0; i<num_cycles; i+=32)
+	for (i=0; i<num_cycles; i += 32)
 	{
 		int num;
 		num=32;
@@ -758,7 +742,7 @@ void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, uint8_t *buffer, int l
 			{
 				shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, 32, fast_target_buffer_get_u32(buffer, 1));
 				shiftValueInner(TAP_DRSHIFT, end_state, 6, reg_addr|(1<<5));
-				buffer+=4;
+				buffer += 4;
 			}
 		} else
 		{
@@ -767,7 +751,7 @@ void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, uint8_t *buffer, int l
 			{
 				shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, 32, fast_target_buffer_get_u32(buffer, 0));
 				shiftValueInner(TAP_DRSHIFT, end_state, 6, reg_addr|(1<<5));
-				buffer+=4;
+				buffer += 4;
 			}
 		}
 	}