Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
jim tests: use installed
[openocd.git] / src / ecosboard.c
diff --git a/src/ecosboard.c b/src/ecosboard.c
index 58520c33bfebb4a902470ed68e1d0fc7091b3671..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  *
@@ -21,20 +21,19 @@
 #include "config.h"
 #endif
 
-#include "types.h"
-#include "jtag.h"
-#include "configuration.h"
-#include "xsvf.h"
-#include "svf.h"
-#include "nand.h"
-#include "pld.h"
+#include <helper/types.h>
+#include <jtag/jtag.h>
+#include <helper/ioutil.h>
+#include <helper/util.h>
+#include <helper/configuration.h>
 
-#include "server.h"
-#include "telnet_server.h"
-#include "gdb_server.h"
-#include "openocd.h"
+#include <server/server.h>
+#include <server/telnet_server.h>
+#include <server/gdb_server.h>
+#include <openocd.h>
+
+#include <helper/time_support.h>
 
-#include <time_support.h>
 #include <sys/time.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -56,32 +55,15 @@
 #include <cyg/athttpd/cgi.h>
 #include <cyg/athttpd/forms.h>
 #include <cyg/discover/discover.h>
-#include <cyg/hal/hal_diag.h>
-#include <cyg/kernel/kapi.h>
-#include <cyg/io/serialio.h>
 #include <cyg/io/io.h>
+#include <cyg/io/serialio.h>
 #include <netinet/tcp.h>
-#include "rom.h"
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <net/if.h>
-#include <arpa/inet.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <ifaddrs.h>
-#include <string.h>
-
-#include <unistd.h>
-#include <stdio.h>
+#include <cyg/hal/hal_diag.h>
 
+#include "rom.h"
 
 #ifdef CYGPKG_HAL_NIOS2
+#include <cyg/hal/io.h>
 #define ZY1000_SER_DEV "/dev/uart_0"
 #else
 #define ZY1000_SER_DEV "/dev/ser0"
@@ -118,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>
 
@@ -165,7 +143,14 @@ static void zylinjtag_reboot(cyg_addrword_t data)
        diag_printf("Unmounting /config..\n");
        umount("/config");
        diag_printf("Rebooting..\n");
+#ifdef CYGPKG_HAL_NIOS2
+       /* This will reboot & reconfigure the FPGA from the bootloader
+        * and on.
+        */
+       IOWR(REMOTE_UPDATE_BASE, 0x20, 0x1);
+#else
        HAL_PLATFORM_RESET();
+#endif
 }
 static cyg_thread zylinjtag_thread_object;
 static cyg_handle_t zylinjtag_thread_handle;
@@ -251,11 +236,21 @@ int zy1000_configuration_output_handler_log(struct command_context *context,
 }
 
 #ifdef CYGPKG_PROFILE_GPROF
+//extern int64_t totaltime;
 
-int eCosBoard_handle_eCosBoard_profile_command(struct command_context *cmd_ctx, char *cmd, char **args, int argc)
+static int zylinjtag_Jim_Command_profile(Jim_Interp *interp, int argc,
+               Jim_Obj * const *argv)
 {
-       command_print(cmd_ctx, "Profiling started");
-       start_profile();
+       if ((argc == 2) && (strcmp(Jim_GetString(argv[1], NULL), "stats")==0))
+       {
+//             profile_off();
+               //LOG_USER("Stats %dms sleeping in select()", (int)totaltime);
+       } else
+       {
+               LOG_USER("Profiling started");
+               start_profile();
+               //totaltime = 0;
+       }
        return ERROR_OK;
 }
 
@@ -505,7 +500,9 @@ static void zylinjtag_startNetwork(void)
 
        cyg_httpd_init_tcl_interpreter();
 
