- fixed build issues with win32
- fixed build warnings for last commit - set svn props for last commit git-svn-id: svn://svn.berlios.de/openocd/trunk@760 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
ntfreak
parent
163bd86071
commit
655e4f88a6
|
|
@ -94,5 +94,4 @@ static __inline u32 fast_target_buffer_get_u32(u8 *buffer, int little)
|
|||
return be_to_h_u32(buffer);
|
||||
}
|
||||
|
||||
|
||||
#endif /* BINARYBUFFER_H */
|
||||
|
|
|
|||
|
|
@ -305,14 +305,13 @@ int parse_line(char *line, char *words[], int max_words)
|
|||
return nwords;
|
||||
}
|
||||
|
||||
void command_output_text( command_context_t *context, const char *data )
|
||||
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;
|
||||
|
|
@ -728,10 +727,3 @@ int handle_time_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
|
|||
|
||||
return retval;
|
||||
}
|
||||
/*
|
||||
* Local Variables: **
|
||||
* tab-width: 4 **
|
||||
* c-basic-offset: 4 **
|
||||
* End: **
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -77,20 +77,11 @@ extern int command_run_line(command_context_t *context, char *line);
|
|||
extern int command_run_linef(command_context_t *context, char *format, ...);
|
||||
extern int command_run_line_internal(command_context_t *context, char *line);
|
||||
extern int command_run_file(command_context_t *context, FILE *file, enum command_mode mode);
|
||||
|
||||
extern void command_output_text(command_context_t *context, const char *data);
|
||||
|
||||
#define ERROR_COMMAND_CLOSE_CONNECTION (-600)
|
||||
#define ERROR_COMMAND_SYNTAX_ERROR (-601)
|
||||
|
||||
|
||||
extern int fast_and_dangerous;
|
||||
|
||||
#endif /* COMMAND_H */
|
||||
|
||||
/*
|
||||
* Local Variables: **
|
||||
* tab-width: 4 **
|
||||
* c-basic-offset: 4 **
|
||||
* End: **
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -55,6 +55,12 @@
|
|||
#define MAX(a,b) (((a)>(b))?(a):(b))
|
||||
#endif
|
||||
|
||||
/* for systems that do not support ENOTSUP
|
||||
* win32 being one of them */
|
||||
#ifndef ENOTSUP
|
||||
#define ENOTSUP 134 /* Not supported */
|
||||
#endif
|
||||
|
||||
/* gettimeofday() */
|
||||
#ifndef HAVE_GETTIMEOFDAY
|
||||
|
||||
|
|
|
|||
36
src/jim.c
36
src/jim.c
|
|
@ -38,6 +38,8 @@
|
|||
#include <errno.h>
|
||||
#include <time.h>
|
||||
|
||||
#include "replacements.h"
|
||||
|
||||
/* Include the platform dependent libraries for
|
||||
* dynamic loading of libraries. */
|
||||
#ifdef JIM_DYNLIB
|
||||
|
|
@ -45,7 +47,9 @@
|
|||
#ifndef WIN32
|
||||
#define WIN32 1
|
||||
#endif
|
||||
#ifndef STRICT
|
||||
#define STRICT
|
||||
#endif
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
#if _MSC_VER >= 1000
|
||||
|
|
@ -12027,8 +12031,7 @@ out:
|
|||
* Jim's idea of STDIO..
|
||||
* ---------------------------------------------------------------------------*/
|
||||
|
||||
int
|
||||
Jim_fprintf( Jim_Interp *interp, void *cookie, const char *fmt, ... )
|
||||
int Jim_fprintf( Jim_Interp *interp, void *cookie, const char *fmt, ... )
|
||||
{
|
||||
int r;
|
||||
|
||||
|
|
@ -12039,9 +12042,7 @@ Jim_fprintf( Jim_Interp *interp, void *cookie, const char *fmt, ... )
|
|||
return r;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
Jim_vfprintf( Jim_Interp *interp, void *cookie, const char *fmt, va_list ap )
|
||||
int Jim_vfprintf( Jim_Interp *interp, void *cookie, const char *fmt, va_list ap )
|
||||
{
|
||||
if( (interp == NULL) || (interp->cb_vfprintf == NULL) ){
|
||||
errno = ENOTSUP;
|
||||
|
|
@ -12050,8 +12051,7 @@ Jim_vfprintf( Jim_Interp *interp, void *cookie, const char *fmt, va_list ap )
|
|||
return (*(interp->cb_vfprintf))( cookie, fmt, ap );
|
||||
}
|
||||
|
||||
size_t
|
||||
Jim_fwrite( Jim_Interp *interp, const void *ptr, size_t size, size_t n, void *cookie )
|
||||
size_t Jim_fwrite( Jim_Interp *interp, const void *ptr, size_t size, size_t n, void *cookie )
|
||||
{
|
||||
if( (interp == NULL) || (interp->cb_fwrite == NULL) ){
|
||||
errno = ENOTSUP;
|
||||
|
|
@ -12060,8 +12060,7 @@ Jim_fwrite( Jim_Interp *interp, const void *ptr, size_t size, size_t n, void *co
|
|||
return (*(interp->cb_fwrite))( ptr, size, n, cookie);
|
||||
}
|
||||
|
||||
size_t
|
||||
Jim_fread( Jim_Interp *interp, void *ptr, size_t size, size_t n, void *cookie )
|
||||
size_t Jim_fread( Jim_Interp *interp, void *ptr, size_t size, size_t n, void *cookie )
|
||||
{
|
||||
if( (interp == NULL) || (interp->cb_fread == NULL) ){
|
||||
errno = ENOTSUP;
|
||||
|
|
@ -12070,8 +12069,7 @@ Jim_fread( Jim_Interp *interp, void *ptr, size_t size, size_t n, void *cookie )
|
|||
return (*(interp->cb_fread))( ptr, size, n, cookie);
|
||||
}
|
||||
|
||||
int
|
||||
Jim_fflush( Jim_Interp *interp, void *cookie )
|
||||
int Jim_fflush( Jim_Interp *interp, void *cookie )
|
||||
{
|
||||
if( (interp == NULL) || (interp->cb_fflush == NULL) ){
|
||||
/* pretend all is well */
|
||||
|
|
@ -12080,8 +12078,7 @@ Jim_fflush( Jim_Interp *interp, void *cookie )
|
|||
return (*(interp->cb_fflush))( cookie );
|
||||
}
|
||||
|
||||
char *
|
||||
Jim_fgets( Jim_Interp *interp, char *s, int size, void *cookie )
|
||||
char* Jim_fgets( Jim_Interp *interp, char *s, int size, void *cookie )
|
||||
{
|
||||
if( (interp == NULL) || (interp->cb_fgets == NULL) ){
|
||||
errno = ENOTSUP;
|
||||
|
|
@ -12089,16 +12086,3 @@ Jim_fgets( Jim_Interp *interp, char *s, int size, void *cookie )
|
|||
}
|
||||
return (*(interp->cb_fgets))( s, size, cookie );
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Local Variables: **
|
||||
* tab-width: 4 **
|
||||
* c-basic-offset: 4 **
|
||||
* End: **
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -983,11 +983,3 @@ static void Jim_InitEmbedded(void) {
|
|||
#endif
|
||||
|
||||
#endif /* __JIM__H */
|
||||
|
||||
/*
|
||||
* Local Variables: **
|
||||
* tab-width: 4 **
|
||||
* c-basic-offset: 4 **
|
||||
* End: **
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -50,6 +50,12 @@
|
|||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <malloc.h>
|
||||
#else
|
||||
#include <alloca.h>
|
||||
#endif
|
||||
|
||||
#ifdef __ECOS
|
||||
/* Jim is provied by eCos */
|
||||
#include <cyg/jimtcl/jim.h>
|
||||
|
|
@ -58,8 +64,7 @@
|
|||
#include "jim.h"
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#include "replacements.h"
|
||||
|
||||
int launchTarget(struct command_context_s *cmd_ctx)
|
||||
{
|
||||
|
|
@ -113,7 +118,6 @@ int handle_daemon_startup_command(struct command_context_s *cmd_ctx, char *cmd,
|
|||
return ERROR_OK;
|
||||
}
|
||||
|
||||
|
||||
void exit_handler(void)
|
||||
{
|
||||
/* close JTAG interface */
|
||||
|
|
@ -121,7 +125,6 @@ void exit_handler(void)
|
|||
jtag->quit();
|
||||
}
|
||||
|
||||
|
||||
/* OpenOCD can't really handle failure of this command. Patches welcome! :-) */
|
||||
int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
|
||||
{
|
||||
|
|
@ -136,7 +139,6 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
|
|||
|
||||
atexit(exit_handler);
|
||||
|
||||
|
||||
if (target_init(cmd_ctx) != ERROR_OK)
|
||||
return ERROR_FAIL;
|
||||
LOG_DEBUG("target init complete");
|
||||
|
|
@ -160,7 +162,6 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
if (flash_init_drivers(cmd_ctx) != ERROR_OK)
|
||||
return ERROR_FAIL;
|
||||
LOG_DEBUG("flash init complete");
|
||||
|
|
@ -184,20 +185,13 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
|
|||
return ERROR_OK;
|
||||
}
|
||||
|
||||
|
||||
void lockBigLock();
|
||||
void unlockBigLock();
|
||||
|
||||
|
||||
|
||||
Jim_Interp *interp;
|
||||
command_context_t *active_cmd_ctx;
|
||||
|
||||
static int
|
||||
new_int_array_element( Jim_Interp * interp,
|
||||
const char *varname,
|
||||
int idx,
|
||||
u32 val )
|
||||
static int new_int_array_element(Jim_Interp * interp, const char *varname, int idx, u32 val)
|
||||
{
|
||||
char *namebuf;
|
||||
Jim_Obj *nameObjPtr, *valObjPtr;
|
||||
|
|
@ -205,7 +199,6 @@ new_int_array_element( Jim_Interp * interp,
|
|||
|
||||
namebuf = alloc_printf("%s(%d)", varname, idx );
|
||||
|
||||
|
||||
nameObjPtr = Jim_NewStringObj(interp, namebuf, -1);
|
||||
valObjPtr = Jim_NewIntObj(interp, val );
|
||||
Jim_IncrRefCount(nameObjPtr);
|
||||
|
|
@ -218,8 +211,7 @@ new_int_array_element( Jim_Interp * interp,
|
|||
return result;
|
||||
}
|
||||
|
||||
static int
|
||||
Jim_Command_mem2array( Jim_Interp *interp, int argc, Jim_Obj *const *argv)
|
||||
static int Jim_Command_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
|
||||
{
|
||||
target_t *target;
|
||||
long l;
|
||||
|
|
@ -232,7 +224,6 @@ Jim_Command_mem2array( Jim_Interp *interp, int argc, Jim_Obj *const *argv)
|
|||
u8 buffer[4096];
|
||||
int i,n,e,retval;
|
||||
|
||||
|
||||
/* argv[1] = name of array to receive the data
|
||||
* argv[2] = desired width
|
||||
* argv[3] = memory address
|
||||
|
|
@ -245,7 +236,6 @@ Jim_Command_mem2array( Jim_Interp *interp, int argc, Jim_Obj *const *argv)
|
|||
varname = Jim_GetString( argv[1], &len );
|
||||
/* given "foo" get space for worse case "foo(%d)" .. add 20 */
|
||||
|
||||
|
||||
e = Jim_GetLong( interp, argv[2], &l );
|
||||
width = l;
|
||||
if( e != JIM_OK ){
|
||||
|
|
@ -377,8 +367,7 @@ Jim_Command_mem2array( Jim_Interp *interp, int argc, Jim_Obj *const *argv)
|
|||
return JIM_OK;
|
||||
}
|
||||
|
||||
static void tcl_output(void *privData, const char *file, int line,
|
||||
const char *function, const char *string)
|
||||
static void tcl_output(void *privData, const char *file, int line, const char *function, const char *string)
|
||||
{
|
||||
Jim_Obj *tclOutput=(Jim_Obj *)privData;
|
||||
|
||||
|
|
@ -451,11 +440,7 @@ int jim_command(command_context_t *context, char *line)
|
|||
|
||||
int startLoop=0;
|
||||
|
||||
static int
|
||||
Jim_Command_openocd_ignore(Jim_Interp *interp,
|
||||
int argc,
|
||||
Jim_Obj *const *argv,
|
||||
int ignore)
|
||||
static int Jim_Command_openocd_ignore(Jim_Interp *interp, int argc, Jim_Obj *const *argv, int ignore)
|
||||
{
|
||||
int retval;
|
||||
char *cmd = (char*)Jim_GetString(argv[1], NULL);
|
||||
|
|
@ -485,30 +470,18 @@ Jim_Command_openocd_ignore(Jim_Interp *interp,
|
|||
return (ignore||(retval==ERROR_OK))?JIM_OK:JIM_ERR;
|
||||
}
|
||||
|
||||
static int
|
||||
Jim_Command_openocd(Jim_Interp *interp,
|
||||
int argc,
|
||||
Jim_Obj *const *argv)
|
||||
static int Jim_Command_openocd(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
|
||||
{
|
||||
return Jim_Command_openocd_ignore(interp, argc, argv, 1);
|
||||
}
|
||||
|
||||
static int
|
||||
Jim_Command_openocd_throw(Jim_Interp *interp,
|
||||
int argc,
|
||||
Jim_Obj *const *argv)
|
||||
static int Jim_Command_openocd_throw(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
|
||||
{
|
||||
return Jim_Command_openocd_ignore(interp, argc, argv, 0);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/* find full path to file */
|
||||
static int
|
||||
Jim_Command_find(Jim_Interp *interp,
|
||||
int argc,
|
||||
Jim_Obj *const *argv)
|
||||
static int Jim_Command_find(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
|
||||
{
|
||||
if (argc!=2)
|
||||
return JIM_ERR;
|
||||
|
|
@ -523,10 +496,7 @@ Jim_Command_find(Jim_Interp *interp,
|
|||
return JIM_OK;
|
||||
}
|
||||
|
||||
static int
|
||||
Jim_Command_echo(Jim_Interp *interp,
|
||||
int argc,
|
||||
Jim_Obj *const *argv)
|
||||
static int Jim_Command_echo(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
|
||||
{
|
||||
if (argc!=2)
|
||||
return JIM_ERR;
|
||||
|
|
@ -535,10 +505,7 @@ Jim_Command_echo(Jim_Interp *interp,
|
|||
return JIM_OK;
|
||||
}
|
||||
|
||||
void command_output_text( command_context_t *context, const char *data );
|
||||
|
||||
static size_t
|
||||
openocd_jim_fwrite( const void *_ptr, size_t size, size_t n, void *cookie )
|
||||
static size_t openocd_jim_fwrite(const void *_ptr, size_t size, size_t n, void *cookie)
|
||||
{
|
||||
size_t nbytes;
|
||||
const char *ptr;
|
||||
|
|
@ -556,7 +523,6 @@ openocd_jim_fwrite( const void *_ptr, size_t size, size_t n, void *cookie )
|
|||
return n;
|
||||
}
|
||||
|
||||
|
||||
/* do we have to chunk it? */
|
||||
if( ptr[ nbytes ] == 0 ){
|
||||
/* no it is a C style string */
|
||||
|
|
@ -585,16 +551,13 @@ openocd_jim_fwrite( const void *_ptr, size_t size, size_t n, void *cookie )
|
|||
return n;
|
||||
}
|
||||
|
||||
static size_t
|
||||
openocd_jim_fread(void *ptr, size_t size, size_t n, void *cookie )
|
||||
static size_t openocd_jim_fread(void *ptr, size_t size, size_t n, void *cookie )
|
||||
{
|
||||
/* TCL wants to read... tell him no */
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
openocd_jim_vfprintf( void *cookie, const char *fmt, va_list ap )
|
||||
static int openocd_jim_vfprintf(void *cookie, const char *fmt, va_list ap)
|
||||
{
|
||||
char *cp;
|
||||
int n;
|
||||
|
|
@ -611,23 +574,19 @@ openocd_jim_vfprintf( void *cookie, const char *fmt, va_list ap )
|
|||
return n;
|
||||
}
|
||||
|
||||
static int
|
||||
openocd_jim_fflush( void *cookie )
|
||||
static int openocd_jim_fflush(void *cookie)
|
||||
{
|
||||
/* nothing to flush */
|
||||
return 0;
|
||||
}
|
||||
|
||||
static char *
|
||||
openocd_jim_fgets( char *s, int size, void *cookie )
|
||||
static char* openocd_jim_fgets(char *s, int size, void *cookie)
|
||||
{
|
||||
/* not supported */
|
||||
errno = ENOTSUP;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void initJim(void)
|
||||
{
|
||||
Jim_CreateCommand(interp, "openocd", Jim_Command_openocd, NULL, NULL);
|
||||
|
|
@ -747,7 +706,6 @@ int openocd_main(int argc, char *argv[])
|
|||
if (daemon_startup)
|
||||
command_run_line(cmd_ctx, "reset");
|
||||
|
||||
|
||||
startLoop=1;
|
||||
|
||||
/* handle network connections */
|
||||
|
|
@ -763,12 +721,3 @@ int openocd_main(int argc, char *argv[])
|
|||
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Local Variables: **
|
||||
* tab-width: 4 **
|
||||
* c-basic-offset: 4 **
|
||||
* End: **
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -658,11 +658,3 @@ int handle_exit_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
|
|||
{
|
||||
return ERROR_COMMAND_CLOSE_CONNECTION;
|
||||
}
|
||||
|
||||
/*
|
||||
* Local Variables: **
|
||||
* tab-width: 4 **
|
||||
* c-basic-offset: 4 **
|
||||
* End: **
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -2671,4 +2671,3 @@ int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd, char **
|
|||
|
||||
return ERROR_OK;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue