X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fecosboard.c;h=419f038ded7a14fc6af4c38e10f3b069d2834ea0;hp=f398ae2a229b5e6522a07283eb0a731e57aa8c22;hb=016e7ebbfa034926c980b4b33b964f6078541690;hpb=dda225b7b3a0fb1919abf2d7b8a90f6815706d86 diff --git a/src/ecosboard.c b/src/ecosboard.c index f398ae2a22..419f038ded 100644 --- a/src/ecosboard.c +++ b/src/ecosboard.c @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2008 by Øyvind Harboe * + * Copyright (C) 2007-2008 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 * @@ -39,7 +39,6 @@ #include #include -#include #include #include #include @@ -94,7 +93,7 @@ struct tftpd_fileops fileops = (int (*)(const char *, int))open, close, (int (*)(int, const void *, int))write, - ( int (*)(int, void *, int))read + (int (*)(int, void *, int))read }; #endif @@ -149,7 +148,6 @@ void start_profile(void) } #endif -extern int eth0_up; static FILE *log; static char reboot_stack[2048]; @@ -175,6 +173,62 @@ void reboot(void) cyg_thread_resume(zylinjtag_thread_handle); } +static char zylinjtag_reboot_port_stack[2048]; +static cyg_thread zylinjtag_reboot_port_thread_object; +static cyg_handle_t zylinjtag_reboot_port_thread_handle; + +static void zylinjtag_reboot_port_task(cyg_addrword_t data) +{ + int so_reuseaddr_option = 1; + + int fd; + if ((fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) + { + LOG_ERROR("error creating socket: %s", strerror(errno)); + exit(-1); + } + + setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void*) &so_reuseaddr_option, + sizeof(int)); + + struct sockaddr_in sin; + unsigned int address_size; + address_size = sizeof(sin); + memset(&sin, 0, sizeof(sin)); + sin.sin_family = AF_INET; + sin.sin_addr.s_addr = INADDR_ANY; + sin.sin_port = htons(1234); + + if (bind(fd, (struct sockaddr *) &sin, sizeof(sin)) == -1) + { + LOG_ERROR("couldn't bind to socket: %s", strerror(errno)); + exit(-1); + } + + if (listen(fd, 1) == -1) + { + LOG_ERROR("couldn't listen on socket: %s", strerror(errno)); + exit(-1); + } + // socket_nonblock(fd); + + + accept(fd, (struct sockaddr *) &sin, &address_size); + + diag_printf("Got reboot signal on port 1234"); + + reboot(); + +} + +void reboot_port(void) +{ + cyg_thread_create(1, zylinjtag_reboot_port_task, (cyg_addrword_t) 0, "wait for reboot signal on port 1234", + (void *) zylinjtag_reboot_port_stack, sizeof(zylinjtag_reboot_port_stack), + &zylinjtag_reboot_port_thread_handle, &zylinjtag_reboot_port_thread_object); + cyg_thread_resume(zylinjtag_reboot_port_thread_handle); +} + int configuration_output_handler(struct command_context_s *context, const char* line) { @@ -192,7 +246,6 @@ int zy1000_configuration_output_handler_log(struct command_context_s *context, } #ifdef CYGPKG_PROFILE_GPROF -extern void start_profile(void); int eCosBoard_handle_eCosBoard_profile_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { @@ -256,11 +309,11 @@ void copyfile(char *name2, char *name1); void copydir(char *name, char *destdir); #if 0 -MTAB_ENTRY( romfs_mte1, +MTAB_ENTRY(romfs_mte1, "/rom", "romfs", "", - (CYG_ADDRWORD) &filedata[0] ); + (CYG_ADDRWORD) &filedata[0]); #endif void openocd_sleep_prelude(void) @@ -298,18 +351,16 @@ void format(void) } cyg_io_flash_getconfig_erase_t e; - void *err_addr; len = sizeof(e); e.offset = 0; e.len = ds.dev_size; - e.err_address = &err_addr; - diag_printf("Formatting 0x%08x bytes\n", ds.dev_size); + diag_printf("Formatting 0x%08x bytes\n", (int)ds.dev_size); err = cyg_io_get_config(handle, CYG_IO_GET_CONFIG_FLASH_ERASE, &e, &len); if (err != ENOERR) { - diag_printf("Flash erase error %d offset 0x%p\n", err, err_addr); + diag_printf("Flash erase error %d offset 0x%08x\n", err, e.err_address); reboot(); } @@ -422,8 +473,6 @@ static int zylinjtag_Jim_Command_reboot(Jim_Interp *interp, int argc, } -extern Jim_Interp *interp; - static void zylinjtag_startNetwork(void) { // Bring TCP/IP up immediately before we're ready to accept commands. @@ -439,6 +488,10 @@ static void zylinjtag_startNetwork(void) diag_printf("Network not up and running\n"); exit(-1); } + + /* very first thing we want is a reboot capability */ + reboot_port(); + #if defined(CYGPKG_NET_FREEBSD_STACK) /*start TFTP*/ tftpd_start(69, &fileops); @@ -637,9 +690,9 @@ static void zylinjtag_uart(cyg_addrword_t data) #ifdef CYGPKG_PROFILE_GPROF start_profile(); #endif - int actual = 0; - int actual2 = 0; - int pos, pos2; + size_t actual = 0; + size_t actual2 = 0; + size_t pos, pos2; pos = 0; pos2 = 0; cur = 0; @@ -672,9 +725,11 @@ static void zylinjtag_uart(cyg_addrword_t data) if (actual2 <= 0) { memset(backwardBuffer, 's', sizeof(backwardBuffer)); - actual2 = read(serHandle, backwardBuffer, + int t; + t = read(serHandle, backwardBuffer, sizeof(backwardBuffer)); - if (actual2 < 0) + actual2 = t; + if (t < 0) { if (errno != EAGAIN) { @@ -685,8 +740,8 @@ static void zylinjtag_uart(cyg_addrword_t data) pos2 = 0; } - int x = actual2; - int y = 0; + size_t x = actual2; + size_t y = 0; if (actual2 > 0) { int written = write(session, backwardBuffer + pos2, actual2); @@ -861,9 +916,9 @@ int boolParam(char *var); command_context_t *setup_command_handler(void); -extern const char *zylin_config_dir; +static const char *zylin_config_dir="/config/settings"; -int add_default_dirs(void) +static int add_default_dirs(void) { add_script_search_dir(zylin_config_dir); add_script_search_dir("/rom/lib/openocd"); @@ -980,13 +1035,13 @@ int main(int argc, char *argv[]) } mkdir(zylin_config_dir, 0777); - char *dirname=alloc_printf("%s/target", zylin_config_dir); + char *dirname = alloc_printf("%s/target", zylin_config_dir); mkdir(dirname, 0777); free(dirname); - dirname=alloc_printf("%s/board", zylin_config_dir); + dirname = alloc_printf("%s/board", zylin_config_dir); mkdir(dirname, 0777); free(dirname); - dirname=alloc_printf("%s/event", zylin_config_dir); + dirname = alloc_printf("%s/event", zylin_config_dir); mkdir(dirname, 0777); free(dirname); @@ -1041,12 +1096,15 @@ int main(int argc, char *argv[]) if (logAllToSerial) { diag_printf( - "%s/logserial=1 => sending log output to serial port using \"debug_level 3\" as default.\n", zylin_config_dir); + "%s/logserial = 1 => sending log output to serial port using \"debug_level 3\" as default.\n", zylin_config_dir); command_run_line(cmd_ctx, "debug_level 3"); } command_run_linef(cmd_ctx, "script /rom/openocd.cfg"); + /* we MUST always run the init command as it will launch telnet sessions */ + command_run_line(cmd_ctx, "init"); + // FIX!!! Yuk! // diag_printf() is really invoked from many more places than we trust it // not to cause instabilities(e.g. invoking fputc() from an interrupt is *BAD*). @@ -1132,7 +1190,7 @@ static int tftpfs_fo_lseek(struct CYG_FILE_TAG *fp, off_t *apos, int whence); // For simplicity we use _FILESYSTEM synchronization for all accesses since // we should never block in any filesystem operations. #if 1 -FSTAB_ENTRY( tftpfs_fste, "tftpfs", 0, +FSTAB_ENTRY(tftpfs_fste, "tftpfs", 0, CYG_SYNCMODE_NONE, tftpfs_mount, tftpfs_umount, @@ -1153,12 +1211,12 @@ FSTAB_ENTRY( tftpfs_fste, "tftpfs", 0, // mtab entry. // This defines a single ROMFS loaded into ROM at the configured address // -// MTAB_ENTRY( rom_mte, // structure name +// MTAB_ENTRY(rom_mte, // structure name // "/rom", // mount point // "romfs", // FIlesystem type // "", // hardware device // (CYG_ADDRWORD) CYGNUM_FS_ROM_BASE_ADDRESS // Address in ROM -// ); +//); // ------------------------------------------------------------------------- @@ -1461,8 +1519,8 @@ static int logfs_fo_close(struct CYG_FILE_TAG *fp); // This defines the entry in the filesystem table. // For simplicity we use _FILESYSTEM synchronization for all accesses since // we should never block in any filesystem operations. -FSTAB_ENTRY( logfs_fste, "logfs", 0, - CYG_SYNCMODE_FILE_FILESYSTEM|CYG_SYNCMODE_IO_FILESYSTEM, +FSTAB_ENTRY(logfs_fste, "logfs", 0, + CYG_SYNCMODE_FILE_FILESYSTEM | CYG_SYNCMODE_IO_FILESYSTEM, logfs_mount, logfs_umount, logfs_open, @@ -1549,3 +1607,26 @@ static int logfs_fo_close(struct CYG_FILE_TAG *fp) return ENOERR; } +int loadFile(const char *fileName, void **data, int *len); + +/* boolean parameter stored on config */ +int boolParam(char *var) +{ + bool result = false; + char *name = alloc_printf("%s/%s", zylin_config_dir, var); + if (name == NULL) + return result; + + void *data; + int len; + if (loadFile(name, &data, &len) == ERROR_OK) + { + if (len > 1) + len = 1; + result = strncmp((char *) data, "1", len) == 0; + free(data); + } + free(name); + return result; +} +