Changed armv7m and cortexm3 to use nev arm_adi_v5 instead of cortex_swjdp.
[fw/openocd] / src / jtag / dummy.c
index bfdf0dcccfe37c757b8248f85d5c0ad19f96fb68..49161a607c80b0dd6dd198348ecb1b75f4aac35f 100644 (file)
@@ -32,13 +32,15 @@ static tap_state_t dummy_state = TAP_RESET;
 \r
 static int dummy_clock;         /* edge detector */\r
 \r
-static tap_state_t tap_state_transition(tap_state_t cur_state, int tms);\r
+static int clock_count;         /* count clocks in any stable state, only stable states */\r
 \r
+static u32 dummy_data;\r
 \r
-int dummy_speed(int speed);\r
-int dummy_register_commands(struct command_context_s *cmd_ctx);\r
-int dummy_init(void);\r
-int dummy_quit(void);\r
+\r
+static int dummy_speed(int speed);\r
+static int dummy_register_commands(struct command_context_s *cmd_ctx);\r
+static int dummy_init(void);\r
+static int dummy_quit(void);\r
 static int dummy_khz(int khz, int *jtag_speed);\r
 static int dummy_speed_div(int speed, int *khz);\r
 \r
@@ -61,12 +63,12 @@ jtag_interface_t dummy_interface =
        .quit = dummy_quit,\r
 };\r
 \r
-int dummy_read(void);\r
-void dummy_write(int tck, int tms, int tdi);\r
-void dummy_reset(int trst, int srst);\r
-void dummy_led(int on);\r
+static int dummy_read(void);\r
+static void dummy_write(int tck, int tms, int tdi);\r
+static void dummy_reset(int trst, int srst);\r
+static void dummy_led(int on);\r
 \r
-bitbang_interface_t dummy_bitbang =\r
+static bitbang_interface_t dummy_bitbang =\r
 {\r
        .read = dummy_read,\r
        .write = dummy_write,\r
@@ -74,33 +76,59 @@ bitbang_interface_t dummy_bitbang =
        .blink = dummy_led\r
 };\r
 \r
-int dummy_read(void)\r
+static int dummy_read(void)\r
 {\r
-       return 1;\r
+       int data = 1 & dummy_data;\r
+       dummy_data = (dummy_data >> 1) | (1<<31);\r
+       return data;\r
 }\r
 \r
 \r
-void dummy_write(int tck, int tms, int tdi)\r
+static void dummy_write(int tck, int tms, int tdi)\r
 {\r
        /* TAP standard: "state transitions occur on rising edge of clock" */\r
        if( tck != dummy_clock )\r
        {\r
                if( tck )\r
                {\r
-                       int old_state = dummy_state;\r
-                       dummy_state = tap_state_transition( dummy_state, tms );\r
+                       tap_state_t old_state = dummy_state;\r
+                       dummy_state = tap_state_transition( old_state, tms );\r
+\r
                        if( old_state != dummy_state )\r
-                               LOG_DEBUG( "dummy_tap=%s", jtag_state_name(dummy_state) );\r
+                       {\r
+                               if( clock_count )\r
+                               {\r
+                                       LOG_DEBUG("dummy_tap: %d stable clocks", clock_count);\r
+                                       clock_count = 0;\r
+                               }\r
+\r
+                               LOG_DEBUG("dummy_tap: %s", tap_state_name(dummy_state) );\r
+\r
+#if defined(DEBUG)\r
+                               if(dummy_state == TAP_DRCAPTURE)\r
+                                       dummy_data = 0x01255043;\r
+#endif\r
+                       }\r
+                       else\r
+                       {\r
+                               /* this is a stable state clock edge, no change of state here,\r
+                                * simply increment clock_count for subsequent logging\r
+                                */\r
+                               ++clock_count;\r
+                       }\r
                }\r
                dummy_clock = tck;\r
        }\r
 }\r
 \r
-void dummy_reset(int trst, int srst)\r
+static void dummy_reset(int trst, int srst)\r
 {\r
        dummy_clock = 0;\r
-       dummy_state = TAP_RESET;\r
-       LOG_DEBUG( "reset to %s", jtag_state_name(dummy_state) );\r
+\r
+       if (trst || (srst && (jtag_reset_config & RESET_SRST_PULLS_TRST)))\r
+               dummy_state = TAP_RESET;\r
+\r
+       LOG_DEBUG("reset to: %s", tap_state_name(dummy_state) );\r
 }\r
 \r
 static int dummy_khz(int khz, int *jtag_speed)\r
@@ -130,132 +158,29 @@ static int dummy_speed_div(int speed, int *khz)
        return ERROR_OK;\r
 }\r
 \r
