#include "jtag.h"
#include "configuration.h"
#include "xsvf.h"
+#include "svf.h"
#include "target.h"
#include "flash.h"
#include "nand.h"
#include <time_support.h>
#include <sys/time.h>
-#include <sys/types.h>
-#include <strings.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <stdio.h>
+
+
#define MAX_IFS 64
#if defined(CYGPKG_NET_FREEBSD_STACK)
#include <tftp_support.h>
(int (*)(const char *, int))open,
close,
(int (*)(int, const void *, int))write,
- ( int (*)(int, void *, int))read
+ (int (*)(int, void *, int))read
};
#endif
}
#endif
-extern int eth0_up;
static FILE *log;
static char reboot_stack[2048];
}
#ifdef CYGPKG_PROFILE_GPROF
-extern void start_profile();
int eCosBoard_handle_eCosBoard_profile_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
#endif
-externC void phi_init_all_network_interfaces();
+externC void phi_init_all_network_interfaces(void);
command_context_t *cmd_ctx;
static bool webRunning = false;
-void keep_webserver()
+void keep_webserver(void)
{
// Target initialisation is only attempted at startup, so we sleep forever and
// let the http server bail us out(i.e. get config files set up).
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 openocd_sleep_prelude(void)
{
cyg_mutex_unlock(&httpstate.jim_lock);
}
-void openocd_sleep_postlude()
+void openocd_sleep_postlude(void)
{
cyg_mutex_lock(&httpstate.jim_lock);
}
}
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();
}
return JIM_OK;
}
-static int zylinjtag_Jim_Command_mac(Jim_Interp *interp, int argc,
- Jim_Obj * const *argv)
-{
-
- Jim_Obj *tclOutput = Jim_NewStringObj(interp, "", 0);
-
- Jim_AppendString(httpstate.jim_interp, tclOutput, hwaddr, strlen(hwaddr));
-
- Jim_SetResult(interp, tclOutput);
-
- return JIM_OK;
-}
-
-static int zylinjtag_Jim_Command_ip(Jim_Interp *interp, int argc,
- Jim_Obj * const *argv)
-{
- Jim_Obj *tclOutput = Jim_NewStringObj(interp, "", 0);
-
- struct ifaddrs *ifa = NULL, *ifp = NULL;
-
- if (getifaddrs(&ifp) < 0)
- {
- return JIM_ERR;
- }
-
- for (ifa = ifp; ifa; ifa = ifa->ifa_next)
- {
- char ip[200];
- socklen_t salen;
-
- if (ifa->ifa_addr->sa_family == AF_INET)
- salen = sizeof(struct sockaddr_in);
- else if (ifa->ifa_addr->sa_family == AF_INET6)
- salen = sizeof(struct sockaddr_in6);
- else
- continue;
-
- if (getnameinfo(ifa->ifa_addr, salen, ip, sizeof(ip), NULL, 0,
- NI_NUMERICHOST) < 0)
- {
- continue;
- }
-
- Jim_AppendString(httpstate.jim_interp, tclOutput, ip, strlen(ip));
- break;
-
- }
-
- freeifaddrs(ifp);
-
- Jim_SetResult(interp, tclOutput);
-
- return JIM_OK;
-}
-
-extern Jim_Interp *interp;
-static void zylinjtag_startNetwork()
+static void zylinjtag_startNetwork(void)
{
// Bring TCP/IP up immediately before we're ready to accept commands.
//
zylinjtag_Jim_Command_reboot, NULL, NULL);
Jim_CreateCommand(httpstate.jim_interp, "threads",
zylinjtag_Jim_Command_threads, NULL, NULL);
- Jim_CreateCommand(httpstate.jim_interp, "mac", zylinjtag_Jim_Command_mac,
- NULL, NULL);
- Jim_CreateCommand(httpstate.jim_interp, "ip", zylinjtag_Jim_Command_ip,
- NULL, NULL);
Jim_CreateCommand(httpstate.jim_interp, "format_jffs2",
zylinjtag_Jim_Command_format_jffs2, NULL, NULL);
#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;
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)
{
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);
int boolParam(char *var);
-command_context_t *setup_command_handler();
+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)
{
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
}
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);
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);
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)
+ {
+ return EXIT_FAILURE;
+ }
+#endif
+
+
#ifdef CYGPKG_PROFILE_GPROF
register_command(cmd_ctx, NULL, "ecosboard_profile", eCosBoard_handle_eCosBoard_profile_command,
COMMAND_ANY, NULL);
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*).
#include <cyg/kernel/ktypes.h> // base kernel types
#include <cyg/infra/cyg_trac.h> // tracing macros
#include <cyg/infra/cyg_ass.h> // assertion macros
-#include <unistd.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <dirent.h>
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
#include <cyg/fileio/fileio.h>
-
#include <cyg/kernel/kapi.h>
#include <cyg/infra/diag.h>
// 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,
- 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,
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;
+}
+