zy1000: un-break uart command after command handler refactoring

Switched it to jim command to insulate it from command refactoring.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
__archive__
Øyvind Harboe 2009-11-18 11:08:33 +01:00
parent 700a60ec57
commit 5c4a73d0d8
1 changed files with 19 additions and 15 deletions

View File

@ -845,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, static int zylinjtag_Jim_Command_uart(Jim_Interp *interp, int argc,
char **args, 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; int baud;
switch (current_baud) switch (current_baud)
@ -898,7 +902,7 @@ int handle_uart_command(struct command_context *cmd_ctx, char *cmd,
if (err != ENOERR) if (err != ENOERR)
{ {
LOG_ERROR("Could not open serial port\n"); LOG_ERROR("Could not open serial port\n");
return ERROR_FAIL; return JIM_ERR;
} }
err = cyg_io_get_config(serial_handle, err = cyg_io_get_config(serial_handle,
@ -907,8 +911,8 @@ int handle_uart_command(struct command_context *cmd_ctx, char *cmd,
&len); &len);
if (err != ENOERR) if (err != ENOERR)
{ {
command_print(cmd_ctx, "Failed to get serial port settings %d", err); LOG_ERROR("Failed to get serial port settings %d", err);
return ERROR_OK; return JIM_ERR;
} }
buf.baud = baud; buf.baud = baud;
@ -916,11 +920,11 @@ int handle_uart_command(struct command_context *cmd_ctx, char *cmd,
&len); &len);
if (err != ENOERR) if (err != ENOERR)
{ {
command_print(cmd_ctx, "Failed to set serial port settings %d", err); LOG_ERROR("Failed to set serial port settings %d", err);
return ERROR_OK; return JIM_ERR;
} }
return ERROR_OK; return JIM_OK;
} }
bool logAllToSerial = false; bool logAllToSerial = false;
@ -1091,8 +1095,8 @@ int main(int argc, char *argv[])
COMMAND_ANY, NULL); COMMAND_ANY, NULL);
#endif #endif
register_command(cmd_ctx, NULL, "uart", handle_uart_command, COMMAND_ANY, Jim_CreateCommand(interp, "uart", zylinjtag_Jim_Command_uart, NULL, NULL);
"uart <baud> - forward uart on port 5555");
int errVal; int errVal;
errVal = log_init(cmd_ctx); errVal = log_init(cmd_ctx);