move container_of to types.h

[openocd.git] / src / jtag / dummy.c

diff --git a/src/jtag/dummy.c b/src/jtag/dummy.c
index b4aa94154501a080da8b8bd86f375d20250f3148..324ea7e94409de98d1fc30b1eb3e00d967e24180 100644 (file)
--- 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  *
@@ -36,7 +36,7 @@ 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);
@@ -46,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",
 
@@ -66,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,
@@ -85,22 +85,22 @@ 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)
@@ -126,31 +126,31 @@ static void dummy_reset(int trst, int srst)
        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;
@@ -161,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;
 }