use COMMAND_REGISTER macro

[fw/openocd] / src / flash / lpc2900.c

diff --git a/src/flash/lpc2900.c b/src/flash/lpc2900.c
index 98b13bf110067dd453e81e2b3267359b23f04c3a..c7f1b3a23d24e0bb398df6c19ac7ea832f68ee9c 100644 (file)
--- a/src/flash/lpc2900.c
+++ b/src/flash/lpc2900.c
@@ -544,7 +544,7 @@ COMMAND_HANDLER(lpc2900_handle_signature_command)
        }
 
        struct flash_bank *bank;
-       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
        if (ERROR_OK != retval)
                return retval;
 
@@ -564,7 +564,7 @@ COMMAND_HANDLER(lpc2900_handle_signature_command)
                return status;
        }
 
-       command_print( cmd_ctx, "signature: 0x%8.8" PRIx32
+       command_print( CMD_CTX, "signature: 0x%8.8" PRIx32
                                          ":0x%8.8" PRIx32
                                          ":0x%8.8" PRIx32
                                          ":0x%8.8" PRIx32,
@@ -589,7 +589,7 @@ COMMAND_HANDLER(lpc2900_handle_read_custom_command)
        }
 
        struct flash_bank *bank;
-       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
        if (ERROR_OK != retval)
                return retval;
 
@@ -660,7 +660,7 @@ COMMAND_HANDLER(lpc2900_handle_password_command)
        }
 
        struct flash_bank *bank;
-       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
        if (ERROR_OK != retval)
                return retval;
 
@@ -672,11 +672,11 @@ COMMAND_HANDLER(lpc2900_handle_password_command)
 
        if( !lpc2900_info->risky )
        {
-               command_print(cmd_ctx, "Wrong password (use '%s')", ISS_PASSWORD);
+               command_print(CMD_CTX, "Wrong password (use '%s')", ISS_PASSWORD);
                return ERROR_COMMAND_ARGUMENT_INVALID;
        }
 
-       command_print(cmd_ctx,
+       command_print(CMD_CTX,
                   "Potentially dangerous operation allowed in next command!");
 
        return ERROR_OK;
@@ -695,7 +695,7 @@ COMMAND_HANDLER(lpc2900_handle_write_custom_command)
        }
 
        struct flash_bank *bank;
-       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
        if (ERROR_OK != retval)
                return retval;
 
@@ -704,7 +704,7 @@ COMMAND_HANDLER(lpc2900_handle_write_custom_command)
        /* Check if command execution is allowed. */
        if( !lpc2900_info->risky )
        {
-               command_print( cmd_ctx, "Command execution not allowed!" );
+               command_print( CMD_CTX, "Command execution not allowed!" );
                return ERROR_COMMAND_ARGUMENT_INVALID;
        }
        lpc2900_info->risky = 0;
@@ -806,7 +806,7 @@ COMMAND_HANDLER(lpc2900_handle_secure_sector_command)
 
        /* Get the bank descriptor */
        struct flash_bank *bank;
-       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
        if (ERROR_OK != retval)
                return retval;
 
@@ -815,7 +815,7 @@ COMMAND_HANDLER(lpc2900_handle_secure_sector_command)
        /* Check if command execution is allowed. */
        if( !lpc2900_info->risky )
        {
-               command_print( cmd_ctx, "Command execution not allowed! "
+               command_print( CMD_CTX, "Command execution not allowed! "
                "(use 'password' command first)");
                return ERROR_COMMAND_ARGUMENT_INVALID;
        }
@@ -829,7 +829,7 @@ COMMAND_HANDLER(lpc2900_handle_secure_sector_command)
            (last >= bank->num_sectors) ||
            (first > last) )
        {
-               command_print( cmd_ctx, "Illegal sector range" );
+               command_print( CMD_CTX, "Illegal sector range" );
                return ERROR_COMMAND_ARGUMENT_INVALID;
        }
 
@@ -878,7 +878,7 @@ COMMAND_HANDLER(lpc2900_handle_secure_sector_command)
                }
        }
 
