/***************************************************************************
- * 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 *
(int (*)(const char *, int))open,
close,
(int (*)(int, const void *, int))write,
- ( int (*)(int, void *, int))read
+ (int (*)(int, void *, int))read
};
#endif
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");
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)
{
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)
void format(void)
{
+#ifdef CYGDAT_IO_FLASH_BLOCK_DEVICE_NAME_1
diag_printf("Formatting JFFS2...\n");
cyg_io_handle_t handle;
}
diag_printf("Flash formatted successfully\n");
+#endif
reboot();
}
return JIM_OK;
}
-
static void zylinjtag_startNetwork(void)
{
// Bring TCP/IP up immediately before we're ready to accept commands.
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);
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);
}
+#ifdef CYGNUM_HAL_VECTOR_UNDEF_INSTRUCTION
static void setHandler(cyg_code_t exception)
{
cyg_exception_handler_t *old_handler;
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;
#endif
}
+#define TEST_TCPIP() 0
+
+#if TEST_TCPIP
struct
{
int req;
int actual2;
} tcpipSent[512 * 1024];
int cur;
+#endif
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;
pos2 = 0;
}
- size_t x = actual2;
size_t y = 0;
if (actual2 > 0)
{
actual += t;
}
- int x2 = actual;
int y2 = 0;
if (actual > 0)
{
}
y2 = written;
}
+#if TEST_TCPIP
if (cur < 1024)
{
tcpipSent[cur].req = x;
tcpipSent[cur].actual2 = y2;
cur++;
}
-
+#endif
}
closeSession: close(session);
close(serHandle);
+#if TEST_TCPIP
int i;
for (i = 0; i < 1024; i++)
{
tcpipSent[i].req2, tcpipSent[i].actual2);
}
+#endif
}
close(fd);
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");
// 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,
// 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
-// );
+//);
// -------------------------------------------------------------------------
// 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,
+FSTAB_ENTRY(logfs_fste, "logfs", 0,
CYG_SYNCMODE_FILE_FILESYSTEM | CYG_SYNCMODE_IO_FILESYSTEM,
logfs_mount,
logfs_umount,
projects / fw / openocd / blobdiff