X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fecosboard.c;h=38f32525abad8d94bf22563f6f0994f24f43a0a7;hp=d6bb0a4016a5cac3d3e7da1f5cbd6d26d0cece99;hb=78c6b922e21849ed8a2d3af4ca55c84c3d1ac185;hpb=13e592f9f68de793bd6681fc8cb43091031cb7c0 diff --git a/src/ecosboard.c b/src/ecosboard.c index d6bb0a4016..38f32525ab 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 * @@ -93,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 @@ -114,8 +114,8 @@ static bool writeLog = true; char hwaddr[512]; -extern flash_driver_t *flash_drivers[]; -extern target_type_t *target_types[]; +extern struct flash_driver *flash_drivers[]; +extern struct target_type *target_types[]; #ifdef CYGPKG_PROFILE_GPROF #include @@ -155,8 +155,8 @@ static char reboot_stack[2048]; static void zylinjtag_reboot(cyg_addrword_t data) { serialLog = true; - diag_printf("Rebooting in 100 ticks..\n"); - cyg_thread_delay(100); + diag_printf("Rebooting in 500 ticks..\n"); + cyg_thread_delay(500); diag_printf("Unmounting /config..\n"); umount("/config"); diag_printf("Rebooting..\n"); @@ -173,7 +173,63 @@ void reboot(void) cyg_thread_resume(zylinjtag_thread_handle); } -int configuration_output_handler(struct command_context_s *context, +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 *context, const char* line) { diag_printf("%s", line); @@ -181,7 +237,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); @@ -191,7 +247,7 @@ int zy1000_configuration_output_handler_log(struct command_context_s *context, #ifdef CYGPKG_PROFILE_GPROF -int eCosBoard_handle_eCosBoard_profile_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +int eCosBoard_handle_eCosBoard_profile_command(struct command_context *cmd_ctx, char *cmd, char **args, int argc) { command_print(cmd_ctx, "Profiling started"); start_profile(); @@ -202,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; @@ -253,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) @@ -272,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; @@ -309,6 +366,7 @@ void format(void) } diag_printf("Flash formatted successfully\n"); +#endif reboot(); } @@ -416,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. @@ -432,6 +489,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); @@ -443,7 +504,7 @@ static void zylinjtag_startNetwork(void) Jim_CreateCommand(httpstate.jim_interp, "log", zylinjtag_Jim_Command_log, NULL, NULL); - Jim_CreateCommand(httpstate.jim_interp, "reboot", + Jim_CreateCommand(httpstate.jim_interp, "zy1000_reboot", zylinjtag_Jim_Command_reboot, NULL, NULL); Jim_CreateCommand(httpstate.jim_interp, "threads", zylinjtag_Jim_Command_threads, NULL, NULL); @@ -529,6 +590,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; @@ -537,6 +599,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; @@ -563,6 +626,9 @@ void setNoDelay(int session, int flag) #endif } +#define TEST_TCPIP() 0 + +#if TEST_TCPIP struct { int req; @@ -571,6 +637,7 @@ struct int actual2; } tcpipSent[512 * 1024]; int cur; +#endif static void zylinjtag_uart(cyg_addrword_t data) { @@ -635,7 +702,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; @@ -680,7 +749,6 @@ static void zylinjtag_uart(cyg_addrword_t data) pos2 = 0; } - size_t x = actual2; size_t y = 0; if (actual2 > 0) { @@ -710,7 +778,6 @@ static void zylinjtag_uart(cyg_addrword_t data) actual += t; } - int x2 = actual; int y2 = 0; if (actual > 0) { @@ -736,6 +803,7 @@ static void zylinjtag_uart(cyg_addrword_t data) } y2 = written; } +#if TEST_TCPIP if (cur < 1024) { tcpipSent[cur].req = x; @@ -744,11 +812,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++) { @@ -756,6 +825,7 @@ static void zylinjtag_uart(cyg_addrword_t data) tcpipSent[i].req2, tcpipSent[i].actual2); } +#endif } close(fd); @@ -770,7 +840,7 @@ void startUart(void) cyg_thread_resume(zylinjtag_uart_thread_handle); } -int handle_uart_command(struct command_context_s *cmd_ctx, char *cmd, +int handle_uart_command(struct command_context *cmd_ctx, char *cmd, char **args, int argc) { static int current_baud = 38400; @@ -854,11 +924,11 @@ bool logAllToSerial = false; int boolParam(char *var); -command_context_t *setup_command_handler(void); +struct command_context *setup_command_handler(void); 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"); @@ -866,7 +936,7 @@ int add_default_dirs(void) return ERROR_OK; } -int ioutil_init(struct command_context_s *cmd_ctx); +int ioutil_init(struct command_context *cmd_ctx); int main(int argc, char *argv[]) { @@ -975,13 +1045,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); @@ -998,7 +1068,7 @@ int main(int argc, char *argv[]) add_default_dirs(); /* initialize commandline interface */ - command_context_t * cmd_ctx; + struct command_context * cmd_ctx; cmd_ctx = setup_command_handler(); command_set_output_handler(cmd_ctx, configuration_output_handler, NULL); command_context_mode(cmd_ctx, COMMAND_CONFIG); @@ -1036,7 +1106,7 @@ 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"); } @@ -1130,7 +1200,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, @@ -1151,12 +1221,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 -// ); +//); // ------------------------------------------------------------------------- @@ -1459,8 +1529,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,