X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnand%2Ftcl.c;h=5480e0d61ea2d5ed693cd40e5d3fde4485880af2;hp=750c1f005fde42503e6ea08f4b33cb2b19a9056e;hb=6cb5ba6f1136df2986850f5c176cb38e34ca1795;hpb=24d9f0cfa0ee84e927d84957cab22c6571fa3185

diff --git a/src/flash/nand/tcl.c b/src/flash/nand/tcl.c
index 750c1f005f..5480e0d61e 100644
--- a/src/flash/nand/tcl.c
+++ b/src/flash/nand/tcl.c
@@ -16,9 +16,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -39,20 +37,20 @@ COMMAND_HANDLER(handle_nand_list_command)
 	int i;
 
 	if (!nand_devices) {
-		command_print(CMD_CTX, "no NAND flash devices configured");
+		command_print(CMD, "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, "#%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, "#%i: not probed", i);
 	}
 
 	return ERROR_OK;
@@ -89,7 +87,7 @@ COMMAND_HANDLER(handle_nand_info_command)
 		return retval;
 
 	if (NULL == p->device) {
-		command_print(CMD_CTX, "#%s: not probed", CMD_ARGV[0]);
+		command_print(CMD, "#%s: not probed", CMD_ARGV[0]);
 		return ERROR_OK;
 	}
 
@@ -99,7 +97,7 @@ COMMAND_HANDLER(handle_nand_info_command)
 	if (last >= p->num_blocks)
 		last = p->num_blocks - 1;
 
-	command_print(CMD_CTX,
+	command_print(CMD,
 		"#%i: %s (%s) pagesize: %i, buswidth: %i, erasesize: %i",
 		i++,
 		p->device->name,
@@ -125,7 +123,7 @@ COMMAND_HANDLER(handle_nand_info_command)
 		else
 			bad_state = " (block condition unknown)";
 
-		command_print(CMD_CTX,
+		command_print(CMD,
 			"\t#%i: 0x%8.8" PRIx32 " (%" PRId32 "kB) %s%s",
 			j,
 			p->blocks[j].offset,
@@ -149,7 +147,7 @@ COMMAND_HANDLER(handle_nand_probe_command)
 
 	retval = nand_probe(p);
 	if (retval == ERROR_OK) {
-		command_print(CMD_CTX, "NAND flash device '%s (%s)' found",
+		command_print(CMD, "NAND flash device '%s (%s)' found",
 			p->device->name, p->manufacturer->name);
 	}
 
@@ -191,7 +189,7 @@ 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, "erased blocks %lu to %lu "
 			"on NAND flash device #%s '%s'",
 			offset, offset + length - 1,
 			CMD_ARGV[0], p->device->name);
@@ -235,7 +233,7 @@ COMMAND_HANDLER(handle_nand_check_bad_blocks_command)
 
 	retval = nand_build_bbt(p, first, last);
 	if (retval == ERROR_OK) {
-		command_print(CMD_CTX, "checked NAND flash device for bad blocks, "
+		command_print(CMD, "checked NAND flash device for bad blocks, "
 			"use \"nand info\" command to list blocks");
 	}
 
@@ -255,24 +253,26 @@ COMMAND_HANDLER(handle_nand_write_command)
 	while (s.size > 0) {
 		int bytes_read = nand_fileio_read(nand, &s);
 		if (bytes_read <= 0) {
-			command_print(CMD_CTX, "error while reading file");
-			return nand_fileio_cleanup(&s);
+			command_print(CMD, "error while reading file");
+			nand_fileio_cleanup(&s);
+			return ERROR_FAIL;
 		}
 		s.size -= bytes_read;
 
 		retval = nand_write_page(nand, s.address / nand->page_size,
 				s.page, s.page_size, s.oob, s.oob_size);
 		if (ERROR_OK != retval) {
-			command_print(CMD_CTX, "failed writing file %s "
+			command_print(CMD, "failed writing file %s "
 				"to NAND flash %s at offset 0x%8.8" PRIx32,
 				CMD_ARGV[1], CMD_ARGV[0], s.address);
-			return nand_fileio_cleanup(&s);
+			nand_fileio_cleanup(&s);
+			return retval;
 		}
 		s.address += s.page_size;
 	}
 
 	if (nand_fileio_finish(&s) == ERROR_OK) {
-		command_print(CMD_CTX, "wrote file %s to NAND flash %s up to "
+		command_print(CMD, "wrote file %s to NAND flash %s up to "
 			"offset 0x%8.8" PRIx32 " in %fs (%0.3f KiB/s)",
 			CMD_ARGV[1], CMD_ARGV[0], s.address, duration_elapsed(&s.bench),
 			duration_kbps(&s.bench, total_bytes));
@@ -294,7 +294,7 @@ COMMAND_HANDLER(handle_nand_verify_command)
 	dev.address = file.address;
 	dev.size = file.size;
 	dev.oob_format = file.oob_format;
-	retval = nand_fileio_start(CMD_CTX, nand, NULL, FILEIO_NONE, &dev);
+	retval = nand_fileio_start(CMD, nand, NULL, FILEIO_NONE, &dev);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -302,7 +302,7 @@ COMMAND_HANDLER(handle_nand_verify_command)
 		retval = nand_read_page(nand, dev.address / dev.page_size,
 				dev.page, dev.page_size, dev.oob, dev.oob_size);
 		if (ERROR_OK != retval) {
-			command_print(CMD_CTX, "reading NAND flash page failed");
+			command_print(CMD, "reading NAND flash page failed");
 			nand_fileio_cleanup(&dev);
 			nand_fileio_cleanup(&file);
 			return retval;
@@ -310,7 +310,7 @@ COMMAND_HANDLER(handle_nand_verify_command)
 
 		int bytes_read = nand_fileio_read(nand, &file);
 		if (bytes_read <= 0) {
-			command_print(CMD_CTX, "error while reading file");
+			command_print(CMD, "error while reading file");
 			nand_fileio_cleanup(&dev);
 			nand_fileio_cleanup(&file);
 			return ERROR_FAIL;
@@ -318,7 +318,7 @@ COMMAND_HANDLER(handle_nand_verify_command)
 
 		if ((dev.page && memcmp(dev.page, file.page, dev.page_size)) ||
 				(dev.oob && memcmp(dev.oob, file.oob, dev.oob_size))) {
-			command_print(CMD_CTX, "NAND flash contents differ "
+			command_print(CMD, "NAND flash contents differ "
 				"at 0x%8.8" PRIx32, dev.address);
 			nand_fileio_cleanup(&dev);
 			nand_fileio_cleanup(&file);
@@ -330,7 +330,7 @@ COMMAND_HANDLER(handle_nand_verify_command)
 	}
 
 	if (nand_fileio_finish(&file) == ERROR_OK) {
-		command_print(CMD_CTX, "verified file %s in NAND flash %s "
+		command_print(CMD, "verified file %s in NAND flash %s "
 			"up to offset 0x%8.8" PRIx32 " in %fs (%0.3f KiB/s)",
 			CMD_ARGV[1], CMD_ARGV[0], dev.address, duration_elapsed(&file.bench),
 			duration_kbps(&file.bench, dev.size));
@@ -354,27 +354,27 @@ COMMAND_HANDLER(handle_nand_dump_command)
 		retval = nand_read_page(nand, s.address / nand->page_size,
 				s.page, s.page_size, s.oob, s.oob_size);
 		if (ERROR_OK != retval) {
-			command_print(CMD_CTX, "reading NAND flash page failed");
+			command_print(CMD, "reading NAND flash page failed");
 			nand_fileio_cleanup(&s);
 			return retval;
 		}
 
 		if (NULL != s.page)
-			fileio_write(&s.fileio, s.page_size, s.page, &size_written);
+			fileio_write(s.fileio, s.page_size, s.page, &size_written);
 
 		if (NULL != s.oob)
-			fileio_write(&s.fileio, s.oob_size, s.oob, &size_written);
+			fileio_write(s.fileio, s.oob_size, s.oob, &size_written);
 
 		s.size -= nand->page_size;
 		s.address += nand->page_size;
 	}
 
-	retval = fileio_size(&s.fileio, &filesize);
+	retval = fileio_size(s.fileio, &filesize);
 	if (retval != ERROR_OK)
 		return retval;
 
 	if (nand_fileio_finish(&s) == ERROR_OK) {
-		command_print(CMD_CTX, "dumped %zu bytes in %fs (%0.3f KiB/s)",
+		command_print(CMD, "dumped %zu bytes in %fs (%0.3f KiB/s)",
 			filesize, duration_elapsed(&s.bench),
 			duration_kbps(&s.bench, filesize));
 	}
@@ -392,7 +392,7 @@ COMMAND_HANDLER(handle_nand_raw_access_command)
 		return retval;
 
 	if (NULL == p->device) {
-		command_print(CMD_CTX, "#%s: not probed", CMD_ARGV[0]);
+		command_print(CMD, "#%s: not probed", CMD_ARGV[0]);
 		return ERROR_OK;
 	}
 
@@ -400,7 +400,7 @@ COMMAND_HANDLER(handle_nand_raw_access_command)
 		COMMAND_PARSE_ENABLE(CMD_ARGV[1], p->use_raw);
 
 	const char *msg = p->use_raw ? "enabled" : "disabled";
-	command_print(CMD_CTX, "raw access is %s", msg);
+	command_print(CMD, "raw access is %s", msg);
 
 	return ERROR_OK;
 }
@@ -411,6 +411,7 @@ static const struct command_registration nand_exec_command_handlers[] = {
 		.handler = handle_nand_list_command,
 		.mode = COMMAND_EXEC,
 		.help = "list configured NAND flash devices",
+		.usage = "",
 	},
 	{
 		.name = "info",
@@ -500,15 +501,15 @@ COMMAND_HANDLER(handle_nand_init_command)
 
 static int nand_list_walker(struct nand_flash_controller *c, void *x)
 {
-	struct command_context *cmd_ctx = x;
-	command_print(cmd_ctx, "  %s", c->name);
+	struct command_invocation *cmd = x;
+	command_print(cmd, "  %s", c->name);
 	return ERROR_OK;
 }
 
 COMMAND_HANDLER(handle_nand_list_drivers)
 {
-	command_print(CMD_CTX, "Available NAND flash controller drivers:");
-	return nand_driver_walk(&nand_list_walker, CMD_CTX);
+	command_print(CMD, "Available NAND flash controller drivers:");
+	return nand_driver_walk(&nand_list_walker, CMD);
 }
 
 static COMMAND_HELPER(create_nand_device, const char *bank_name,
@@ -547,7 +548,7 @@ static COMMAND_HELPER(create_nand_device, const char *bank_name,
 	c->bus_width = 0;
 	c->address_cycles = 0;
 	c->page_size = 0;
-	c->use_raw = 0;
+	c->use_raw = false;
 	c->next = NULL;
 
 	retval = CALL_COMMAND_HANDLER(controller->nand_device_command, c);