projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jtag/hla, jtag/stlink: switch to command 'adapter serial'
[fw/openocd]
/
src
/
jtag
/
drivers
/
dummy.c
diff --git
a/src/jtag/drivers/dummy.c
b/src/jtag/drivers/dummy.c
index 8b1e5ecb4c3da492edb39c439ecb46f8bdd0ed8a..e66cb6bd50faec86e21be2cb3836cac4c090c141 100644
(file)
--- a/
src/jtag/drivers/dummy.c
+++ b/
src/jtag/drivers/dummy.c
@@
-13,10
+13,9
@@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
***************************************************************************/
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@
-25,39
+24,32
@@
#include "bitbang.h"
#include "hello.h"
#include "bitbang.h"
#include "hello.h"
-
/* my private tap controller state, which tracks state for calling code */
static tap_state_t dummy_state = TAP_RESET;
/* my private tap controller state, which tracks state for calling code */
static tap_state_t dummy_state = TAP_RESET;
-static int dummy_clock; /* edge detector */
+static int dummy_clock;
/* edge detector */
-static int clock_count; /* count clocks in any stable state, only stable states */
+static int clock_count;
/* count clocks in any stable state, only stable states */
static uint32_t dummy_data;
static uint32_t dummy_data;
-
-static int dummy_read(void)
+static bb_value_t dummy_read(void)
{
int data = 1 & dummy_data;
dummy_data = (dummy_data >> 1) | (1 << 31);
{
int data = 1 & dummy_data;
dummy_data = (dummy_data >> 1) | (1 << 31);
- return data;
+ return data
? BB_HIGH : BB_LOW
;
}
}
-
-static void dummy_write(int tck, int tms, int tdi)
+static int dummy_write(int tck, int tms, int tdi)
{
/* TAP standard: "state transitions occur on rising edge of clock" */
{
/* TAP standard: "state transitions occur on rising edge of clock" */
- if (tck != dummy_clock)
- {
- if (tck)
- {
+ if (tck != dummy_clock) {
+ if (tck) {
tap_state_t old_state = dummy_state;
dummy_state = tap_state_transition(old_state, tms);
tap_state_t old_state = dummy_state;
dummy_state = tap_state_transition(old_state, tms);
- if (old_state != dummy_state)
- {
- if (clock_count)
- {
+ if (old_state != dummy_state) {
+ if (clock_count) {
LOG_DEBUG("dummy_tap: %d stable clocks", clock_count);
clock_count = 0;
}
LOG_DEBUG("dummy_tap: %d stable clocks", clock_count);
clock_count = 0;
}
@@
-68,9
+60,7
@@
static void dummy_write(int tck, int tms, int tdi)
if (dummy_state == TAP_DRCAPTURE)
dummy_data = 0x01255043;
#endif
if (dummy_state == TAP_DRCAPTURE)
dummy_data = 0x01255043;
#endif
- }
- else
- {
+ } else {
/* this is a stable state clock edge, no change of state here,
* simply increment clock_count for subsequent logging
*/
/* this is a stable state clock edge, no change of state here,
* simply increment clock_count for subsequent logging
*/
@@
-79,9
+69,10
@@
static void dummy_write(int tck, int tms, int tdi)
}
dummy_clock = tck;
}
}
dummy_clock = tck;
}
+ return ERROR_OK;
}
}
-static
void
dummy_reset(int trst, int srst)
+static
int
dummy_reset(int trst, int srst)
{
dummy_clock = 0;
{
dummy_clock = 0;
@@
-89,43
+80,35
@@
static void dummy_reset(int trst, int srst)
dummy_state = TAP_RESET;
LOG_DEBUG("reset to: %s", tap_state_name(dummy_state));
dummy_state = TAP_RESET;
LOG_DEBUG("reset to: %s", tap_state_name(dummy_state));
+ return ERROR_OK;
}
}
-static
void
dummy_led(int on)
+static
int
dummy_led(int on)
{
{
+ return ERROR_OK;
}
static struct bitbang_interface dummy_bitbang = {
.read = &dummy_read,
.write = &dummy_write,
}
static struct bitbang_interface dummy_bitbang = {
.read = &dummy_read,
.write = &dummy_write,
- .reset = &dummy_reset,
.blink = &dummy_led,
};
.blink = &dummy_led,
};
-
static int dummy_khz(int khz, int *jtag_speed)
{
if (khz == 0)
static int dummy_khz(int khz, int *jtag_speed)
{
if (khz == 0)
- {
*jtag_speed = 0;
*jtag_speed = 0;
- }
else
else
- {
*jtag_speed = 64000/khz;
*jtag_speed = 64000/khz;
- }
return ERROR_OK;
}
static int dummy_speed_div(int speed, int *khz)
{
if (speed == 0)
return ERROR_OK;
}
static int dummy_speed_div(int speed, int *khz)
{
if (speed == 0)
- {
*khz = 0;
*khz = 0;
- }
else
else
- {
*khz = 64000/speed;
*khz = 64000/speed;
- }
return ERROR_OK;
}
return ERROR_OK;
}
@@
-152,8
+135,8
@@
static const struct command_registration dummy_command_handlers[] = {
.name = "dummy",
.mode = COMMAND_ANY,
.help = "dummy interface driver commands",
.name = "dummy",
.mode = COMMAND_ANY,
.help = "dummy interface driver commands",
-
.chain = hello_command_handlers,
.chain = hello_command_handlers,
+ .usage = "",
},
COMMAND_REGISTRATION_DONE,
};
},
COMMAND_REGISTRATION_DONE,
};
@@
-161,19
+144,22
@@
static const struct command_registration dummy_command_handlers[] = {
/* The dummy driver is used to easily check the code path
* where the target is unresponsive.
*/
/* The dummy driver is used to easily check the code path
* where the target is unresponsive.
*/
-struct jtag_interface dummy_interface = {
- .name = "dummy",
-
- .supported = DEBUG_CAP_TMS_SEQ,
- .commands = dummy_command_handlers,
- .transports = jtag_only,
+static struct jtag_interface dummy_interface = {
+ .supported = DEBUG_CAP_TMS_SEQ,
+ .execute_queue = &bitbang_execute_queue,
+};
- .execute_queue = &bitbang_execute_queue,
+struct adapter_driver dummy_adapter_driver = {
+ .name = "dummy",
+ .transports = jtag_only,
+ .commands = dummy_command_handlers,
- .speed = &dummy_speed,
- .khz = &dummy_khz,
- .speed_div = &dummy_speed_div,
+ .init = &dummy_init,
+ .quit = &dummy_quit,
+ .reset = &dummy_reset,
+ .speed = &dummy_speed,
+ .khz = &dummy_khz,
+ .speed_div = &dummy_speed_div,
- .init = &dummy_init,
- .quit = &dummy_quit,
- };
+ .jtag_ops = &dummy_interface,
+};