X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fdummy.c;h=324ea7e94409de98d1fc30b1eb3e00d967e24180;hb=d6c8945662e6027f6ba12d73bac2473088672db5;hp=cc799faa9478a1f55b4d564ad91c3b7ddc183728;hpb=a88871bc6ad13561d9e60fbd9152b8f0c05329b1;p=openocd.git

diff --git a/src/jtag/dummy.c b/src/jtag/dummy.c
index cc799faa94..324ea7e944 100644
--- a/src/jtag/dummy.c
+++ b/src/jtag/dummy.c
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008 by Øyvind Harboe                                   *
+ *   Copyright (C) 2008 by Øyvind Harboe                                   *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,8 +21,7 @@
 #include "config.h"
 #endif
 
-#define INCLUDE_JTAG_INTERFACE_H
-#include "jtag.h"
+#include "interface.h"
 #include "bitbang.h"
 
 
@@ -33,11 +32,11 @@ static int dummy_clock;         /* edge detector */
 
 static int clock_count;         /* count clocks in any stable state, only stable states */
 
-static u32 dummy_data;
+static uint32_t dummy_data;
 
 
 static int dummy_speed(int speed);
-static int dummy_register_commands(struct command_context_s *cmd_ctx);
+static int dummy_register_commands(struct command_context *cmd_ctx);
 static int dummy_init(void);
 static int dummy_quit(void);
 static int dummy_khz(int khz, int *jtag_speed);
@@ -47,7 +46,7 @@ static int dummy_speed_div(int speed, int *khz);
 /* The dummy driver is used to easily check the code path
  * where the target is unresponsive.
  */
-jtag_interface_t dummy_interface =
+struct jtag_interface dummy_interface =
 {
 	.name = "dummy",
 
@@ -67,7 +66,7 @@ static void dummy_write(int tck, int tms, int tdi);
 static void dummy_reset(int trst, int srst);
 static void dummy_led(int on);
 
-static bitbang_interface_t dummy_bitbang =
+static struct bitbang_interface dummy_bitbang =
 {
 	.read = dummy_read,
 	.write = dummy_write,
@@ -78,7 +77,7 @@ static bitbang_interface_t dummy_bitbang =
 static int dummy_read(void)
 {
 	int data = 1 & dummy_data;
-	dummy_data = (dummy_data >> 1) | (1<<31);
+	dummy_data = (dummy_data >> 1) | (1 << 31);
 	return data;
 }
 
@@ -86,25 +85,25 @@ static int dummy_read(void)
 static void dummy_write(int tck, int tms, int tdi)
 {
 	/* TAP standard: "state transitions occur on rising edge of clock" */
-	if( tck != dummy_clock )
+	if (tck != dummy_clock)
 	{
-		if( tck )
+		if (tck)
 		{
 			tap_state_t old_state = dummy_state;
-			dummy_state = tap_state_transition( old_state, tms );
+			dummy_state = tap_state_transition(old_state, tms);
 
-			if( old_state != dummy_state )
+			if (old_state != dummy_state)
 			{
-				if( clock_count )
+				if (clock_count)
 				{
 					LOG_DEBUG("dummy_tap: %d stable clocks", clock_count);
 					clock_count = 0;
 				}
 
-				LOG_DEBUG("dummy_tap: %s", tap_state_name(dummy_state) );
+				LOG_DEBUG("dummy_tap: %s", tap_state_name(dummy_state));
 
 #if defined(DEBUG)
-				if(dummy_state == TAP_DRCAPTURE)
+				if (dummy_state == TAP_DRCAPTURE)
 					dummy_data = 0x01255043;
 #endif
 			}
@@ -124,34 +123,34 @@ static void dummy_reset(int trst, int srst)
 {
 	dummy_clock = 0;
 
-	if (trst || (srst && (jtag_reset_config & RESET_SRST_PULLS_TRST)))
+	if (trst || (srst && (jtag_get_reset_config() & RESET_SRST_PULLS_TRST)))
 		dummy_state = TAP_RESET;
 
-	LOG_DEBUG("reset to: %s", tap_state_name(dummy_state) );
+	LOG_DEBUG("reset to: %s", tap_state_name(dummy_state));
 }
 
 static int dummy_khz(int khz, int *jtag_speed)
 {
-	if (khz==0)
+	if (khz == 0)
 	{
-		*jtag_speed=0;
+		*jtag_speed = 0;
 	}
 	else
 	{
-		*jtag_speed=64000/khz;
+		*jtag_speed = 64000/khz;
 	}
 	return ERROR_OK;
 }
 
 static int dummy_speed_div(int speed, int *khz)
 {
-	if (speed==0)
+	if (speed == 0)
 	{
 		*khz = 0;
 	}
 	else
 	{
-		*khz=64000/speed;
+		*khz = 64000/speed;
 	}
 
 	return ERROR_OK;
@@ -162,7 +161,7 @@ static int dummy_speed(int speed)
 	return ERROR_OK;
 }
 
-static int dummy_register_commands(struct command_context_s *cmd_ctx)
+static int dummy_register_commands(struct command_context *cmd_ctx)
 {
 	return ERROR_OK;
 }