jim tests: use installed

[openocd.git] / src / ecosboard.c

diff --git a/src/ecosboard.c b/src/ecosboard.c
index f7523545a10e2676308b638b2f05043ba6669a75..0805e6fcb93c2c88c5db1d606750cef2dc39021e 100644 (file)
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2009 by Øyvind Harboe                              *
+ *   Copyright (C) 2007-2010 by Øyvind Harboe                              *
  *                                                                         *
  *   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  *
@@ -24,6 +24,7 @@
 #include <helper/types.h>
 #include <jtag/jtag.h>
 #include <helper/ioutil.h>
+#include <helper/util.h>
 #include <helper/configuration.h>
 
 #include <server/server.h>
@@ -99,10 +100,6 @@ static bool writeLog = true;
 
 char hwaddr[512];
 
-
-extern struct flash_driver *flash_drivers[];
-extern struct target_type *target_types[];
-
 #ifdef CYGPKG_PROFILE_GPROF
 #include <cyg/profile/profile.h>
 
@@ -503,6 +500,10 @@ static void zylinjtag_startNetwork(void)
 
        cyg_httpd_init_tcl_interpreter();
 
+       // Kludge! Why can't I do this from httpd.c??? I get linker errors...
+       // some of that --start/end-group stuff?
+    Jim_InitStaticExtensions(httpstate.jim_interp);
+
        Jim_CreateCommand(httpstate.jim_interp, "log", zylinjtag_Jim_Command_log,
                        NULL, NULL);
        Jim_CreateCommand(httpstate.jim_interp, "zy1000_reboot",
@@ -1093,6 +1094,9 @@ int main(int argc, char *argv[])
        command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
        command_context_mode(cmd_ctx, COMMAND_CONFIG);
 
+       if (util_init(cmd_ctx) != ERROR_OK)
+               return EXIT_FAILURE;
+
        if (ioutil_init(cmd_ctx) != ERROR_OK)
                return EXIT_FAILURE;
 
@@ -1277,6 +1281,7 @@ struct Tftp
        cyg_uint8 *mem;
        int actual;
        char *server;
+       int port;
        char *file;
 };
 
@@ -1333,6 +1338,15 @@ static int tftpfs_open(cyg_mtab_entry *mte, cyg_dir dir, const char *name,
        strncpy(tftp->server, name, server - name);
        tftp->server[server - name] = 0;
 
+       tftp->port = 0; /* default port 69 */
+       char *port;
+       port = strchr(tftp->server, ':');
+       if (port != NULL)
+       {
+               tftp->port = atoi(port + 1);
+               *port = 0;
+       }
+
        tftp->file = strdup(server + 1);
        if (tftp->file == NULL)
        {
@@ -1350,7 +1364,7 @@ static int fetchTftp(struct Tftp *tftp)
        if (!tftp->readFile)
        {
                int err;
-               tftp->actual = tftp_client_get(tftp->file, tftp->server, 0, tftp->mem,
+               tftp->actual = tftp_client_get(tftp->file, tftp->server, tftp->port, tftp->mem,
                                tftpMaxSize, TFTP_OCTET, &err);
 
                if (tftp->actual < 0)