projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jtag/aice: remove unused exported struct aice_interface_param_s
[fw/openocd]
/
src
/
pld
/
pld.c
diff --git
a/src/pld/pld.c
b/src/pld/pld.c
index 5210b97b7d300c51109c7066b3d63f18dfa456cd..d0f85d74bffad1f699022a4f342f3ed318a91a1f 100644
(file)
--- a/
src/pld/pld.c
+++ b/
src/pld/pld.c
@@
-22,6
+22,7
@@
#include "pld.h"
#include <helper/log.h>
#include "pld.h"
#include <helper/log.h>
+#include <helper/replacements.h>
#include <helper/time_support.h>
#include <helper/time_support.h>
@@
-68,7
+69,7
@@
COMMAND_HANDLER(handle_pld_device_command)
if (pld_drivers[i]->commands) {
retval = register_commands(CMD_CTX, NULL,
pld_drivers[i]->commands);
if (pld_drivers[i]->commands) {
retval = register_commands(CMD_CTX, NULL,
pld_drivers[i]->commands);
- if (
ERROR_OK != retval
) {
+ if (
retval != ERROR_OK
) {
LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]);
return ERROR_FAIL;
}
LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]);
return ERROR_FAIL;
}
@@
-80,7
+81,7
@@
COMMAND_HANDLER(handle_pld_device_command)
retval = CALL_COMMAND_HANDLER(
pld_drivers[i]->pld_device_command, c);
retval = CALL_COMMAND_HANDLER(
pld_drivers[i]->pld_device_command, c);
- if (
ERROR_OK != retval
) {
+ if (
retval != ERROR_OK
) {
LOG_ERROR("'%s' driver rejected pld device",
CMD_ARGV[0]);
free(c);
LOG_ERROR("'%s' driver rejected pld device",
CMD_ARGV[0]);
free(c);
@@
-116,12
+117,12
@@
COMMAND_HANDLER(handle_pld_devices_command)
int i = 0;
if (!pld_devices) {
int i = 0;
if (!pld_devices) {
- command_print(CMD
_CTX
, "no pld devices configured");
+ command_print(CMD, "no pld devices configured");
return ERROR_OK;
}
for (p = pld_devices; p; p = p->next)
return ERROR_OK;
}
for (p = pld_devices; p; p = p->next)
- command_print(CMD
_CTX
, "#%i: %s", i++, p->driver->name);
+ command_print(CMD, "#%i: %s", i++, p->driver->name);
return ERROR_OK;
}
return ERROR_OK;
}
@@
-141,13
+142,13
@@
COMMAND_HANDLER(handle_pld_load_command)
COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], dev_id);
p = get_pld_device_by_num(dev_id);
if (!p) {
COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], dev_id);
p = get_pld_device_by_num(dev_id);
if (!p) {
- command_print(CMD
_CTX
, "pld device '#%s' is out of bounds", CMD_ARGV[0]);
+ command_print(CMD, "pld device '#%s' is out of bounds", CMD_ARGV[0]);
return ERROR_OK;
}
retval = p->driver->load(p, CMD_ARGV[1]);
if (retval != ERROR_OK) {
return ERROR_OK;
}
retval = p->driver->load(p, CMD_ARGV[1]);
if (retval != ERROR_OK) {
- command_print(CMD
_CTX
, "failed loading file %s to pld device %u",
+ command_print(CMD, "failed loading file %s to pld device %u",
CMD_ARGV[1], dev_id);
switch (retval) {
}
CMD_ARGV[1], dev_id);
switch (retval) {
}
@@
-156,7
+157,7
@@
COMMAND_HANDLER(handle_pld_load_command)
gettimeofday(&end, NULL);
timeval_subtract(&duration, &end, &start);
gettimeofday(&end, NULL);
timeval_subtract(&duration, &end, &start);
- command_print(CMD
_CTX
, "loaded file %s to pld device %u in %jis %jius",
+ command_print(CMD, "loaded file %s to pld device %u in %jis %jius",
CMD_ARGV[1], dev_id,
(intmax_t)duration.tv_sec, (intmax_t)duration.tv_usec);
}
CMD_ARGV[1], dev_id,
(intmax_t)duration.tv_sec, (intmax_t)duration.tv_usec);
}
@@
-170,6
+171,7
@@
static const struct command_registration pld_exec_command_handlers[] = {
.handler = handle_pld_devices_command,
.mode = COMMAND_EXEC,
.help = "list configured pld devices",
.handler = handle_pld_devices_command,
.mode = COMMAND_EXEC,
.help = "list configured pld devices",
+ .usage = "",
},
{
.name = "load",
},
{
.name = "load",
@@
-186,8
+188,7
@@
static int pld_init(struct command_context *cmd_ctx)
if (!pld_devices)
return ERROR_OK;
if (!pld_devices)
return ERROR_OK;
- struct command *parent = command_find_in_context(cmd_ctx, "pld");
- return register_commands(cmd_ctx, parent, pld_exec_command_handlers);
+ return register_commands(cmd_ctx, "pld", pld_exec_command_handlers);
}
COMMAND_HANDLER(handle_pld_init_command)
}
COMMAND_HANDLER(handle_pld_init_command)