X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fecosboard.c;h=0805e6fcb93c2c88c5db1d606750cef2dc39021e;hp=b537e5bcdae6dd069a83033a98e4266cdbf4922d;hb=559d08c19ed838f7bb2a77ce56a5a274641111f8;hpb=40ac8d775375bd96b06a5a54cdd9829f60c8ebc4;ds=sidebyside diff --git a/src/ecosboard.c b/src/ecosboard.c index b537e5bcda..0805e6fcb9 100644 --- a/src/ecosboard.c +++ b/src/ecosboard.c @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2008 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,23 +21,19 @@ #include "config.h" #endif -#include "log.h" -#include "types.h" -#include "jtag.h" -#include "configuration.h" -#include "xsvf.h" -#include "svf.h" -#include "target.h" -#include "flash.h" -#include "nand.h" -#include "pld.h" - -#include "command.h" -#include "server.h" -#include "telnet_server.h" -#include "gdb_server.h" - -#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include + #include #include #include @@ -59,29 +55,20 @@ #include #include #include -#include -#include -#include #include +#include #include +#include + #include "rom.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#ifdef CYGPKG_HAL_NIOS2 +#include +#define ZY1000_SER_DEV "/dev/uart_0" +#else +#define ZY1000_SER_DEV "/dev/ser0" + +#endif #define MAX_IFS 64 @@ -113,10 +100,6 @@ static bool writeLog = true; char hwaddr[512]; - -extern flash_driver_t *flash_drivers[]; -extern target_type_t *target_types[]; - #ifdef CYGPKG_PROFILE_GPROF #include @@ -160,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; @@ -229,7 +219,7 @@ void reboot_port(void) cyg_thread_resume(zylinjtag_reboot_port_thread_handle); } -int configuration_output_handler(struct command_context_s *context, +int configuration_output_handler(struct command_context *context, const char* line) { diag_printf("%s", line); @@ -237,7 +227,7 @@ int configuration_output_handler(struct command_context_s *context, return ERROR_OK; } -int zy1000_configuration_output_handler_log(struct command_context_s *context, +int zy1000_configuration_output_handler_log(struct command_context *context, const char* line) { LOG_USER_N("%s", line); @@ -246,11 +236,21 @@ int zy1000_configuration_output_handler_log(struct command_context_s *context, } #ifdef CYGPKG_PROFILE_GPROF +//extern int64_t totaltime; -int eCosBoard_handle_eCosBoard_profile_command(struct command_context_s *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; } @@ -258,7 +258,7 @@ int eCosBoard_handle_eCosBoard_profile_command(struct command_context_s *cmd_ctx externC void phi_init_all_network_interfaces(void); -command_context_t *cmd_ctx; +struct command_context *cmd_ctx; static bool webRunning = false; @@ -328,6 +328,7 @@ void openocd_sleep_postlude(void) void format(void) { +#ifdef CYGDAT_IO_FLASH_BLOCK_DEVICE_NAME_1 diag_printf("Formatting JFFS2...\n"); cyg_io_handle_t handle; @@ -365,6 +366,7 @@ void format(void) } diag_printf("Flash formatted successfully\n"); +#endif reboot(); } @@ -472,7 +474,6 @@ static int zylinjtag_Jim_Command_reboot(Jim_Interp *interp, int argc, return JIM_OK; } - static void zylinjtag_startNetwork(void) { // Bring TCP/IP up immediately before we're ready to accept commands. @@ -499,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); @@ -589,6 +592,7 @@ static void print_exception_handler(cyg_addrword_t data, cyg_code_t exception, } +#ifdef CYGNUM_HAL_VECTOR_UNDEF_INSTRUCTION static void setHandler(cyg_code_t exception) { cyg_exception_handler_t *old_handler; @@ -597,6 +601,7 @@ static void setHandler(cyg_code_t exception) cyg_exception_set_handler(exception, print_exception_handler, 0, &old_handler, &old_data); } +#endif static cyg_thread zylinjtag_uart_thread_object; static cyg_handle_t zylinjtag_uart_thread_handle; @@ -623,6 +628,9 @@ void setNoDelay(int session, int flag) #endif } +#define TEST_TCPIP() 0 + +#if TEST_TCPIP struct { int req; @@ -631,6 +639,7 @@ struct int actual2; } tcpipSent[512 * 1024]; int cur; +#endif static void zylinjtag_uart(cyg_addrword_t data) { @@ -680,7 +689,7 @@ static void zylinjtag_uart(cyg_addrword_t data) int oldopts = fcntl(session, F_GETFL, 0); fcntl(session, F_SETFL, oldopts | O_NONBLOCK); // - int serHandle = open("/dev/ser0", O_RDWR | O_NONBLOCK); + int serHandle = open(ZY1000_SER_DEV, O_RDWR | O_NONBLOCK); if (serHandle < 0) { close(session); @@ -695,7 +704,9 @@ static void zylinjtag_uart(cyg_addrword_t data) size_t pos, pos2; pos = 0; pos2 = 0; +#if TEST_TCPIP cur = 0; +#endif for (;;) { fd_set write_fds; @@ -740,7 +751,6 @@ static void zylinjtag_uart(cyg_addrword_t data) pos2 = 0; } - size_t x = actual2; size_t y = 0; if (actual2 > 0) { @@ -770,7 +780,6 @@ static void zylinjtag_uart(cyg_addrword_t data) actual += t; } - int x2 = actual; int y2 = 0; if (actual > 0) { @@ -796,6 +805,7 @@ static void zylinjtag_uart(cyg_addrword_t data) } y2 = written; } +#if TEST_TCPIP if (cur < 1024) { tcpipSent[cur].req = x; @@ -804,11 +814,12 @@ static void zylinjtag_uart(cyg_addrword_t data) tcpipSent[cur].actual2 = y2; cur++; } - +#endif } closeSession: close(session); close(serHandle); +#if TEST_TCPIP int i; for (i = 0; i < 1024; i++) { @@ -816,6 +827,7 @@ static void zylinjtag_uart(cyg_addrword_t data) tcpipSent[i].req2, tcpipSent[i].actual2); } +#endif } close(fd); @@ -830,21 +842,25 @@ void startUart(void) cyg_thread_resume(zylinjtag_uart_thread_handle); } -int handle_uart_command(struct command_context_s *cmd_ctx, char *cmd, - char **args, int argc) +static int zylinjtag_Jim_Command_uart(Jim_Interp *interp, int argc, + Jim_Obj * const *argv) { static int current_baud = 38400; - if (argc == 0) + if (argc == 1) { - command_print(cmd_ctx, "%d", current_baud); - return ERROR_OK; + Jim_SetResult(interp, Jim_NewIntObj(interp, current_baud)); + return JIM_OK; } - else if (argc != 1) + else if (argc != 2) { - return ERROR_INVALID_ARGUMENTS; + return JIM_ERR; } - current_baud = atol(args[0]); + long new_baudrate; + if (Jim_GetLong(interp, argv[1], &new_baudrate) != JIM_OK) + return JIM_ERR; + + current_baud = new_baudrate; int baud; switch (current_baud) @@ -868,8 +884,8 @@ int handle_uart_command(struct command_context_s *cmd_ctx, char *cmd, 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; @@ -879,11 +895,11 @@ int handle_uart_command(struct command_context_s *cmd_ctx, char *cmd, int err; cyg_io_handle_t serial_handle; - err = cyg_io_lookup("/dev/ser0", &serial_handle); + err = cyg_io_lookup(ZY1000_SER_DEV, &serial_handle); if (err != ENOERR) { - LOG_ERROR("/dev/ser0 not found\n"); - return ERROR_FAIL; + Jim_SetResult(interp, Jim_NewStringObj(interp, "Could not open serial port", -1)); + return JIM_ERR; } err = cyg_io_get_config(serial_handle, @@ -892,8 +908,8 @@ int handle_uart_command(struct command_context_s *cmd_ctx, char *cmd, &len); if (err != ENOERR) { - command_print(cmd_ctx, "Failed to get serial port settings %d", err); - return ERROR_OK; + Jim_SetResult(interp, Jim_NewStringObj(interp, "Failed to get serial port settings", -1)); + return JIM_ERR; } buf.baud = baud; @@ -901,11 +917,11 @@ int handle_uart_command(struct command_context_s *cmd_ctx, char *cmd, &len); if (err != ENOERR) { - command_print(cmd_ctx, "Failed to set serial port settings %d", err); - return ERROR_OK; + Jim_SetResult(interp, Jim_NewStringObj(interp, "Failed to set serial port settings", -1)); + return JIM_ERR; } - return ERROR_OK; + return JIM_OK; } bool logAllToSerial = false; @@ -914,8 +930,6 @@ bool logAllToSerial = false; int boolParam(char *var); -command_context_t *setup_command_handler(void); - static const char *zylin_config_dir="/config/settings"; static int add_default_dirs(void) @@ -926,8 +940,6 @@ static int add_default_dirs(void) return ERROR_OK; } -int ioutil_init(struct command_context_s *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 @@ -945,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) @@ -984,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) { @@ -1058,34 +1088,27 @@ int main(int argc, char *argv[]) add_default_dirs(); /* initialize commandline interface */ - command_context_t * cmd_ctx; - cmd_ctx = setup_command_handler(); + struct command_context * cmd_ctx; + 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 - register_command(cmd_ctx, NULL, "uart", handle_uart_command, COMMAND_ANY, - "uart - forward uart on port 5555"); + 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); @@ -1102,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"); @@ -1253,6 +1281,7 @@ struct Tftp cyg_uint8 *mem; int actual; char *server; + int port; char *file; }; @@ -1309,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) { @@ -1326,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)