- fixed build issues with win32
[openocd.git] / src / openocd.c
index 5439ece08c91f83fdf682566ea260355f8e97add..ee00f19adb2e7b67c94eefaef74192e5476fef74 100644 (file)
@@ -39,6 +39,7 @@
 #include "server.h"
 #include "telnet_server.h"
 #include "gdb_server.h"
+#include "tcl_server.h"
 
 #include <sys/time.h>
 #include <sys/types.h>
 #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>
+#else
 #define JIM_EMBEDDED
 #include "jim.h"
+#endif
+
+#include "replacements.h"
+
+int launchTarget(struct command_context_s *cmd_ctx)
+{
+       int retval;
+       /* Try to examine & validate jtag chain, though this may require a reset first
+        * in which case we continue setup */
+       jtag_init(cmd_ctx);
+
+       /* try to examine target at this point. If it fails, perhaps a reset will
+        * bring it up later on via a telnet/gdb session */
+       target_examine(cmd_ctx);
+
+       retval=flash_init_drivers(cmd_ctx);
+       if (retval!=ERROR_OK)
+               return retval;
+       LOG_DEBUG("flash init complete");
 
+       retval=nand_init(cmd_ctx);
+       if (retval!=ERROR_OK)
+               return retval;
+       LOG_DEBUG("NAND init complete");
+
+       retval=pld_init(cmd_ctx);
+       if (retval!=ERROR_OK)
+               return retval;
+       LOG_DEBUG("pld init complete");
+       return retval;
+}
 
 /* Give TELNET a way to find out what version this is */
 int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
@@ -77,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 */
@@ -85,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)
 {
@@ -99,7 +138,6 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
        command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
 
        atexit(exit_handler);
-
        
        if (target_init(cmd_ctx) != ERROR_OK)
                return ERROR_FAIL;
@@ -123,7 +161,6 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
                        LOG_DEBUG("jtag examine complete");
                }
        }
-
        
        if (flash_init_drivers(cmd_ctx) != ERROR_OK)
                return ERROR_FAIL;
@@ -148,38 +185,20 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
        return ERROR_OK;
 }
 
-
-/* implementations of OpenOCD that uses multithreading needs to lock OpenOCD while calling
- * OpenOCD fn's. No-op in vanilla OpenOCD
- */
-void lockBigLock()
-{
-}
-void unlockBigLock()
-{
-}
-
-
-
-
+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;
        int result;
 
-       namebuf = alloca( strlen(varname) + 30 );
-       sprintf( namebuf, "%s(%d)", varname, idx );
-
-
+       namebuf = alloc_printf("%s(%d)", varname, idx );
+       
     nameObjPtr = Jim_NewStringObj(interp, namebuf, -1);
     valObjPtr = Jim_NewIntObj(interp, val );
     Jim_IncrRefCount(nameObjPtr);
@@ -187,17 +206,16 @@ new_int_array_element( Jim_Interp * interp,
     result = Jim_SetVariable(interp, nameObjPtr, valObjPtr);
     Jim_DecrRefCount(interp, nameObjPtr);
     Jim_DecrRefCount(interp, valObjPtr);
+    free(namebuf);
        // printf( "%s = 0%08x\n", namebuf, val );
     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;
        u32 width;
-       u32 endian;
        u32 len;
        u32 addr;
        u32 count;
@@ -206,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 
@@ -219,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 ){
@@ -351,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;
 
@@ -423,13 +438,9 @@ int jim_command(command_context_t *context, char *line)
        return retval;
 }
 
-static int startLoop=0;
+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);
@@ -459,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;
@@ -497,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;
@@ -509,8 +505,7 @@ Jim_Command_echo(Jim_Interp *interp,
        return JIM_OK;
 }
 
-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;
@@ -528,12 +523,11 @@ 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 */
                command_output_text( active_cmd_ctx, ptr );
-               return;
+               return strlen(ptr);
        }
        /* GRR we must chunk - not null terminated */
        while( nbytes ){
@@ -557,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;
@@ -583,31 +574,21 @@ 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_InitEmbedded();
-  
-    /* Create an interpreter */
-    interp = Jim_CreateInterp();
-    /* Add all the Jim core commands */
-    Jim_RegisterCoreCommands(interp);
     Jim_CreateCommand(interp, "openocd", Jim_Command_openocd, NULL, NULL);
     Jim_CreateCommand(interp, "openocd_throw", Jim_Command_openocd_throw, NULL, NULL);
     Jim_CreateCommand(interp, "find", Jim_Command_find, NULL, NULL);
@@ -625,12 +606,16 @@ void initJim(void)
        interp->cb_fgets      = openocd_jim_fgets;
 }
 
-int main(int argc, char *argv[])
+/* after command line parsing */
+void initJim2(void)
 {
-       initJim();
+       Jim_Eval(interp, "source [find tcl/commands.tcl]");
+}
+
+command_context_t *setup_command_handler()
+{
+       command_context_t *cmd_ctx;
        
-       /* initialize commandline interface */
-       command_context_t *cmd_ctx, *cfg_cmd_ctx;
        cmd_ctx = command_init();
 
        register_command(cmd_ctx, NULL, "version", handle_version_command,
@@ -653,7 +638,9 @@ int main(int argc, char *argv[])
        pld_register_commands(cmd_ctx);
        
        if (log_init(cmd_ctx) != ERROR_OK)
-               return EXIT_FAILURE;
+       {
+               exit(-1);
+       }
        LOG_DEBUG("log init complete");
 
        LOG_OUTPUT( OPENOCD_VERSION "\n" );
@@ -674,6 +661,31 @@ int main(int argc, char *argv[])
        register_command(cmd_ctx, NULL, "init", handle_init_command,
                                         COMMAND_ANY, "initializes target and servers - nop on subsequent invocations");
 
+       return cmd_ctx;
+}
+
+/*
+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[])
+{
+#ifdef JIM_EMBEDDED
+       Jim_InitEmbedded();
+    /* Create an interpreter */
+    interp = Jim_CreateInterp();
+    /* Add all the Jim core commands */
+    Jim_RegisterCoreCommands(interp);
+#endif
+    
+       initJim();
+       
+       /* initialize commandline interface */
+       command_context_t *cmd_ctx;
+       cmd_ctx=setup_command_handler();
+       
+       command_context_t *cfg_cmd_ctx;
        cfg_cmd_ctx = copy_command_context(cmd_ctx);
        cfg_cmd_ctx->mode = COMMAND_CONFIG;
        command_set_output_handler(cfg_cmd_ctx, configuration_output_handler, NULL);
@@ -681,7 +693,7 @@ int main(int argc, char *argv[])
        if (parse_cmdline_args(cfg_cmd_ctx, argc, argv) != ERROR_OK)
                return EXIT_FAILURE;
 
-    Jim_Eval(interp, "source [find tcl/commands.tcl]");
+       initJim2();
 
        if (parse_config_file(cfg_cmd_ctx) != ERROR_OK)
                return EXIT_FAILURE;
@@ -693,8 +705,7 @@ int main(int argc, char *argv[])
        
        if (daemon_startup)
                command_run_line(cmd_ctx, "reset");
-
-
+       
        startLoop=1;
 
        /* handle network connections */
@@ -710,12 +721,3 @@ int main(int argc, char *argv[])
 
        return EXIT_SUCCESS;
 }
-
-
-/*
- * Local Variables: **
- * tab-width: 4 **
- * c-basic-offset: 4 **
- * End: **
- */
-

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)