improve command handling examples

[openocd.git] / src / flash / orion_nand.c

diff --git a/src/flash/orion_nand.c b/src/flash/orion_nand.c
index 4235b0853bb40ed13e6a7a7be9122404b7a20d38..77a03f2752334a62a1a26c60978cfc4d4eb1a42a 100644 (file)
--- a/src/flash/orion_nand.c
+++ b/src/flash/orion_nand.c
@@ -120,18 +120,13 @@ static int orion_nand_controller_ready(struct nand_device *nand, int timeout)
        return 1;
 }
 
-static int orion_nand_register_commands(struct command_context *cmd_ctx)
-{
-       return ERROR_OK;
-}
-
 NAND_DEVICE_COMMAND_HANDLER(orion_nand_device_command)
 {
        struct orion_nand_controller *hw;
        uint32_t base;
        uint8_t ale, cle;
 
-       if (argc != 3) {
+       if (CMD_ARGC != 3) {
                LOG_ERROR("arguments must be: <target_id> <NAND_address>\n");
                return ERROR_NAND_DEVICE_INVALID;
        }
@@ -143,14 +138,14 @@ NAND_DEVICE_COMMAND_HANDLER(orion_nand_device_command)
        }
 
        nand->controller_priv = hw;
-       hw->target = get_target(args[1]);
+       hw->target = get_target(CMD_ARGV[1]);
        if (!hw->target) {
-               LOG_ERROR("target '%s' not defined", args[1]);
+               LOG_ERROR("target '%s' not defined", CMD_ARGV[1]);
                free(hw);
                return ERROR_NAND_DEVICE_INVALID;
        }
 
-       COMMAND_PARSE_NUMBER(u32, args[2], base);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], base);
        cle = 0;
        ale = 1;
 
@@ -180,7 +175,6 @@ struct nand_flash_controller orion_nand_controller =
        .reset                  = orion_nand_reset,
        .controller_ready       = orion_nand_controller_ready,
        .nand_device_command    = orion_nand_device_command,
-       .register_commands      = orion_nand_register_commands,
        .init                   = orion_nand_init,
 };