This is an automated email from Gerrit. Tomasz CEDRO ([email protected]) just uploaded a new patch set to Gerrit, which you can find at http://openocd.zylin.com/1025
-- gerrit commit 0732636502110ed84d6847d4697fd9ac392b64de Author: Tomek CEDRO <[email protected]> Date: Tue Oct 30 20:47:58 2012 +0100 Introducing and implementing interface_bitbang infrastructure to operate (read/write) on predefined interface_signal port pins (port pin masks to be precise). Change-Id: I9de0a36fa66e8fcdc98d4ace85a6294607906b19 Signed-off-by: Tomek CEDRO <[email protected]> diff --git a/src/interface/Makefile.am b/src/interface/Makefile.am index b61fe0f..a4cde55 100644 --- a/src/interface/Makefile.am +++ b/src/interface/Makefile.am @@ -15,11 +15,13 @@ BUILT_SOURCES += CLEANFILES += liboocdinterface_la_SOURCES = \ - interface_signal.c + interface_signal.c \ + interface_bitbang.c noinst_HEADERS = \ interface.h \ - interface_signal.h + interface_signal.h \ + interface_bitbang.h EXTRA_DIST = diff --git a/src/interface/interface.h b/src/interface/interface.h index 054f758..d1e6d72 100644 --- a/src/interface/interface.h +++ b/src/interface/interface.h @@ -23,5 +23,6 @@ #define OOCD_INTERFACE_H #include <interface/interface_signal.h> +#include <interface/interface_bitbang.h> #endif diff --git a/src/interface/interface_bitbang.c b/src/interface/interface_bitbang.c new file mode 100644 index 0000000..4bc3e50 --- /dev/null +++ b/src/interface/interface_bitbang.c @@ -0,0 +1,149 @@ +/* + * Copyright (c) 2011-2012 Tomasz Boleslaw CEDRO + * [email protected], http://www.tomek.cedro.info + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * 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 + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +/** @file Framework to bitbang the interface pins, body file. */ + +#include <helper/command.h> +#include <interface/interface.h> + +extern struct jtag_interface *jtag_interface; + +/*-----------------------------------------------------------------------*/ + +/****************************************************************************** + * TCL INTERFACE TO INTERFACE_BITBANG OPERATIONS (DECLARED IN DRIVER) + ******************************************************************************/ + +/** Bitbang framework allows operation on interface signals, operating on HEX + * values, to read and set their state. When only signal name is given then + * read operation is performed and value returned for given port mask defined + * by signal mask. Additional '=' parameter with following value with set this + * value to the port (again restricted by the signal mask). Therefore it is + * possible to set/get more than one bit/pin at once each with its own value. + * In addition label 'hi'/'set' equals value 0xFFFFFFFF, 'lo'/'clr' equals 0. + * Also note that read/write operation will affect selected port bits direction + * as reading values will switch masked bits to input while writing will make + * them outputs. This is also good way to change port behavior for some pins, + * but beware that reading output may not always bring expected results as it + * may impact device connected to that pin (i.e. Hi-Z input gives 1 undriven). + * This functionality brings new possibilities to script additional features. + */ +COMMAND_HANDLER(handle_oocd_interface_bitbang_command) +{ + LOG_DEBUG("%s", __func__); + + if (!jtag_interface){ + LOG_ERROR("You need to select interface first!"); + return ERROR_FAIL; + } + + if (!jtag_interface->bitbang){ + LOG_ERROR("This interface does not support bit-banging!"); + return ERROR_FAIL; + } + + if (CMD_ARGC < 1) { + LOG_ERROR("Bad syntax!"); + return ERROR_COMMAND_SYNTAX_ERROR; + } + + if (jtag_interface->signal==NULL){ + LOG_ERROR("No signals defined, see 'interface_signal' command for help."); + return ERROR_FAIL; + } + + static oocd_interface_signal_t *sig; + static unsigned int pn; + static int retval; + static char *mark, *signame, *sigval, pcmd[OOCD_BITBANG_PARAM_CMD_MAX_LEN]; + + // Iterate through list of command parameters + for (pn=0;pn<CMD_ARGC;pn++){ + // Make a local copy of parameter command to work on + if (!strncpy(pcmd, CMD_ARGV[pn], OOCD_BITBANG_PARAM_CMD_MAX_LEN)){ + LOG_ERROR("Cannot copy parameter: %s", CMD_ARGV[pn]); + return ERROR_FAIL; + } + // Look for '=' mark to see if read or write will happen + mark=strstr(pcmd, "="); + if (!mark){ + // If no '=' was found then we read the signal value + // Check if specified signal exists + if (!(sig=oocd_interface_signal_find(pcmd))){ + LOG_ERROR("Unknown signal specified!"); + return ERROR_FAIL; + } + // Call the driver routine to do the actual signal read + retval=jtag_interface->bitbang(NULL, pcmd, 1, (int *)&sig->value); + if (retval!=ERROR_OK){ + LOG_ERROR("Unable to read signal: %s", pcmd); + return ERROR_FAIL; + } + } else { + // If '=' was found then we write specified value to the specified signal + // Get and verify the signal name first + signame=strtok(pcmd, "="); + sig=oocd_interface_signal_find(signame); + if (!sig){ + LOG_ERROR("Unknown signal specified!"); + return ERROR_FAIL; + } + // Then read the HEX value or hi (all bits one) / lo (all bits zero) + if (!(sigval=strtok(NULL, "="))){ + LOG_ERROR("No value specified! Use: hi, set, lo, clr, or HEX port value."); + return ERROR_COMMAND_SYNTAX_ERROR; + } + if (!strncmp(sigval, "hi", 2) || !strncmp(sigval, "set", 3)){ + sig->value=0xffffffff&sig->mask; + } else if (!strncmp(sigval, "lo", 2) || !strncmp(sigval, "clr", 3)){ + sig->value=0; + } else if (!sscanf(sigval, "%x", (unsigned int *)&sig->value)){ + LOG_ERROR("Bad value parameter specified (can be: hi, set, lo, clr, or direct HEX port value)"); + return ERROR_COMMAND_SYNTAX_ERROR; + } + retval=jtag_interface->bitbang(NULL, signame, 0, (int *)&sig->value); + if (retval!=ERROR_OK){ + LOG_ERROR("Unable to write signal: %s", signame); + return ERROR_FAIL; + } + } + command_print(CMD_CTX, "%s=0x%08X", sig->name, sig->value); + } + return ERROR_OK; +} + +static const struct command_registration oocd_interface_bitbang_commands[] = { + { + .name = "interface_bitbang", + .handler = handle_oocd_interface_bitbang_command, + .mode = COMMAND_EXEC, + .help = "Perform bit-bang operations on interface signal (mask!).", + .usage = "'signal_name' to read, 'signal_name'='port_hex_value' to write.", + }, + COMMAND_REGISTRATION_DONE +}; + +int oocd_interface_bitbang_register_commands(struct command_context *ctx) +{ + return register_commands(ctx, NULL, oocd_interface_bitbang_commands); +}; diff --git a/src/interface/interface_bitbang.h b/src/interface/interface_bitbang.h new file mode 100644 index 0000000..1ed20ba --- /dev/null +++ b/src/interface/interface_bitbang.h @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2011-2012 Tomasz Boleslaw CEDRO + * [email protected], http://www.tomek.cedro.info + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * 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 + */ + +/** @file Framework to work with interface signals, header file. */ + +#ifndef OOCD_INTERFACE_BITBANG_H +#define OOCD_INTERFACE_BITBANG_H + +#define OOCD_BITBANG_PARAM_CMD_MAX_LEN 45 +int oocd_interface_bitbang_register_commands(struct command_context *ctx); + +#endif diff --git a/src/openocd.c b/src/openocd.c index 6d18e61..54f9f85 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -242,6 +242,7 @@ struct command_context *setup_command_handler(Jim_Interp *interp) &transport_register_commands, &interface_register_commands, &oocd_interface_signal_register_commands, + &oocd_interface_bitbang_register_commands, &target_register_commands, &flash_register_commands, &nand_register_commands, -- ------------------------------------------------------------------------------ LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
