summaryrefslogtreecommitdiff
path: root/src/openocd.c
diff options
context:
space:
mode:
authordrath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2006-10-12 16:20:47 +0000
committerdrath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2006-10-12 16:20:47 +0000
commit81294537cd61b0f0fb2c0ae93e4367c049bf497f (patch)
treeaffdfea773c0aca3c88596fc653c599c49f62ed1 /src/openocd.c
parent94ffacdd9309745c8f04b512426bb6d810f5456a (diff)
downloadopenocd+libswd-81294537cd61b0f0fb2c0ae93e4367c049bf497f.tar.gz
openocd+libswd-81294537cd61b0f0fb2c0ae93e4367c049bf497f.tar.bz2
openocd+libswd-81294537cd61b0f0fb2c0ae93e4367c049bf497f.tar.xz
openocd+libswd-81294537cd61b0f0fb2c0ae93e4367c049bf497f.zip
- allow FT2232 devices to be opened by serial number instead of device description ('ft2232_serial <serial>' command)
- redirect output from target event scripts (currently only reset) to the daemon output (INFO:) - some minor fixes and enhancements git-svn-id: svn://svn.berlios.de/openocd/trunk@103 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/openocd.c')
-rw-r--r--src/openocd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/openocd.c b/src/openocd.c
index 39475b93..4df416e8 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -18,7 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#define OPENOCD_VERSION "Open On-Chip Debugger (2006-09-07 20:00 CEST)"
+#define OPENOCD_VERSION "Open On-Chip Debugger (2006-10-12 18:00 CEST)"
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -93,6 +93,8 @@ int main(int argc, char *argv[])
command_done(cfg_cmd_ctx);
+ command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
+
if (jtag_init(cmd_ctx) != ERROR_OK)
return EXIT_FAILURE;
DEBUG("jtag init complete");