flash: fix typos and duplicated words

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

diff --git a/src/flash/nand/fileio.c b/src/flash/nand/fileio.c
index d84ef4f943759d53e3d2638cf5b4b42122d51e77..1279e45a4fa565b254ff8d5d5af0dcaf6e3dd228 100644 (file)
--- a/src/flash/nand/fileio.c
+++ b/src/flash/nand/fileio.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
@@ -56,12 +54,12 @@ void nand_fileio_init(struct nand_fileio_state *state)
        state->oob_format = NAND_OOB_NONE;
 }
 
-int nand_fileio_start(struct command_context *cmd_ctx,
+int nand_fileio_start(struct command_invocation *cmd,
        struct nand_device *nand, const char *filename, int filemode,
        struct nand_fileio_state *state)
 {
        if (state->address % nand->page_size) {
-               command_print(cmd_ctx, "only page-aligned addresses are supported");
+               command_print(cmd, "only page-aligned addresses are supported");
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
@@ -71,7 +69,7 @@ int nand_fileio_start(struct command_context *cmd_ctx,
                int retval = fileio_open(&state->fileio, filename, filemode, FILEIO_BINARY);
                if (ERROR_OK != retval) {
                        const char *msg = (FILEIO_READ == filemode) ? "read" : "write";
-                       command_print(cmd_ctx, "failed to open '%s' for %s access",
+                       command_print(cmd, "failed to open '%s' for %s access",
                                filename, msg);
                        return retval;
                }
@@ -99,7 +97,7 @@ int nand_fileio_start(struct command_context *cmd_ctx,
 int nand_fileio_cleanup(struct nand_fileio_state *state)
 {
        if (state->file_opened)
-               fileio_close(&state->fileio);
+               fileio_close(state->fileio);
 
        if (state->oob) {
                free(state->oob);
@@ -133,15 +131,15 @@ COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
                return retval;
 
        if (NULL == nand->device) {
-               command_print(CMD_CTX, "#%s: not probed", CMD_ARGV[0]);
-               return ERROR_OK;
+               command_print(CMD, "#%s: not probed", CMD_ARGV[0]);
+               return ERROR_NAND_DEVICE_NOT_PROBED;
        }
 
        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], state->address);
        if (need_size) {
                COMMAND_PARSE_NUMBER(u32, CMD_ARGV[3], state->size);
                if (state->size % nand->page_size) {
-                       command_print(CMD_CTX, "only page-aligned sizes are supported");
+                       command_print(CMD, "only page-aligned sizes are supported");
                        return ERROR_COMMAND_SYNTAX_ERROR;
                }
        }
@@ -157,19 +155,19 @@ COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
                        else if (sw_ecc && !strcmp(CMD_ARGV[i], "oob_softecc_kw"))
                                state->oob_format |= NAND_OOB_SW_ECC_KW;
                        else {
-                               command_print(CMD_CTX, "unknown option: %s", CMD_ARGV[i]);
+                               command_print(CMD, "unknown option: %s", CMD_ARGV[i]);
                                return ERROR_COMMAND_SYNTAX_ERROR;
                        }
                }
        }
 
-       retval = nand_fileio_start(CMD_CTX, nand, CMD_ARGV[1], filemode, state);
+       retval = nand_fileio_start(CMD, nand, CMD_ARGV[1], filemode, state);
        if (ERROR_OK != retval)
                return retval;
 
        if (!need_size) {
                size_t filesize;
-               retval = fileio_size(&state->fileio, &filesize);
+               retval = fileio_size(state->fileio, &filesize);
                if (retval != ERROR_OK)
                        return retval;
                state->size = filesize;
@@ -190,7 +188,7 @@ int nand_fileio_read(struct nand_device *nand, struct nand_fileio_state *s)
        size_t one_read;
 
        if (NULL != s->page) {
-               fileio_read(&s->fileio, s->page_size, s->page, &one_read);
+               fileio_read(s->fileio, s->page_size, s->page, &one_read);
                if (one_read < s->page_size)
                        memset(s->page + one_read, 0xff, s->page_size - one_read);
                total_read += one_read;
@@ -208,7 +206,7 @@ int nand_fileio_read(struct nand_device *nand, struct nand_fileio_state *s)
        } else if (s->oob_format & NAND_OOB_SW_ECC_KW)   {
                /*
                 * In this case eccpos is not used as
-                * the ECC data is always stored contigously
+                * the ECC data is always stored contiguously
                 * at the end of the OOB area.  It consists
                 * of 10 bytes per 512-byte data block.
                 */
@@ -219,7 +217,7 @@ int nand_fileio_read(struct nand_device *nand, struct nand_fileio_state *s)
                        ecc += 10;
                }
        } else if (NULL != s->oob)   {
-               fileio_read(&s->fileio, s->oob_size, s->oob, &one_read);
+               fileio_read(s->fileio, s->oob_size, s->oob, &one_read);
                if (one_read < s->oob_size)
                        memset(s->oob + one_read, 0xff, s->oob_size - one_read);
                total_read += one_read;