/***************************************************************************
- * Copyright (C) 2007-2009 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 *
#include <helper/types.h>
#include <jtag/jtag.h>
#include <helper/ioutil.h>
+#include <helper/util.h>
#include <helper/configuration.h>
#include <server/server.h>
char hwaddr[512];
-
-extern struct flash_driver *flash_drivers[];
-extern struct target_type *target_types[];
-
#ifdef CYGPKG_PROFILE_GPROF
#include <cyg/profile/profile.h>
cyg_httpd_init_tcl_interpreter();
+ // 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);
Jim_CreateCommand(httpstate.jim_interp, "zy1000_reboot",
static int current_baud = 38400;
if (argc == 1)
{
- command_print(cmd_ctx, "%d", current_baud);
+ Jim_SetResult(interp, Jim_NewIntObj(interp, current_baud));
return JIM_OK;
}
else if (argc != 2)
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;
err = cyg_io_lookup(ZY1000_SER_DEV, &serial_handle);
if (err != ENOERR)
{
- LOG_ERROR("Could not open serial port\n");
+ Jim_SetResult(interp, Jim_NewStringObj(interp, "Could not open serial port", -1));
return JIM_ERR;
}
&len);
if (err != ENOERR)
{
- LOG_ERROR("Failed to get serial port settings %d", err);
+ Jim_SetResult(interp, Jim_NewStringObj(interp, "Failed to get serial port settings", -1));
return JIM_ERR;
}
buf.baud = baud;
&len);
if (err != ENOERR)
{
- LOG_ERROR("Failed to set serial port settings %d", err);
+ Jim_SetResult(interp, Jim_NewStringObj(interp, "Failed to set serial port settings", -1));
return JIM_ERR;
}
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)
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)
{
command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
command_context_mode(cmd_ctx, COMMAND_CONFIG);
+ if (util_init(cmd_ctx) != ERROR_OK)
+ return EXIT_FAILURE;
+
if (ioutil_init(cmd_ctx) != ERROR_OK)
return EXIT_FAILURE;
NULL, NULL);
#endif
- Jim_CreateCommand(httpstate.jim_interp, "uart", zylinjtag_Jim_Command_uart, NULL, NULL);
+ Jim_CreateCommand(httpstate.jim_interp, "zy1000_uart", zylinjtag_Jim_Command_uart, NULL, NULL);
log_init();
cyg_uint8 *mem;
int actual;
char *server;
+ int port;
char *file;
};
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)
{
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)