Commit 0bb7c9d1 authored by oharboe's avatar oharboe
Browse files

fix a few compilation problems.

git-svn-id: svn://svn.berlios.de/openocd/trunk@758 b42882b7-edfa-0310-969c-e2dbd0fdcd60
parent 2b673d0c
......@@ -3,11 +3,11 @@ bin_PROGRAMS = openocd
if ECOSBOARD
MAINFILE = ecosboard.c
else
MAINFILE = openocd.c
MAINFILE = main.c
endif
openocd_SOURCES = $(MAINFILE) jim.c
openocd_SOURCES = $(MAINFILE) openocd.c jim.c
# set the include path found by configure
INCLUDES = -I$(top_srcdir)/src/helper \
......
......@@ -305,6 +305,14 @@ int parse_line(char *line, char *words[], int max_words)
return nwords;
}
void command_output_text( command_context_t *context, const char *data )
{
if( context && context->output_handler && data ){
context->output_handler( context, data );
}
}
void command_print_n(command_context_t *context, char *format, ...)
{
char *string;
......
/***************************************************************************
* Copyright (C) 2005 by Dominic Rath *
* Dominic.Rath@gmx.de *
* *
* 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. *
***************************************************************************/
/*
This is the main entry for developer PC hosted OpenOCD.
OpenOCD can also be used as a library that is linked with
another application(not mainstream yet, but possible), e.g.
w/as an embedded application.
Those applications will have their own main() implementation
and use bits and pieces from openocd.c.
*/
extern int openocd_main(int argc, char *argv[]);
int main(int argc, char *argv[])
{
return openocd_main(argc, argv);
}
......@@ -625,7 +625,12 @@ void initJim(void)
interp->cb_fgets = openocd_jim_fgets;
}
int main(int argc, char *argv[])
/*
normally this is the main() function entry, but if OpenOCD is linked
into application, then this fn will not be invoked, but rather that
application will have it's own implementation of main().
*/
int openocd_main(int argc, char *argv[])
{
initJim();
......
......@@ -30,6 +30,7 @@ enum connection_type
{
CONNECTION_GDB,
CONNECTION_TELNET,
CONNECTION_TCL,
};
typedef struct connection_s
......
......@@ -21,6 +21,7 @@
#include "config.h"
#endif
#include <stdarg.h>
#include "tcl_server.h"
#include "../jim.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment