imi415/openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zy1000: keep up with latest changes to command handling

Browse Source 
Keep up with Jim Tcl interpreter creation cleanup.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
This commit is contained in:
Øyvind Harboe 2009-12-01 08:42:53 +01:00
parent 5576a6240a
commit 445da543d8
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ecosboard.c
View File

@ -80,6 +80,7 @@
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <openocd.h>
#ifdef CYGPKG_HAL_NIOS2 #ifdef CYGPKG_HAL_NIOS2
#define ZY1000_SER_DEV "/dev/uart_0" #define ZY1000_SER_DEV "/dev/uart_0"
@ -505,8 +506,6 @@ static void zylinjtag_startNetwork(void)
cyg_httpd_init_tcl_interpreter(); cyg_httpd_init_tcl_interpreter();
interp = httpstate.jim_interp;
Jim_CreateCommand(httpstate.jim_interp, "log", zylinjtag_Jim_Command_log, Jim_CreateCommand(httpstate.jim_interp, "log", zylinjtag_Jim_Command_log,
NULL, NULL); NULL, NULL);
Jim_CreateCommand(httpstate.jim_interp, "zy1000_reboot", Jim_CreateCommand(httpstate.jim_interp, "zy1000_reboot",
@ -933,8 +932,6 @@ bool logAllToSerial = false;
int boolParam(char *var); int boolParam(char *var);
struct command_context *setup_command_handler(void);
static const char *zylin_config_dir="/config/settings"; static const char *zylin_config_dir="/config/settings";
static int add_default_dirs(void) static int add_default_dirs(void)
@ -1078,7 +1075,8 @@ int main(int argc, char *argv[])
/* initialize commandline interface */ /* initialize commandline interface */
struct command_context * cmd_ctx; struct command_context * cmd_ctx;
cmd_ctx = setup_command_handler(); struct command_context *setup_command_handler(Jim_Interp *interp);
cmd_ctx = setup_command_handler(httpstate.jim_interp);
command_set_output_handler(cmd_ctx, configuration_output_handler, NULL); command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
command_context_mode(cmd_ctx, COMMAND_CONFIG); command_context_mode(cmd_ctx, COMMAND_CONFIG);
@ -1095,7 +1093,7 @@ int main(int argc, char *argv[])
COMMAND_ANY, NULL); COMMAND_ANY, NULL);
#endif #endif
Jim_CreateCommand(interp, "uart", zylinjtag_Jim_Command_uart, NULL, NULL); Jim_CreateCommand(httpstate.jim_interp, "uart", zylinjtag_Jim_Command_uart, NULL, NULL);
log_init(); log_init();

2
src/jtag/zy1000/zy1000.c
View File

@ -1,5 +1,5 @@
/*************************************************************************** /***************************************************************************
* Copyright (C) 2007-2008 by Øyvind Harboe * * Copyright (C) 2007-2009 by Øyvind Harboe *
* * * *
* This program is free software; you can redistribute it and/or modify * * 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 * * it under the terms of the GNU General Public License as published by *