-int dummy_speed(int speed)\r
+static int dummy_speed(int speed)\r
 {\r
        return ERROR_OK;\r
 }\r
 \r
-int dummy_register_commands(struct command_context_s *cmd_ctx)\r
+static int dummy_register_commands(struct command_context_s *cmd_ctx)\r
 {\r
        return ERROR_OK;\r
 }\r
 \r
-int dummy_init(void)\r
+static int dummy_init(void)\r
 {\r
        bitbang_interface = &dummy_bitbang;\r
 \r
        return ERROR_OK;\r
 }\r
 \r
-int dummy_quit(void)\r
+static int dummy_quit(void)\r
 {\r
        return ERROR_OK;\r
 }\r
 \r
-void dummy_led(int on)\r
+static void dummy_led(int on)\r
 {\r
 }\r
 \r
-\r
-/**\r
- * Function tap_state_transition\r
- * takes a current TAP state and returns the next state according to the tms value.\r
- *\r
- * Even though there is code to duplicate this elsewhere, we do it here a little\r
- * differently just to get a second opinion, i.e. a verification, on state tracking\r
- * in that other logic. Plus array lookups without index checking are no favorite thing.\r
- * This is educational for developers new to TAP controllers.\r
- */\r
-static tap_state_t tap_state_transition(tap_state_t cur_state, int tms)\r
-{\r
-       tap_state_t new_state;\r
-\r
-       if (tms)\r
-       {\r
-               switch (cur_state)\r
-               {\r
-               case TAP_RESET:\r
-                       new_state = cur_state;\r
-                       break;\r
-               case TAP_IDLE:\r
-               case TAP_DRUPDATE:\r
-               case TAP_IRUPDATE:\r
-                       new_state = TAP_DRSELECT;\r
-                       break;\r
-               case TAP_DRSELECT:\r
-                       new_state = TAP_IRSELECT;\r
-                       break;\r
-               case TAP_DRCAPTURE:\r
-               case TAP_DRSHIFT:\r
-                       new_state = TAP_DREXIT1;\r
-                       break;\r
-               case TAP_DREXIT1:\r
-               case TAP_DREXIT2:\r
-                       new_state = TAP_DRUPDATE;\r
-                       break;\r
-               case TAP_DRPAUSE:\r
-                       new_state = TAP_DREXIT2;\r
-                       break;\r
-               case TAP_IRSELECT:\r
-                       new_state = TAP_RESET;\r
-                       break;\r
-               case TAP_IRCAPTURE:\r
-               case TAP_IRSHIFT:\r
-                       new_state = TAP_IREXIT1;\r
-                       break;\r
-               case TAP_IREXIT1:\r
-               case TAP_IREXIT2:\r
-                       new_state = TAP_IRUPDATE;\r
-                       break;\r
-               case TAP_IRPAUSE:\r
-                       new_state = TAP_IREXIT2;\r
-                       break;\r
-               default:\r
-                       LOG_ERROR( "fatal: invalid argument cur_state=%d", cur_state );\r
-                       exit(1);\r
-                       break;\r
-               }\r
-       }\r
-       else\r
-       {\r
-               switch (cur_state)\r
-               {\r
-               case TAP_RESET:\r
-               case TAP_IDLE:\r
-               case TAP_DRUPDATE:\r
-               case TAP_IRUPDATE:\r
-                       new_state = TAP_IDLE;\r
-                       break;\r
-               case TAP_DRSELECT:\r
-                       new_state = TAP_DRCAPTURE;\r
-                       break;\r
-               case TAP_DRCAPTURE:\r
-               case TAP_DRSHIFT:\r
-               case TAP_DREXIT2:\r
-                       new_state = TAP_DRSHIFT;\r
-                       break;\r
-               case TAP_DREXIT1:\r
-               case TAP_DRPAUSE:\r
-                       new_state = TAP_DRPAUSE;\r
-                       break;\r
-               case TAP_IRSELECT:\r
-                       new_state = TAP_IRCAPTURE;\r
-                       break;\r
-               case TAP_IRCAPTURE:\r
-               case TAP_IRSHIFT:\r
-               case TAP_IREXIT2:\r
-                       new_state = TAP_IRSHIFT;\r
-                       break;\r
-               case TAP_IREXIT1:\r
-               case TAP_IRPAUSE:\r
-                       new_state = TAP_IRPAUSE;\r
-                       break;\r
-               default:\r
-                       LOG_ERROR( "fatal: invalid argument cur_state=%d", cur_state );\r
-                       exit(1);\r
-                       break;\r
-               }\r
-       }\r
-\r
-       return new_state;\r
-}\r