projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM NAND I/O documentation update.
[fw/openocd]
/
src
/
ecosboard.c
diff --git
a/src/ecosboard.c
b/src/ecosboard.c
index e38316cb7f6045fcf2b7db608311552a674eaa5e..27894644ca0de62b5ea2932ac331a5397315a22a 100644
(file)
--- a/
src/ecosboard.c
+++ b/
src/ecosboard.c
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2007-200
8
by Øyvind Harboe *
+ * Copyright (C) 2007-200
9
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 *
* *
* 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 *
@@
-21,18
+21,14
@@
#include "config.h"
#endif
#include "config.h"
#endif
-#include "log.h"
#include "types.h"
#include "jtag.h"
#include "configuration.h"
#include "xsvf.h"
#include "svf.h"
#include "types.h"
#include "jtag.h"
#include "configuration.h"
#include "xsvf.h"
#include "svf.h"
-#include "target.h"
-#include "flash.h"
#include "nand.h"
#include "pld.h"
#include "nand.h"
#include "pld.h"
-#include "command.h"
#include "server.h"
#include "telnet_server.h"
#include "gdb_server.h"
#include "server.h"
#include "telnet_server.h"
#include "gdb_server.h"
@@
-85,6
+81,14
@@
#include <stdio.h>
#include <stdio.h>
+#ifdef CYGPKG_HAL_NIOS2
+#define ZY1000_SER_DEV "/dev/uart_0"
+#else
+#define ZY1000_SER_DEV "/dev/ser0"
+
+#endif
+
+
#define MAX_IFS 64
#if defined(CYGPKG_NET_FREEBSD_STACK)
#include <tftp_support.h>
#define MAX_IFS 64
#if defined(CYGPKG_NET_FREEBSD_STACK)
#include <tftp_support.h>
@@
-688,7
+692,7
@@
static void zylinjtag_uart(cyg_addrword_t data)
int oldopts = fcntl(session, F_GETFL, 0);
fcntl(session, F_SETFL, oldopts | O_NONBLOCK); //
int oldopts = fcntl(session, F_GETFL, 0);
fcntl(session, F_SETFL, oldopts | O_NONBLOCK); //
- int serHandle = open(
"/dev/ser0"
, O_RDWR | O_NONBLOCK);
+ int serHandle = open(
ZY1000_SER_DEV
, O_RDWR | O_NONBLOCK);
if (serHandle < 0)
{
close(session);
if (serHandle < 0)
{
close(session);
@@
-841,21
+845,25
@@
void startUart(void)
cyg_thread_resume(zylinjtag_uart_thread_handle);
}
cyg_thread_resume(zylinjtag_uart_thread_handle);
}
-
int handle_uart_command(struct command_context *cmd_ctx, char *cmd
,
-
char **args, int argc
)
+
static int zylinjtag_Jim_Command_uart(Jim_Interp *interp, int argc
,
+
Jim_Obj * const *argv
)
{
static int current_baud = 38400;
{
static int current_baud = 38400;
- if (argc ==
0
)
+ if (argc ==
1
)
{
command_print(cmd_ctx, "%d", current_baud);
{
command_print(cmd_ctx, "%d", current_baud);
- return
ERROR
_OK;
+ return
JIM
_OK;
}
}
- else if (argc !=
1
)
+ else if (argc !=
2
)
{
{
- return
ERROR_INVALID_ARGUMENTS
;
+ return
JIM_ERR
;
}
}
- current_baud = atol(args[0]);
+ long new_baudrate;
+ if (Jim_GetLong(interp, argv[1], &new_baudrate) != JIM_OK)
+ return JIM_ERR;
+
+ current_baud = new_baudrate;
int baud;
switch (current_baud)
int baud;
switch (current_baud)
@@
-890,11
+898,11
@@
int handle_uart_command(struct command_context *cmd_ctx, char *cmd,
int err;
cyg_io_handle_t serial_handle;
int err;
cyg_io_handle_t serial_handle;
- err = cyg_io_lookup(
"/dev/ser0"
, &serial_handle);
+ err = cyg_io_lookup(
ZY1000_SER_DEV
, &serial_handle);
if (err != ENOERR)
{
if (err != ENOERR)
{
- LOG_ERROR("
/dev/ser0 not found
\n");
- return
ERROR_FAIL
;
+ LOG_ERROR("
Could not open serial port
\n");
+ return
JIM_ERR
;
}
err = cyg_io_get_config(serial_handle,
}
err = cyg_io_get_config(serial_handle,
@@
-903,8
+911,8
@@
int handle_uart_command(struct command_context *cmd_ctx, char *cmd,
&len);
if (err != ENOERR)
{
&len);
if (err != ENOERR)
{
-
command_print(cmd_ctx,
"Failed to get serial port settings %d", err);
- return
ERROR_OK
;
+
LOG_ERROR(
"Failed to get serial port settings %d", err);
+ return
JIM_ERR
;
}
buf.baud = baud;
}
buf.baud = baud;
@@
-912,11
+920,11
@@
int handle_uart_command(struct command_context *cmd_ctx, char *cmd,
&len);
if (err != ENOERR)
{
&len);
if (err != ENOERR)
{
-
command_print(cmd_ctx,
"Failed to set serial port settings %d", err);
- return
ERROR_OK
;
+
LOG_ERROR(
"Failed to set serial port settings %d", err);
+ return
JIM_ERR
;
}
}
- return
ERROR
_OK;
+ return
JIM
_OK;
}
bool logAllToSerial = false;
}
bool logAllToSerial = false;
@@
-1083,12
+1091,12
@@
int main(int argc, char *argv[])
#ifdef CYGPKG_PROFILE_GPROF
#ifdef CYGPKG_PROFILE_GPROF
-
register_command
(cmd_ctx, NULL, "ecosboard_profile", eCosBoard_handle_eCosBoard_profile_command,
+
COMMAND_REGISTER
(cmd_ctx, NULL, "ecosboard_profile", eCosBoard_handle_eCosBoard_profile_command,
COMMAND_ANY, NULL);
#endif
COMMAND_ANY, NULL);
#endif
- register_command(cmd_ctx, NULL, "uart", handle_uart_command, COMMAND_ANY,
- "uart <baud> - forward uart on port 5555");
+ Jim_CreateCommand(interp, "uart", zylinjtag_Jim_Command_uart, NULL, NULL);
+
int errVal;
errVal = log_init(cmd_ctx);
int errVal;
errVal = log_init(cmd_ctx);