-       interp = httpstate.jim_interp;
+       // 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);
@@ -851,7 +848,7 @@ static int zylinjtag_Jim_Command_uart(Jim_Interp *interp, int argc,
        static int current_baud = 38400;
        if (argc == 1)
        {
-               command_print(cmd_ctx, "%d", current_baud);
+               Jim_SetResult(interp, Jim_NewIntObj(interp, current_baud));
                return JIM_OK;
        }
        else if (argc != 2)
@@ -887,8 +884,8 @@ static int zylinjtag_Jim_Command_uart(Jim_Interp *interp, int argc,
                baud = CYGNUM_SERIAL_BAUD_230400;
                break;
        default:
-               command_print(cmd_ctx, "unsupported baudrate");
-               return ERROR_INVALID_ARGUMENTS;
+               Jim_SetResult(interp, Jim_NewStringObj(interp, "unsupported baudrate", -1));
+               return JIM_ERR;
        }
 
        cyg_serial_info_t buf;
@@ -901,7 +898,7 @@ static int zylinjtag_Jim_Command_uart(Jim_Interp *interp, int argc,
        err = cyg_io_lookup(ZY1000_SER_DEV, &serial_handle);
        if (err != ENOERR)
        {
-               LOG_ERROR("Could not open serial port\n");
+               Jim_SetResult(interp, Jim_NewStringObj(interp, "Could not open serial port", -1));
                return JIM_ERR;
        }
 
@@ -911,7 +908,7 @@ static int zylinjtag_Jim_Command_uart(Jim_Interp *interp, int argc,
                        &len);
        if (err != ENOERR)
        {
-               LOG_ERROR("Failed to get serial port settings %d", err);
+               Jim_SetResult(interp, Jim_NewStringObj(interp, "Failed to get serial port settings", -1));
                return JIM_ERR;
        }
        buf.baud = baud;
@@ -920,7 +917,7 @@ static int zylinjtag_Jim_Command_uart(Jim_Interp *interp, int argc,
                        &len);
        if (err != ENOERR)
        {
-               LOG_ERROR("Failed to set serial port settings %d", err);
+               Jim_SetResult(interp, Jim_NewStringObj(interp, "Failed to set serial port settings", -1));
                return JIM_ERR;
        }
 
@@ -933,8 +930,6 @@ bool logAllToSerial = false;
 int boolParam(char *var);
 
 
-struct command_context *setup_command_handler(void);
-
 static const char *zylin_config_dir="/config/settings";
 
 static int add_default_dirs(void)
@@ -945,8 +940,6 @@ static int add_default_dirs(void)
        return ERROR_OK;
 }
 
-int ioutil_init(struct command_context *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
@@ -964,7 +957,11 @@ int main(int argc, char *argv[])
 
        diag_init_putc(_zylinjtag_diag_write_char);
        // We want this in the log.
-       diag_printf("Zylin ZY1000.\n");
+#ifdef CYGPKG_HAL_NIOS2
+       diag_printf("Zylin ZY1000 PCB revc.\n");
+#else
+       diag_printf("Zylin ZY1000 PCB revb.\n");
+#endif
 
        err = mount("", "/ram", "ramfs");
        if (err < 0)
@@ -1003,6 +1000,20 @@ int main(int argc, char *argv[])
 
        copydir("/rom", "/ram/cgi");
 
+#ifdef CYGPKG_HAL_NIOS2
+       cyg_flashaddr_t err_address;
+#define UNCACHED_EXT_FLASH_BASE (0x80000000 + EXT_FLASH_BASE)
+       /* The revc flash is locked upon reset, unlock it */
+#ifdef CYGHWR_IO_FLASH_BLOCK_LOCKING
+       if ((err = flash_unlock((void *) UNCACHED_EXT_FLASH_BASE, EXT_FLASH_SPAN,
+                       (void **) &err_address)) != 0)
+       {
+               diag_printf("Error: could not unlock flash\n");
+       }
+#endif
+#endif
+
+
        err = mount("/dev/flash1", "/config", "jffs2");
        if (err < 0)
        {
@@ -1078,33 +1089,26 @@ int main(int argc, char *argv[])
 
        /* initialize commandline interface */
        struct command_context * cmd_ctx;
-       cmd_ctx = setup_command_handler();
+       struct command_context *setup_command_handler(Jim_Interp *interp);
+       cmd_ctx = setup_command_handler(httpstate.jim_interp);
        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)
-       {
+       if (util_init(cmd_ctx) != ERROR_OK)
                return EXIT_FAILURE;
-       }
-#endif
 
+       if (ioutil_init(cmd_ctx) != ERROR_OK)
+               return EXIT_FAILURE;
 
 #ifdef CYGPKG_PROFILE_GPROF
-       register_command(cmd_ctx, NULL, "ecosboard_profile", eCosBoard_handle_eCosBoard_profile_command,
-                       COMMAND_ANY, NULL);
+       Jim_CreateCommand(httpstate.jim_interp, "zy1000_profile", zylinjtag_Jim_Command_profile,
+                       NULL, NULL);
 #endif
 
-       Jim_CreateCommand(interp, "uart", zylinjtag_Jim_Command_uart, NULL, NULL);
+       Jim_CreateCommand(httpstate.jim_interp, "zy1000_uart", zylinjtag_Jim_Command_uart, NULL, NULL);
 
 
-       int errVal;
-       errVal = log_init(cmd_ctx);
-       if (errVal != ERROR_OK)
-       {
-               diag_printf("log_init() failed %d\n", errVal);
-               exit(-1);
-       }
+       log_init();
 
        set_log_output(cmd_ctx, log);
 
@@ -1121,6 +1125,11 @@ int main(int argc, char *argv[])
 
        command_run_linef(cmd_ctx, "script /rom/openocd.cfg");
 
+       int ret;
+       ret = server_init(cmd_ctx);
+       if (ERROR_OK != ret)
+               return EXIT_FAILURE;
+
        /* we MUST always run the init command as it will launch telnet sessions */
        command_run_line(cmd_ctx, "init");
 
@@ -1272,6 +1281,7 @@ struct Tftp
        cyg_uint8 *mem;
        int actual;
        char *server;
+       int port;
        char *file;
 };
 
@@ -1328,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)
        {
@@ -1345,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)
Open On-Chip Debugger

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)