-       command_print( cmd_ctx,
+       command_print( CMD_CTX,
                "Sectors security will become effective after next power cycle");
 
        /* Update the sector security status */
@@ -905,7 +905,7 @@ COMMAND_HANDLER(lpc2900_handle_secure_jtag_command)
 
        /* Get the bank descriptor */
        struct flash_bank *bank;
-       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
        if (ERROR_OK != retval)
                return retval;
 
@@ -914,7 +914,7 @@ COMMAND_HANDLER(lpc2900_handle_secure_jtag_command)
        /* Check if command execution is allowed. */
        if( !lpc2900_info->risky )
        {
-               command_print( cmd_ctx, "Command execution not allowed! "
+               command_print( CMD_CTX, "Command execution not allowed! "
                                        "(use 'password' command first)");
                return ERROR_COMMAND_ARGUMENT_INVALID;
        }
@@ -954,60 +954,36 @@ COMMAND_HANDLER(lpc2900_handle_secure_jtag_command)
  */
 static int lpc2900_register_commands(struct command_context *cmd_ctx)
 {
-       struct command *lpc2900_cmd = register_command(cmd_ctx, NULL, "lpc2900",
+       struct command *lpc2900_cmd = COMMAND_REGISTER(cmd_ctx, NULL, "lpc2900",
                                                  NULL, COMMAND_ANY, NULL);
 
-       register_command(
-           cmd_ctx,
-           lpc2900_cmd,
-           "signature",
-           lpc2900_handle_signature_command,
-           COMMAND_EXEC,
+       COMMAND_REGISTER(cmd_ctx, lpc2900_cmd, "signature",
+           &lpc2900_handle_signature_command, COMMAND_EXEC,
            "<bank> | "
-            "print device signature of flash bank");
-
-       register_command(
-           cmd_ctx,
-           lpc2900_cmd,
-           "read_custom",
-           lpc2900_handle_read_custom_command,
-           COMMAND_EXEC,
+           "print device signature of flash bank");
+
+       COMMAND_REGISTER(cmd_ctx, lpc2900_cmd, "read_custom",
+           &lpc2900_handle_read_custom_command, COMMAND_EXEC,
            "<bank> <filename> | "
             "read customer information from index sector to file");
 
-       register_command(
-           cmd_ctx,
-           lpc2900_cmd,
-           "password",
-           lpc2900_handle_password_command,
-           COMMAND_EXEC,
+       COMMAND_REGISTER(cmd_ctx, lpc2900_cmd, "password",
+           &lpc2900_handle_password_command, COMMAND_EXEC,
            "<bank> <password> | "
             "enter password to enable 'dangerous' options");
 
-       register_command(
-           cmd_ctx,
-           lpc2900_cmd,
-           "write_custom",
-           lpc2900_handle_write_custom_command,
-           COMMAND_EXEC,
+       COMMAND_REGISTER(cmd_ctx, lpc2900_cmd, "write_custom",
+           &lpc2900_handle_write_custom_command, COMMAND_EXEC,
            "<bank> <filename> [<type>] | "
             "write customer info from file to index sector");
 
-       register_command(
-           cmd_ctx,
-           lpc2900_cmd,
-           "secure_sector",
-           lpc2900_handle_secure_sector_command,
-           COMMAND_EXEC,
+       COMMAND_REGISTER(cmd_ctx, lpc2900_cmd, "secure_sector",
+           &lpc2900_handle_secure_sector_command, COMMAND_EXEC,
            "<bank> <first> <last> | "
             "activate sector security for a range of sectors");
 
-       register_command(
-           cmd_ctx,
-           lpc2900_cmd,
-           "secure_jtag",
-           lpc2900_handle_secure_jtag_command,
-           COMMAND_EXEC,
+       COMMAND_REGISTER(cmd_ctx, lpc2900_cmd, "secure_jtag",
+           &lpc2900_handle_secure_jtag_command, COMMAND_EXEC,
            "<bank> <level> | "
             "activate JTAG security");