Commit 2861877b authored by Zachary T Welch's avatar Zachary T Welch
Browse files

command_handler: change 'cmd_ctx' to CMD_CTX

Convert all command handler 'cmd_ctx' parameter usage with CMD_CTX.
parent 23402315
......@@ -2267,7 +2267,7 @@ COMMAND_HANDLER(sam3_handle_info_command)
unsigned x;
int r;
pChip = get_current_sam3(cmd_ctx);
pChip = get_current_sam3(CMD_CTX);
if (!pChip) {
return ERROR_OK;
}
......@@ -2278,7 +2278,7 @@ COMMAND_HANDLER(sam3_handle_info_command)
if (pChip->details.bank[0].pBank == NULL) {
x = 0;
need_define:
command_print(cmd_ctx,
command_print(CMD_CTX,
"Please define bank %d via command: flash bank %s ... ",
x,
at91sam3_flash.name);
......@@ -2329,7 +2329,7 @@ COMMAND_HANDLER(sam3_handle_info_command)
// print results
cp = membuf_strtok(pChip->mbuf, "\n", &vp);
while (cp) {
command_print(cmd_ctx,"%s", cp);
command_print(CMD_CTX,"%s", cp);
cp = membuf_strtok(NULL, "\n", &vp);
}
return ERROR_OK;
......@@ -2341,7 +2341,7 @@ COMMAND_HANDLER(sam3_handle_gpnvm_command)
int r,who;
struct sam3_chip *pChip;
pChip = get_current_sam3(cmd_ctx);
pChip = get_current_sam3(CMD_CTX);
if (!pChip) {
return ERROR_OK;
}
......@@ -2353,7 +2353,7 @@ COMMAND_HANDLER(sam3_handle_gpnvm_command)
if (pChip->details.bank[0].pBank == NULL) {
command_print(cmd_ctx, "Bank0 must be defined first via: flash bank %s ...",
command_print(CMD_CTX, "Bank0 must be defined first via: flash bank %s ...",
at91sam3_flash.name);
return ERROR_FAIL;
}
......@@ -2367,7 +2367,7 @@ COMMAND_HANDLER(sam3_handle_gpnvm_command)
switch (CMD_ARGC) {
default:
command_print(cmd_ctx,"Too many parameters\n");
command_print(CMD_CTX,"Too many parameters\n");
return ERROR_COMMAND_SYNTAX_ERROR;
break;
case 0:
......@@ -2397,22 +2397,22 @@ COMMAND_HANDLER(sam3_handle_gpnvm_command)
if (r != ERROR_OK) {
break;
}
command_print(cmd_ctx, "sam3-gpnvm%u: %u", x, v);
command_print(CMD_CTX, "sam3-gpnvm%u: %u", x, v);
}
return r;
}
if ((who >= 0) && (((unsigned)(who)) < pChip->details.n_gpnvms)) {
r = FLASHD_GetGPNVM(&(pChip->details.bank[0]), who, &v);
command_print(cmd_ctx, "sam3-gpnvm%u: %u", who, v);
command_print(CMD_CTX, "sam3-gpnvm%u: %u", who, v);
return r;
} else {
command_print(cmd_ctx, "sam3-gpnvm invalid GPNVM: %u", who);
command_print(CMD_CTX, "sam3-gpnvm invalid GPNVM: %u", who);
return ERROR_COMMAND_SYNTAX_ERROR;
}
}
if (who == -1) {
command_print(cmd_ctx, "Missing GPNVM number");
command_print(CMD_CTX, "Missing GPNVM number");
return ERROR_COMMAND_SYNTAX_ERROR;
}
......@@ -2422,7 +2422,7 @@ COMMAND_HANDLER(sam3_handle_gpnvm_command)
(0 == strcmp("clear", CMD_ARGV[0]))) { // quietly accept both
r = FLASHD_ClrGPNVM(&(pChip->details.bank[0]), who);
} else {
command_print(cmd_ctx, "Unkown command: %s", CMD_ARGV[0]);
command_print(CMD_CTX, "Unkown command: %s", CMD_ARGV[0]);
r = ERROR_COMMAND_SYNTAX_ERROR;
}
return r;
......@@ -2432,7 +2432,7 @@ COMMAND_HANDLER(sam3_handle_slowclk_command)
{
struct sam3_chip *pChip;
pChip = get_current_sam3(cmd_ctx);
pChip = get_current_sam3(CMD_CTX);
if (!pChip) {
return ERROR_OK;
}
......@@ -2449,7 +2449,7 @@ COMMAND_HANDLER(sam3_handle_slowclk_command)
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], v);
if (v > 200000) {
// absurd slow clock of 200Khz?
command_print(cmd_ctx,"Absurd/illegal slow clock freq: %d\n", (int)(v));
command_print(CMD_CTX,"Absurd/illegal slow clock freq: %d\n", (int)(v));
return ERROR_COMMAND_SYNTAX_ERROR;
}
pChip->cfg.slow_freq = v;
......@@ -2457,11 +2457,11 @@ COMMAND_HANDLER(sam3_handle_slowclk_command)
}
default:
// error
command_print(cmd_ctx,"Too many parameters");
command_print(CMD_CTX,"Too many parameters");
return ERROR_COMMAND_SYNTAX_ERROR;
break;
}
command_print(cmd_ctx, "Slowclk freq: %d.%03dkhz",
command_print(CMD_CTX, "Slowclk freq: %d.%03dkhz",
(int)(pChip->cfg.slow_freq/ 1000),
(int)(pChip->cfg.slow_freq% 1000));
return ERROR_OK;
......
......@@ -1109,7 +1109,7 @@ COMMAND_HANDLER(at91sam7_handle_gpnvm_command)
if (CMD_ARGC != 2)
{
command_print(cmd_ctx, "at91sam7 gpnvm <bit> <set | clear>");
command_print(CMD_CTX, "at91sam7 gpnvm <bit> <set | clear>");
return ERROR_OK;
}
......@@ -1120,7 +1120,7 @@ COMMAND_HANDLER(at91sam7_handle_gpnvm_command)
}
if (strcmp(bank->driver->name, "at91sam7"))
{
command_print(cmd_ctx, "not an at91sam7 flash bank '%s'", CMD_ARGV[0]);
command_print(CMD_CTX, "not an at91sam7 flash bank '%s'", CMD_ARGV[0]);
return ERROR_FLASH_BANK_INVALID;
}
if (bank->target->state != TARGET_HALTED)
......@@ -1155,7 +1155,7 @@ COMMAND_HANDLER(at91sam7_handle_gpnvm_command)
COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], bit);
if ((bit < 0) || (bit >= at91sam7_info->num_nvmbits))
{
command_print(cmd_ctx, "gpnvm bit '#%s' is out of bounds for target %s", CMD_ARGV[0], at91sam7_info->target_name);
command_print(CMD_CTX, "gpnvm bit '#%s' is out of bounds for target %s", CMD_ARGV[0], at91sam7_info->target_name);
return ERROR_OK;
}
......
......@@ -421,7 +421,7 @@ COMMAND_HANDLER(avrf_handle_mass_erase_command)
if (CMD_ARGC < 1)
{
command_print(cmd_ctx, "avr mass_erase <bank>");
command_print(CMD_CTX, "avr mass_erase <bank>");
return ERROR_OK;
}
......@@ -438,11 +438,11 @@ COMMAND_HANDLER(avrf_handle_mass_erase_command)
bank->sectors[i].is_erased = 1;
}
command_print(cmd_ctx, "avr mass erase complete");
command_print(CMD_CTX, "avr mass erase complete");
}
else
{
command_print(cmd_ctx, "avr mass erase failed");
command_print(CMD_CTX, "avr mass erase failed");
}
LOG_DEBUG("%s", __FUNCTION__);
......
......@@ -208,7 +208,7 @@ COMMAND_HELPER(flash_command_get_bank_by_num,
*bank = get_flash_bank_by_num(bank_num);
if (!*bank)
{
command_print(cmd_ctx, "flash bank '%s' not found", name);
command_print(CMD_CTX, "flash bank '%s' not found", name);
return ERROR_INVALID_ARGUMENTS;
}
return ERROR_OK;
......@@ -241,7 +241,7 @@ COMMAND_HANDLER(handle_flash_bank_command)
struct flash_bank *p, *c;
/* register flash specific commands */
if (flash_drivers[i]->register_commands(cmd_ctx) != ERROR_OK)
if (flash_drivers[i]->register_commands(CMD_CTX) != ERROR_OK)
{
LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]);
return ERROR_FAIL;
......@@ -320,7 +320,7 @@ COMMAND_HANDLER(handle_flash_info_command)
if ((retval = p->driver->auto_probe(p)) != ERROR_OK)
return retval;
command_print(cmd_ctx,
command_print(CMD_CTX,
"#%" PRIi32 " : %s at 0x%8.8" PRIx32 ", size 0x%8.8" PRIx32 ", buswidth %i, chipwidth %i",
i,
p->driver->name,
......@@ -339,7 +339,7 @@ COMMAND_HANDLER(handle_flash_info_command)
else
protect_state = "protection state unknown";
command_print(cmd_ctx,
command_print(CMD_CTX,
"\t#%3i: 0x%8.8" PRIx32 " (0x%" PRIx32 " %" PRIi32 "kB) %s",
j,
p->sectors[j].offset,
......@@ -350,7 +350,7 @@ COMMAND_HANDLER(handle_flash_info_command)
*buf = '\0'; /* initialize buffer, otherwise it migh contain garbage if driver function fails */
retval = p->driver->info(p, buf, sizeof(buf));
command_print(cmd_ctx, "%s", buf);
command_print(CMD_CTX, "%s", buf);
if (retval != ERROR_OK)
LOG_ERROR("error retrieving flash info (%d)", retval);
}
......@@ -374,22 +374,22 @@ COMMAND_HANDLER(handle_flash_probe_command)
{
if ((retval = p->driver->probe(p)) == ERROR_OK)
{
command_print(cmd_ctx, "flash '%s' found at 0x%8.8" PRIx32, p->driver->name, p->base);
command_print(CMD_CTX, "flash '%s' found at 0x%8.8" PRIx32, p->driver->name, p->base);
}
else if (retval == ERROR_FLASH_BANK_INVALID)
{
command_print(cmd_ctx, "probing failed for flash bank '#%s' at 0x%8.8" PRIx32,
command_print(CMD_CTX, "probing failed for flash bank '#%s' at 0x%8.8" PRIx32,
CMD_ARGV[0], p->base);
}
else
{
command_print(cmd_ctx, "unknown error when probing flash bank '#%s' at 0x%8.8" PRIx32,
command_print(CMD_CTX, "unknown error when probing flash bank '#%s' at 0x%8.8" PRIx32,
CMD_ARGV[0], p->base);
}
}
else
{
command_print(cmd_ctx, "flash bank '#%s' is out of bounds", CMD_ARGV[0]);
command_print(CMD_CTX, "flash bank '#%s' is out of bounds", CMD_ARGV[0]);
}
return ERROR_OK;
......@@ -410,11 +410,11 @@ COMMAND_HANDLER(handle_flash_erase_check_command)
int j;
if ((retval = p->driver->erase_check(p)) == ERROR_OK)
{
command_print(cmd_ctx, "successfully checked erase state");
command_print(CMD_CTX, "successfully checked erase state");
}
else
{
command_print(cmd_ctx, "unknown error when checking erase state of flash bank #%s at 0x%8.8" PRIx32,
command_print(CMD_CTX, "unknown error when checking erase state of flash bank #%s at 0x%8.8" PRIx32,
CMD_ARGV[0], p->base);
}
......@@ -429,7 +429,7 @@ COMMAND_HANDLER(handle_flash_erase_check_command)
else
erase_state = "erase state unknown";
command_print(cmd_ctx,
command_print(CMD_CTX,
"\t#%3i: 0x%8.8" PRIx32 " (0x%" PRIx32 " %" PRIi32 "kB) %s",
j,
p->sectors[j].offset,
......@@ -448,7 +448,7 @@ COMMAND_HANDLER(handle_flash_erase_address_command)
int address;
int length;
struct target *target = get_current_target(cmd_ctx);
struct target *target = get_current_target(CMD_CTX);
if (CMD_ARGC != 2)
return ERROR_COMMAND_SYNTAX_ERROR;
......@@ -457,7 +457,7 @@ COMMAND_HANDLER(handle_flash_erase_address_command)
COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], length);
if (length <= 0)
{
command_print(cmd_ctx, "Length must be >0");
command_print(CMD_CTX, "Length must be >0");
return ERROR_COMMAND_SYNTAX_ERROR;
}
......@@ -477,7 +477,7 @@ COMMAND_HANDLER(handle_flash_erase_address_command)
if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
{
command_print(cmd_ctx, "erased address 0x%8.8x (length %i)"
command_print(CMD_CTX, "erased address 0x%8.8x (length %i)"
" in %fs (%0.3f kb/s)", address, length,
duration_elapsed(&bench), duration_kbps(&bench, length));
}
......@@ -497,15 +497,15 @@ COMMAND_HANDLER(handle_flash_protect_check_command)
if ((retval = p->driver->protect_check(p)) == ERROR_OK)
{
command_print(cmd_ctx, "successfully checked protect state");
command_print(CMD_CTX, "successfully checked protect state");
}
else if (retval == ERROR_FLASH_OPERATION_FAILED)
{
command_print(cmd_ctx, "checking protection state failed (possibly unsupported) by flash #%s at 0x%8.8" PRIx32, CMD_ARGV[0], p->base);
command_print(CMD_CTX, "checking protection state failed (possibly unsupported) by flash #%s at 0x%8.8" PRIx32, CMD_ARGV[0], p->base);
}
else
{
command_print(cmd_ctx, "unknown error when checking protection state of flash bank '#%s' at 0x%8.8" PRIx32, CMD_ARGV[0], p->base);
command_print(CMD_CTX, "unknown error when checking protection state of flash bank '#%s' at 0x%8.8" PRIx32, CMD_ARGV[0], p->base);
}
return ERROR_OK;
......@@ -550,7 +550,7 @@ COMMAND_HANDLER(handle_flash_erase_command)
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], last);
int retval;
if ((retval = flash_check_sector_parameters(cmd_ctx,
if ((retval = flash_check_sector_parameters(CMD_CTX,
first, last, p->num_sectors)) != ERROR_OK)
return retval;
......@@ -561,7 +561,7 @@ COMMAND_HANDLER(handle_flash_erase_command)
if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
{
command_print(cmd_ctx, "erased sectors %" PRIu32 " "
command_print(CMD_CTX, "erased sectors %" PRIu32 " "
"through %" PRIu32" on flash bank %" PRIu32 " "
"in %fs", first, last, bank_nr, duration_elapsed(&bench));
}
......@@ -598,13 +598,13 @@ COMMAND_HANDLER(handle_flash_protect_command)
return ERROR_COMMAND_SYNTAX_ERROR;
int retval;
if ((retval = flash_check_sector_parameters(cmd_ctx,
if ((retval = flash_check_sector_parameters(CMD_CTX,
first, last, p->num_sectors)) != ERROR_OK)
return retval;
retval = flash_driver_protect(p, set, first, last);
if (retval == ERROR_OK) {
command_print(cmd_ctx, "%s protection for sectors %i "
command_print(CMD_CTX, "%s protection for sectors %i "
"through %i on flash bank %i",
(set) ? "set" : "cleared", (int) first,
(int) last, (int) bank_nr);
......@@ -615,7 +615,7 @@ COMMAND_HANDLER(handle_flash_protect_command)
COMMAND_HANDLER(handle_flash_write_image_command)
{
struct target *target = get_current_target(cmd_ctx);
struct target *target = get_current_target(CMD_CTX);
struct image image;
uint32_t written;
......@@ -638,13 +638,13 @@ COMMAND_HANDLER(handle_flash_write_image_command)
auto_erase = 1;
CMD_ARGV++;
CMD_ARGC--;
command_print(cmd_ctx, "auto erase enabled");
command_print(CMD_CTX, "auto erase enabled");
} else if (strcmp(CMD_ARGV[0], "unlock") == 0)
{
auto_unlock = true;
CMD_ARGV++;
CMD_ARGC--;
command_print(cmd_ctx, "auto unlock enabled");
command_print(CMD_CTX, "auto unlock enabled");
} else
{
break;
......@@ -693,7 +693,7 @@ COMMAND_HANDLER(handle_flash_write_image_command)
if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
{
command_print(cmd_ctx, "wrote %" PRIu32 " byte from file %s "
command_print(CMD_CTX, "wrote %" PRIu32 " byte from file %s "
"in %fs (%0.3f kb/s)", written, CMD_ARGV[0],
duration_elapsed(&bench), duration_kbps(&bench, written));
}
......@@ -714,7 +714,7 @@ COMMAND_HANDLER(handle_flash_fill_command)
uint32_t wrote = 0;
uint32_t cur_size = 0;
uint32_t chunk_count;
struct target *target = get_current_target(cmd_ctx);
struct target *target = get_current_target(CMD_CTX);
uint32_t i;
uint32_t wordsize;
......@@ -800,7 +800,7 @@ COMMAND_HANDLER(handle_flash_fill_command)
if (duration_measure(&bench) == ERROR_OK)
{
command_print(cmd_ctx, "wrote %" PRIu32 " bytes to 0x%8.8" PRIx32
command_print(CMD_CTX, "wrote %" PRIu32 " bytes to 0x%8.8" PRIx32
" in %fs (%0.3f kb/s)", wrote, address,
duration_elapsed(&bench), duration_kbps(&bench, wrote));
}
......@@ -847,7 +847,7 @@ COMMAND_HANDLER(handle_flash_write_bank_command)
if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
{
command_print(cmd_ctx, "wrote %zu byte from file %s to flash bank %u"
command_print(CMD_CTX, "wrote %zu byte from file %s to flash bank %u"
" at offset 0x%8.8" PRIx32 " in %fs (%0.3f kb/s)",
fileio.size, CMD_ARGV[1], p->bank_number, offset,
duration_elapsed(&bench), duration_kbps(&bench, fileio.size));
......
......@@ -764,14 +764,14 @@ COMMAND_HANDLER(lpc2000_handle_part_id_command)
{
if (status_code == ERROR_FLASH_OPERATION_FAILED)
{
command_print(cmd_ctx, "no sufficient working area specified, can't access LPC2000 IAP interface");
command_print(CMD_CTX, "no sufficient working area specified, can't access LPC2000 IAP interface");
return ERROR_OK;
}
command_print(cmd_ctx, "lpc2000 IAP returned status code %i", status_code);
command_print(CMD_CTX, "lpc2000 IAP returned status code %i", status_code);
}
else
{
command_print(cmd_ctx, "lpc2000 part id: 0x%8.8" PRIx32 , result_table[0]);
command_print(CMD_CTX, "lpc2000 part id: 0x%8.8" PRIx32 , result_table[0]);
}
return ERROR_OK;
......
......@@ -564,7 +564,7 @@ COMMAND_HANDLER(lpc2900_handle_signature_command)
return status;
}
command_print( cmd_ctx, "signature: 0x%8.8" PRIx32
command_print( CMD_CTX, "signature: 0x%8.8" PRIx32
":0x%8.8" PRIx32
":0x%8.8" PRIx32
":0x%8.8" PRIx32,
......@@ -672,11 +672,11 @@ COMMAND_HANDLER(lpc2900_handle_password_command)
if( !lpc2900_info->risky )
{
command_print(cmd_ctx, "Wrong password (use '%s')", ISS_PASSWORD);
command_print(CMD_CTX, "Wrong password (use '%s')", ISS_PASSWORD);
return ERROR_COMMAND_ARGUMENT_INVALID;
}
command_print(cmd_ctx,
command_print(CMD_CTX,
"Potentially dangerous operation allowed in next command!");
return ERROR_OK;
......@@ -704,7 +704,7 @@ COMMAND_HANDLER(lpc2900_handle_write_custom_command)
/* Check if command execution is allowed. */
if( !lpc2900_info->risky )
{
command_print( cmd_ctx, "Command execution not allowed!" );
command_print( CMD_CTX, "Command execution not allowed!" );
return ERROR_COMMAND_ARGUMENT_INVALID;
}
lpc2900_info->risky = 0;
......@@ -815,7 +815,7 @@ COMMAND_HANDLER(lpc2900_handle_secure_sector_command)
/* Check if command execution is allowed. */
if( !lpc2900_info->risky )
{
command_print( cmd_ctx, "Command execution not allowed! "
command_print( CMD_CTX, "Command execution not allowed! "
"(use 'password' command first)");
return ERROR_COMMAND_ARGUMENT_INVALID;
}
......@@ -829,7 +829,7 @@ COMMAND_HANDLER(lpc2900_handle_secure_sector_command)
(last >= bank->num_sectors) ||
(first > last) )
{
command_print( cmd_ctx, "Illegal sector range" );
command_print( CMD_CTX, "Illegal sector range" );
return ERROR_COMMAND_ARGUMENT_INVALID;
}
......@@ -878,7 +878,7 @@ COMMAND_HANDLER(lpc2900_handle_secure_sector_command)
}
}
command_print( cmd_ctx,
command_print( CMD_CTX,
"Sectors security will become effective after next power cycle");
/* Update the sector security status */
......@@ -914,7 +914,7 @@ COMMAND_HANDLER(lpc2900_handle_secure_jtag_command)
/* Check if command execution is allowed. */
if( !lpc2900_info->risky )
{
command_print( cmd_ctx, "Command execution not allowed! "
command_print( CMD_CTX, "Command execution not allowed! "
"(use 'password' command first)");
return ERROR_COMMAND_ARGUMENT_INVALID;
}
......
......@@ -846,7 +846,7 @@ COMMAND_HANDLER(handle_lpc3180_select_command)
struct nand_device *nand = get_nand_device_by_num(num);
if (!nand)
{
command_print(cmd_ctx, "nand device '#%s' is out of bounds", CMD_ARGV[0]);
command_print(CMD_CTX, "nand device '#%s' is out of bounds", CMD_ARGV[0]);
return ERROR_OK;
}
......@@ -868,7 +868,7 @@ COMMAND_HANDLER(handle_lpc3180_select_command)
}
}
command_print(cmd_ctx, "%s controller selected", selected[lpc3180_info->selected_controller]);
command_print(CMD_CTX, "%s controller selected", selected[lpc3180_info->selected_controller]);
return ERROR_OK;
}
......
......@@ -416,7 +416,7 @@ COMMAND_HANDLER(mg_probe_cmd)
ret = mg_mflash_probe();
if (ret == ERROR_OK) {
command_print(cmd_ctx, "mflash (total %" PRIu32 " sectors) found at 0x%8.8" PRIx32 "",
command_print(CMD_CTX, "mflash (total %" PRIu32 " sectors) found at 0x%8.8" PRIx32 "",
mflash_bank->drv_info->tot_sects, mflash_bank->base);
}
......@@ -751,7 +751,7 @@ COMMAND_HANDLER(mg_write_cmd)
if (duration_measure(&bench) == ERROR_OK)
{
command_print(cmd_ctx, "wrote %zu byte from file %s "
command_print(CMD_CTX, "wrote %zu byte from file %s "
"in %fs (%0.3f kB/s)", fileio.size, CMD_ARGV[1],
duration_elapsed(&bench), duration_kbps(&bench, fileio.size));
}
......@@ -817,7 +817,7 @@ COMMAND_HANDLER(mg_dump_cmd)
if (duration_measure(&bench) == ERROR_OK)
{
command_print(cmd_ctx, "dump image (address 0x%8.8" PRIx32 " "
command_print(CMD_CTX, "dump image (address 0x%8.8" PRIx32 " "
"size %" PRIu32 ") to file %s in %fs (%0.3f kB/s)",
address, size, CMD_ARGV[1],
duration_elapsed(&bench), duration_kbps(&bench, size));
......
......@@ -223,7 +223,7 @@ COMMAND_HANDLER(handle_nand_device_command)
if (strcmp(CMD_ARGV[0], nand_flash_controllers[i]->name) == 0)
{
/* register flash specific commands */
if ((retval = nand_flash_controllers[i]->register_commands(cmd_ctx)) != ERROR_OK)
if ((retval = nand_flash_controllers[i]->register_commands(CMD_CTX)) != ERROR_OK)
{
LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]);
return retval;
......@@ -312,7 +312,7 @@ COMMAND_HELPER(nand_command_get_device_by_num, unsigned name_index,
COMMAND_PARSE_NUMBER(uint, str, num);
*nand = get_nand_device_by_num(num);
if (!*nand) {
command_print(cmd_ctx, "NAND flash device '#%s' is out of bounds", str);
command_print(CMD_CTX, "NAND flash device '#%s' is out of bounds", str);
return ERROR_INVALID_ARGUMENTS;
}
return ERROR_OK;
......@@ -1050,21 +1050,21 @@ COMMAND_HANDLER(handle_nand_list_command)
if (!nand_devices)
{
command_print(cmd_ctx, "no NAND flash devices configured");
command_print(CMD_CTX, "no NAND flash devices configured");
return ERROR_OK;
}
for (p = nand_devices, i = 0; p; p = p->next, i++)
{
if (p->device)
command_print(cmd_ctx, "#%i: %s (%s) "
command_print(CMD_CTX, "#%i: %s (%s) "
"pagesize: %i, buswidth: %i,\n\t"
"blocksize: %i, blocks: %i",
i, p->device->name, p->manufacturer->name,
p->page_size, p->bus_width,
p->erase_size, p->num_blocks);
else
command_print(cmd_ctx, "#%i: not probed", i);
command_print(CMD_CTX, "#%i: not probed", i);
}
return ERROR_OK;
......@@ -1102,7 +1102,7 @@ COMMAND_HANDLER(handle_nand_info_command)
if (NULL == p->device)
{
command_print(cmd_ctx, "#%s: not probed", CMD_ARGV[0]);
command_print(CMD_CTX, "#%s: not probed", CMD_ARGV[0]);
return ERROR_OK;
}
......@@ -1112,7 +1112,7 @@ COMMAND_HANDLER(handle_nand_info_command)
if (last >= p->num_blocks)
last = p->num_blocks - 1;
command_print(cmd_ctx, "#%i: %s (%s) pagesize: %i, buswidth: %i, erasesize: %i",
command_print(CMD_CTX, "#%i: %s (%s) pagesize: %i, buswidth: %i, erasesize: %i",
i++, p->device->name, p->manufacturer->name, p->page_size, p->bus_width, p->erase_size);
for (j = first; j <= last; j++)
......@@ -1133,7 +1133,7 @@ COMMAND_HANDLER(handle_nand_info_command)
else
bad_state = " (block condition unknown)";
command_print(cmd_ctx,
command_print(CMD_CTX,
"\t#%i: 0x%8.8" PRIx32 " (%" PRId32 "kB) %s%s",
j,
p->blocks[j].offset,
......@@ -1159,15 +1159,15 @@ COMMAND_HANDLER(handle_nand_probe_command)
if ((retval = nand_probe(p)) == ERROR_OK)
{
command_print(cmd_ctx, "NAND flash device '%s' found", p->device->name);
command_print(CMD_CTX, "NAND flash device '%s' found", p->device->name);
}
else if (retval == ERROR_NAND_OPERATION_FAILED)
{
command_print(cmd_ctx, "probing failed for NAND flash device");
command_print(CMD_CTX, "probing failed for NAND flash device");
}
else
{
command_print(cmd_ctx, "unknown error when probing NAND flash device");
command_print(CMD_CTX, "unknown error when probing NAND flash device");
}
return ERROR_OK;
......@@ -1212,18 +1212,18 @@ COMMAND_HANDLER(handle_nand_erase_command)
retval = nand_erase(p, offset, offset + length - 1);
if (retval == ERROR_OK)
{
command_print(cmd_ctx, "erased blocks %lu to %lu "
command_print(CMD_CTX, "erased blocks %lu to %lu "
"on NAND flash device #%s '%s'",
offset, offset + length,
CMD_ARGV[0], p->device->name);
}