From 2861877b32a7a2f4022a1c3d9b66c9b4879878ac Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Sun, 15 Nov 2009 05:57:37 -0800 Subject: command_handler: change 'cmd_ctx' to CMD_CTX Convert all command handler 'cmd_ctx' parameter usage with CMD_CTX. --- src/pld/pld.c | 14 +++++++------- src/pld/virtex2.c | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/pld') diff --git a/src/pld/pld.c b/src/pld/pld.c index 96d37f17..d021f7bf 100644 --- a/src/pld/pld.c +++ b/src/pld/pld.c @@ -75,7 +75,7 @@ COMMAND_HANDLER(handle_pld_device_command) struct pld_device *p, *c; /* register pld specific commands */ - if (pld_drivers[i]->register_commands(cmd_ctx) != ERROR_OK) + if (pld_drivers[i]->register_commands(CMD_CTX) != ERROR_OK) { LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]); exit(-1); @@ -127,13 +127,13 @@ COMMAND_HANDLER(handle_pld_devices_command) if (!pld_devices) { - command_print(cmd_ctx, "no pld devices configured"); + command_print(CMD_CTX, "no pld devices configured"); return ERROR_OK; } for (p = pld_devices; p; p = p->next) { - command_print(cmd_ctx, "#%i: %s", i++, p->driver->name); + command_print(CMD_CTX, "#%i: %s", i++, p->driver->name); } return ERROR_OK; @@ -149,7 +149,7 @@ COMMAND_HANDLER(handle_pld_load_command) if (CMD_ARGC < 2) { - command_print(cmd_ctx, "usage: pld load "); + command_print(CMD_CTX, "usage: pld load "); return ERROR_OK; } @@ -158,13 +158,13 @@ COMMAND_HANDLER(handle_pld_load_command) 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_CTX, "pld device '#%s' is out of bounds", CMD_ARGV[0]); return ERROR_OK; } if ((retval = p->driver->load(p, CMD_ARGV[1])) != ERROR_OK) { - command_print(cmd_ctx, "failed loading file %s to pld device %u", + command_print(CMD_CTX, "failed loading file %s to pld device %u", CMD_ARGV[1], dev_id); switch (retval) { @@ -176,7 +176,7 @@ COMMAND_HANDLER(handle_pld_load_command) 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_CTX, "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); } diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c index b4593cc5..e8fe63b1 100644 --- a/src/pld/virtex2.c +++ b/src/pld/virtex2.c @@ -185,7 +185,7 @@ COMMAND_HANDLER(virtex2_handle_read_stat_command) if (CMD_ARGC < 1) { - command_print(cmd_ctx, "usage: virtex2 read_stat "); + command_print(CMD_CTX, "usage: virtex2 read_stat "); return ERROR_OK; } @@ -194,7 +194,7 @@ COMMAND_HANDLER(virtex2_handle_read_stat_command) device = get_pld_device_by_num(dev_id); if (!device) { - command_print(cmd_ctx, "pld device '#%s' is out of bounds", CMD_ARGV[0]); + command_print(CMD_CTX, "pld device '#%s' is out of bounds", CMD_ARGV[0]); return ERROR_OK; } @@ -202,7 +202,7 @@ COMMAND_HANDLER(virtex2_handle_read_stat_command) virtex2_read_stat(device, &status); - command_print(cmd_ctx, "virtex2 status register: 0x%8.8" PRIx32 "", status); + command_print(CMD_CTX, "virtex2 status register: 0x%8.8" PRIx32 "", status); return ERROR_OK; } @@ -221,7 +221,7 @@ PLD_DEVICE_COMMAND_HANDLER(virtex2_pld_device_command) tap = jtag_tap_by_string(CMD_ARGV[1]); if (tap == NULL) { - command_print(cmd_ctx, "Tap: %s does not exist", CMD_ARGV[1]); + command_print(CMD_CTX, "Tap: %s does not exist", CMD_ARGV[1]); return ERROR_OK; } -- cgit v1.2.3