moved ioutil init to the right spot: before config scripts
git-svn-id: svn://svn.berlios.de/openocd/trunk@1311 b42882b7-edfa-0310-969c-e2dbd0fdcd60__archive__
parent
5bbf2ae519
commit
59ff8d24d8
|
@ -869,6 +869,8 @@ int add_default_dirs(void)
|
|||
return ERROR_OK;
|
||||
}
|
||||
|
||||
int ioutil_init(struct command_context_s *cmd_ctx);
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
/* ramblockdevice will be the same address every time. The deflate app uses a buffer 16mBytes out, so we
|
||||
|
@ -1001,6 +1003,14 @@ int main(int argc, char *argv[])
|
|||
command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
|
||||
command_context_mode(cmd_ctx, COMMAND_CONFIG);
|
||||
|
||||
#if BUILD_IOUTIL
|
||||
if (ioutil_init(cmd_ctx) != ERROR_OK)
|
||||
{
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef CYGPKG_PROFILE_GPROF
|
||||
register_command(cmd_ctx, NULL, "ecosboard_profile", eCosBoard_handle_eCosBoard_profile_command,
|
||||
COMMAND_ANY, NULL);
|
||||
|
|
|
@ -601,6 +601,7 @@ static int zylinjtag_Jim_Command_ip(Jim_Interp *interp, int argc,
|
|||
freeifaddrs(ifp);
|
||||
#else
|
||||
Jim_Obj *tclOutput = Jim_NewStringObj(interp, "fixme!!!", 0);
|
||||
LOG_ERROR("NOT IMPLEMENTED!!!");
|
||||
#endif
|
||||
Jim_SetResult(interp, tclOutput);
|
||||
|
||||
|
|
|
@ -139,13 +139,6 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
|
|||
|
||||
atexit(exit_handler);
|
||||
|
||||
#if BUILD_IOUTIL
|
||||
if (ioutil_init(cmd_ctx) != ERROR_OK)
|
||||
{
|
||||
return ERROR_FAIL;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (target_init(cmd_ctx) != ERROR_OK)
|
||||
return ERROR_FAIL;
|
||||
LOG_DEBUG("target init complete");
|
||||
|
@ -251,6 +244,13 @@ int openocd_main(int argc, char *argv[])
|
|||
|
||||
cmd_ctx = setup_command_handler();
|
||||
|
||||
#if BUILD_IOUTIL
|
||||
if (ioutil_init(cmd_ctx) != ERROR_OK)
|
||||
{
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
#endif
|
||||
|
||||
LOG_OUTPUT("\n\nBUGS? Read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n\n\n");
|
||||
|
||||
print_version();
|
||||
|
|
Loading…
Reference in New Issue