fileio: refactor struct fileio to be an opaque structure

[openocd.git] / src / flash / nand / tcl.c

diff --git a/src/flash/nand/tcl.c b/src/flash/nand/tcl.c
index 29b4b69dda73ecc9293fcbe3bf42ee1be564c8b2..a54f8ea8fe6ddffdf5734f7cc6dc126a841b756e 100644 (file)
--- a/src/flash/nand/tcl.c
+++ b/src/flash/nand/tcl.c
@@ -147,18 +147,11 @@ 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);
-       }
-       else if (retval == ERROR_NAND_OPERATION_FAILED)
-       {
-               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, "NAND flash device '%s (%s)' found",
+                               p->device->name, p->manufacturer->name);
        }
 
-       return ERROR_OK;
+       return retval;
 }
 
 COMMAND_HANDLER(handle_nand_erase_command)
@@ -205,16 +198,8 @@ COMMAND_HANDLER(handle_nand_erase_command)
                                offset, offset + length,
                                CMD_ARGV[0], p->device->name);
        }
-       else if (retval == ERROR_NAND_OPERATION_FAILED)
-       {
-               command_print(CMD_CTX, "erase failed");
-       }
-       else
-       {
-               command_print(CMD_CTX, "unknown error when erasing NAND flash device");
-       }
 
-       return ERROR_OK;
+       return retval;
 }
 
 COMMAND_HANDLER(handle_nand_check_bad_blocks_command)
@@ -260,18 +245,8 @@ COMMAND_HANDLER(handle_nand_check_bad_blocks_command)
                command_print(CMD_CTX, "checked NAND flash device for bad blocks, "
                                "use \"nand info\" command to list blocks");
        }
-       else if (retval == ERROR_NAND_OPERATION_FAILED)
-       {
-               command_print(CMD_CTX, "error when checking for bad blocks on "
-                               "NAND flash device");
-       }
-       else
-       {
-               command_print(CMD_CTX, "unknown error when checking for bad "
-                               "blocks on NAND flash device");
-       }
 
-       return ERROR_OK;
+       return retval;
 }
 
 COMMAND_HANDLER(handle_nand_write_command)
@@ -309,7 +284,7 @@ COMMAND_HANDLER(handle_nand_write_command)
        if (nand_fileio_finish(&s))
        {
                command_print(CMD_CTX, "wrote file %s to NAND flash %s up to "
-                               "offset 0x%8.8" PRIx32 " in %fs (%0.3f kb/s)",
+                               "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));
        }
@@ -336,13 +311,14 @@ COMMAND_HANDLER(handle_nand_verify_command)
 
        while (file.size > 0)
        {
-               int retval = nand_read_page(nand, dev.address / dev.page_size,
+               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");
                        nand_fileio_cleanup(&dev);
-                       return nand_fileio_cleanup(&file);
+                       nand_fileio_cleanup(&file);
+                       return retval;
                }
 
                int bytes_read = nand_fileio_read(nand, &file);
@@ -350,7 +326,8 @@ COMMAND_HANDLER(handle_nand_verify_command)
                {
                        command_print(CMD_CTX, "error while reading file");
                        nand_fileio_cleanup(&dev);
-                       return nand_fileio_cleanup(&file);
+                       nand_fileio_cleanup(&file);
+                       return ERROR_FAIL;
                }
 
                if ((dev.page && memcmp(dev.page, file.page, dev.page_size)) ||
@@ -359,7 +336,8 @@ COMMAND_HANDLER(handle_nand_verify_command)
                        command_print(CMD_CTX, "NAND flash contents differ "
                                                "at 0x%8.8" PRIx32, dev.address);
                        nand_fileio_cleanup(&dev);
-                       return nand_fileio_cleanup(&file);
+                       nand_fileio_cleanup(&file);
+                       return ERROR_FAIL;
                }
 
                file.size -= bytes_read;
@@ -369,7 +347,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 "
-                               "up to offset 0x%8.8" PRIx32 " in %fs (%0.3f kb/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));
        }
@@ -389,12 +367,13 @@ COMMAND_HANDLER(handle_nand_dump_command)
        while (s.size > 0)
        {
                size_t size_written;
-               int retval = nand_read_page(nand, s.address / nand->page_size,
+               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");
-                       return nand_fileio_cleanup(&s);
+                       nand_fileio_cleanup(&s);
+                       return retval;
                }
 
                if (NULL != s.page)
@@ -409,9 +388,9 @@ COMMAND_HANDLER(handle_nand_dump_command)
 
        if (nand_fileio_finish(&s) == ERROR_OK)
        {
-               command_print(CMD_CTX, "dumped %ld bytes in %fs (%0.3f kb/s)", 
-                               (long)s.fileio.size, duration_elapsed(&s.bench),
-                               duration_kbps(&s.bench, s.fileio.size));
+               command_print(CMD_CTX, "dumped %ld bytes in %fs (%0.3f KiB/s)",
+                               (long)fileio_size(&s.fileio), duration_elapsed(&s.bench),
+                               duration_kbps(&s.bench, fileio_size(&s.fileio)));
        }
        return ERROR_OK;
 }
@@ -512,7 +491,7 @@ static const struct command_registration nand_exec_command_handlers[] = {
        COMMAND_REGISTRATION_DONE
 };
 
-int nand_init(struct command_context *cmd_ctx)
+static int nand_init(struct command_context *cmd_ctx)
 {
        if (!nand_devices)
                return ERROR_OK;
@@ -536,12 +515,14 @@ COMMAND_HANDLER(handle_nand_init_command)
        LOG_DEBUG("Initializing NAND devices...");
        return nand_init(CMD_CTX);
 }
-int nand_list_walker(struct nand_flash_controller *c, void *x)
+
+static int nand_list_walker(struct nand_flash_controller *c, void *x)
 {
        struct command_context *cmd_ctx = (struct command_context *)x;
        command_print(cmd_ctx, "  %s", c->name);
        return ERROR_OK;
 }
+
 COMMAND_HANDLER(handle_nand_list_drivers)
 {
        command_print(CMD_CTX, "Available NAND flash controller drivers:");