Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
jtag: linuxgpiod: drop extra parenthesis
[openocd.git] / src / target / arm720t.c
diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index b592ffc47becec9a80adb2bfdda5e4c9d5121419..beab632c257715329ea8e1431d245151dea606fb 100644 (file)
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -1,22 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
  *   Copyright (C) 2009 by Øyvind Harboe                                   *
  *   oyvind.harboe@zylin.com                                               *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   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, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -233,16 +222,6 @@ static void arm720t_pre_restore_context(struct target *target)
        arm720t_write_cp15(target, 0xee060f10, arm720t->far_reg);
 }
 
-static int arm720t_verify_pointer(struct command_context *cmd_ctx,
-               struct arm720t_common *arm720t)
-{
-       if (arm720t->common_magic != ARM720T_COMMON_MAGIC) {
-               command_print(cmd_ctx, "target is not an ARM720");
-               return ERROR_TARGET_INVALID;
-       }
-       return ERROR_OK;
-}
-
 static int arm720t_arch_state(struct target *target)
 {
        struct arm720t_common *arm720t = target_to_arm720(target);
@@ -262,8 +241,8 @@ static int arm720t_arch_state(struct target *target)
 static int arm720_mmu(struct target *target, int *enabled)
 {
        if (target->state != TARGET_HALTED) {
-               LOG_ERROR("%s: target not halted", __func__);
-               return ERROR_TARGET_INVALID;
+               LOG_TARGET_ERROR(target, "not halted");
+               return ERROR_TARGET_NOT_HALTED;
        }
 
        *enabled = target_to_arm720(target)->armv4_5_mmu.mmu_enabled;
@@ -391,14 +370,19 @@ static int arm720t_init_target(struct command_context *cmd_ctx, struct target *t
        return arm7tdmi_init_target(cmd_ctx, target);
 }
 
+static void arm720t_deinit_target(struct target *target)
+{
+       arm7tdmi_deinit_target(target);
+}
+
 /* FIXME remove forward decls */
 static int arm720t_mrc(struct target *target, int cpnum,
                uint32_t op1, uint32_t op2,
-               uint32_t CRn, uint32_t CRm,
+               uint32_t crn, uint32_t crm,
                uint32_t *value);
 static int arm720t_mcr(struct target *target, int cpnum,
                uint32_t op1, uint32_t op2,
-               uint32_t CRn, uint32_t CRm,
+               uint32_t crn, uint32_t crm,
                uint32_t value);
 
 static int arm720t_init_arch_info(struct target *target,
@@ -432,62 +416,13 @@ static int arm720t_target_create(struct target *target, Jim_Interp *interp)
 {
        struct arm720t_common *arm720t = calloc(1, sizeof(*arm720t));
 
-       arm720t->arm7_9_common.arm.is_armv4 = true;
+       arm720t->arm7_9_common.arm.arch = ARM_ARCH_V4;
        return arm720t_init_arch_info(target, arm720t, target->tap);
 }
 
-COMMAND_HANDLER(arm720t_handle_cp15_command)
-{
-       int retval;
-       struct target *target = get_current_target(CMD_CTX);
-       struct arm720t_common *arm720t = target_to_arm720(target);
-
-       retval = arm720t_verify_pointer(CMD_CTX, arm720t);
-       if (retval != ERROR_OK)
-               return retval;
-
-       if (target->state != TARGET_HALTED) {
-               command_print(CMD_CTX, "target must be stopped for \"%s\" command", CMD_NAME);
-               return ERROR_OK;
-       }
-
-       /* one or more argument, access a single register (write if second argument is given */
-       if (CMD_ARGC >= 1) {
-               uint32_t opcode;
-               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], opcode);
-
-               if (CMD_ARGC == 1) {
-                       uint32_t value;
-                       retval = arm720t_read_cp15(target, opcode, &value);
-                       if (retval != ERROR_OK) {
-                               command_print(CMD_CTX, "couldn't access cp15 with opcode 0x%8.8" PRIx32 "", opcode);
-                               return ERROR_OK;
-                       }
-
-                       retval = jtag_execute_queue();
-                       if (retval != ERROR_OK)
-                               return retval;
-
-                       command_print(CMD_CTX, "0x%8.8" PRIx32 ": 0x%8.8" PRIx32 "", opcode, value);
-               } else if (CMD_ARGC == 2) {
-                       uint32_t value;
-                       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], value);
-
-                       retval = arm720t_write_cp15(target, opcode, value);
-                       if (retval != ERROR_OK) {
-                               command_print(CMD_CTX, "couldn't access cp15 with opcode 0x%8.8" PRIx32 "", opcode);
-                               return ERROR_OK;
-                       }
-                       command_print(CMD_CTX, "0x%8.8" PRIx32 ": 0x%8.8" PRIx32 "", opcode, value);
-               }
-       }
-
-       return ERROR_OK;
-}
-
 static int arm720t_mrc(struct target *target, int cpnum,
                uint32_t op1, uint32_t op2,
-               uint32_t CRn, uint32_t CRm,
+               uint32_t crn, uint32_t crm,
                uint32_t *value)
 {
        if (cpnum != 15) {
@@ -497,14 +432,14 @@ static int arm720t_mrc(struct target *target, int cpnum,
 
        /* read "to" r0 */
        return arm720t_read_cp15(target,
-                       ARMV4_5_MRC(cpnum, op1, 0, CRn, CRm, op2),
+                       ARMV4_5_MRC(cpnum, op1, 0, crn, crm, op2),
                        value);
 
 }
 
 static int arm720t_mcr(struct target *target, int cpnum,
                uint32_t op1, uint32_t op2,
-               uint32_t CRn, uint32_t CRm,
+               uint32_t crn, uint32_t crm,
                uint32_t value)
 {
        if (cpnum != 15) {
@@ -514,34 +449,14 @@ static int arm720t_mcr(struct target *target, int cpnum,
 
        /* write "from" r0 */
        return arm720t_write_cp15(target,
-                       ARMV4_5_MCR(cpnum, op1, 0, CRn, CRm, op2),
+                       ARMV4_5_MCR(cpnum, op1, 0, crn, crm, op2),
                        value);
 }
 
-static const struct command_registration arm720t_exec_command_handlers[] = {
-       {
-               .name = "cp15",
-               .handler = arm720t_handle_cp15_command,
-               .mode = COMMAND_EXEC,
-               /* prefer using less error-prone "arm mcr" or "arm mrc" */
-               .help = "display/modify cp15 register using ARM opcode"
-                       " (DEPRECATED)",
-               .usage = "instruction [value]",
-       },
-       COMMAND_REGISTRATION_DONE
-};
-
 static const struct command_registration arm720t_command_handlers[] = {
        {
                .chain = arm7_9_command_handlers,
        },
-       {
-               .name = "arm720t",
-               .mode = COMMAND_ANY,
-               .help = "arm720t command group",
-               .usage = "",
-               .chain = arm720t_exec_command_handlers,
-       },
        COMMAND_REGISTRATION_DONE
 };
 
@@ -583,6 +498,7 @@ struct target_type arm720t_target = {
        .commands = arm720t_command_handlers,
        .target_create = arm720t_target_create,
        .init_target = arm720t_init_target,
+       .deinit_target = arm720t_deinit_target,
        .examine = arm7_9_examine,
        .check_reset = arm7_9_check_reset,
 };
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)