From 9741e126fd854815460296ad47d027129c7f17bf Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Tue, 10 Nov 2009 02:43:11 -0800 Subject: change argv to args in command handlers Subsequent patches expect all command handlers to use a uniform parameter naming scheme. In the entire tree, these two files used standard 'argv' instead of our non-standard 'args'. This patch opts to reduces the noise required to unify the command handlers, using dominant 'args' form. A future patch may be used to convert us back to the standard argv, but that requires coordination with all developers to minimize disruptions. --- src/flash/davinci_nand.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/flash/davinci_nand.c') diff --git a/src/flash/davinci_nand.c b/src/flash/davinci_nand.c index b6210b8f..6ecc60a2 100644 --- a/src/flash/davinci_nand.c +++ b/src/flash/davinci_nand.c @@ -630,7 +630,7 @@ static int davinci_read_page_ecc4infix(struct nand_device_s *nand, uint32_t page } static int davinci_nand_device_command(struct command_context_s *cmd_ctx, - char *cmd, char **argv, int argc, + char *cmd, char **args, int argc, struct nand_device_s *nand) { struct davinci_nand *info; @@ -650,36 +650,36 @@ static int davinci_nand_device_command(struct command_context_s *cmd_ctx, if (argc < 5) { LOG_ERROR("parameters: %s target " "chip_addr hwecc_mode aemif_addr", - argv[0]); + args[0]); goto fail; } - target = get_target(argv[1]); + target = get_target(args[1]); if (!target) { - LOG_ERROR("invalid target %s", argv[1]); + LOG_ERROR("invalid target %s", args[1]); goto fail; } - COMMAND_PARSE_NUMBER(ulong, argv[2], chip); + COMMAND_PARSE_NUMBER(ulong, args[2], chip); if (chip == 0) { - LOG_ERROR("Invalid NAND chip address %s", argv[2]); + LOG_ERROR("Invalid NAND chip address %s", args[2]); goto fail; } - if (strcmp(argv[3], "hwecc1") == 0) + if (strcmp(args[3], "hwecc1") == 0) eccmode = HWECC1; - else if (strcmp(argv[3], "hwecc4") == 0) + else if (strcmp(args[3], "hwecc4") == 0) eccmode = HWECC4; - else if (strcmp(argv[3], "hwecc4_infix") == 0) + else if (strcmp(args[3], "hwecc4_infix") == 0) eccmode = HWECC4_INFIX; else { - LOG_ERROR("Invalid ecc mode %s", argv[3]); + LOG_ERROR("Invalid ecc mode %s", args[3]); goto fail; } - COMMAND_PARSE_NUMBER(ulong, argv[4], aemif); + COMMAND_PARSE_NUMBER(ulong, args[4], aemif); if (aemif == 0) { - LOG_ERROR("Invalid AEMIF controller address %s", argv[4]); + LOG_ERROR("Invalid AEMIF controller address %s", args[4]); goto fail; } -- cgit v1.2.3-18-g5258