#include "config.h"
#endif
-#include "types.h"
-#include "jtag.h"
-#include "configuration.h"
-#include "xsvf.h"
-#include "svf.h"
-#include "nand.h"
-#include "pld.h"
-
-#include "server.h"
-#include "telnet_server.h"
-#include "gdb_server.h"
-#include "openocd.h"
-
-#include <time_support.h>
+#include <helper/types.h>
+#include <jtag/jtag.h>
+#include <helper/ioutil.h>
+#include <helper/configuration.h>
+
+#include <server/server.h>
+#include <server/telnet_server.h>
+#include <server/gdb_server.h>
+#include <openocd.h>
+
+#include <helper/time_support.h>
+
#include <sys/time.h>
#include <stdio.h>
#include <stdlib.h>
#include <cyg/athttpd/cgi.h>
#include <cyg/athttpd/forms.h>
#include <cyg/discover/discover.h>
-#include <cyg/hal/hal_diag.h>
-#include <cyg/kernel/kapi.h>
-#include <cyg/io/serialio.h>
#include <cyg/io/io.h>
+#include <cyg/io/serialio.h>
#include <netinet/tcp.h>
-#include "rom.h"
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <net/if.h>
-#include <arpa/inet.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <ifaddrs.h>
-#include <string.h>
-
-#include <unistd.h>
-#include <stdio.h>
+#include <cyg/hal/hal_diag.h>
+#include "rom.h"
#ifdef CYGPKG_HAL_NIOS2
+#include <cyg/hal/io.h>
#define ZY1000_SER_DEV "/dev/uart_0"
#else
#define ZY1000_SER_DEV "/dev/ser0"
char hwaddr[512];
-
-extern struct flash_driver *flash_drivers[];
-extern struct target_type *target_types[];
-
#ifdef CYGPKG_PROFILE_GPROF
#include <cyg/profile/profile.h>
diag_printf("Unmounting /config..\n");
umount("/config");
diag_printf("Rebooting..\n");
+#ifdef CYGPKG_HAL_NIOS2
+ /* This will reboot & reconfigure the FPGA from the bootloader
+ * and on.
+ */
+ IOWR(REMOTE_UPDATE_BASE, 0x20, 0x1);
+#else
HAL_PLATFORM_RESET();
+#endif
}
static cyg_thread zylinjtag_thread_object;
static cyg_handle_t zylinjtag_thread_handle;
}
#ifdef CYGPKG_PROFILE_GPROF
+//extern int64_t totaltime;
-int eCosBoard_handle_eCosBoard_profile_command(struct command_context *cmd_ctx, char *cmd, char **args, int argc)
+static int zylinjtag_Jim_Command_profile(Jim_Interp *interp, int argc,
+ Jim_Obj * const *argv)
{
- command_print(cmd_ctx, "Profiling started");
- start_profile();
+ if ((argc == 2) && (strcmp(Jim_GetString(argv[1], NULL), "stats")==0))
+ {
+// profile_off();
+ //LOG_USER("Stats %dms sleeping in select()", (int)totaltime);
+ } else
+ {
+ LOG_USER("Profiling started");
+ start_profile();
+ //totaltime = 0;
+ }
return ERROR_OK;
}
cyg_httpd_init_tcl_interpreter();
- interp = 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;
}
int boolParam(char *var);
-struct command_context *setup_command_handler(void);
-
static const char *zylin_config_dir="/config/settings";
static int add_default_dirs(void)
return ERROR_OK;
}
-int ioutil_init(struct command_context *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
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)
{
/* initialize commandline interface */
struct command_context * cmd_ctx;
- cmd_ctx = setup_command_handler();
+ struct command_context *setup_command_handler(Jim_Interp *interp);
+ cmd_ctx = setup_command_handler(httpstate.jim_interp);
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
- COMMAND_REGISTER(cmd_ctx, NULL, "ecosboard_profile", eCosBoard_handle_eCosBoard_profile_command,
- COMMAND_ANY, NULL);
+ Jim_CreateCommand(httpstate.jim_interp, "zy1000_profile", zylinjtag_Jim_Command_profile,
+ NULL, NULL);
#endif
- Jim_CreateCommand(interp, "uart", zylinjtag_Jim_Command_uart, NULL, NULL);
+ Jim_CreateCommand(httpstate.jim_interp, "zy1000_uart", zylinjtag_Jim_Command_uart, NULL, NULL);
- int errVal;
- errVal = log_init(cmd_ctx);
- if (errVal != ERROR_OK)
- {
- diag_printf("log_init() failed %d\n", errVal);
- exit(-1);
- }
+ log_init();
set_log_output(cmd_ctx, log);
command_run_linef(cmd_ctx, "script /rom/openocd.cfg");
+ int ret;
+ ret = server_init(cmd_ctx);
+ if (ERROR_OK != ret)
+ return EXIT_FAILURE;
+
/* we MUST always run the init command as it will launch telnet sessions */
command_run_line(cmd_ctx, "init");
projects / fw / openocd / blobdiff