jtag: linuxgpiod: drop extra parenthesis

[openocd.git] / src / target / arm_dpm.h

diff --git a/src/target/arm_dpm.h b/src/target/arm_dpm.h
index 82707822b1f90cf576533568305ebf98ba1d2584..2da4631112d465fef4818d81d5343c81a18f6a46 100644 (file)
--- a/src/target/arm_dpm.h
+++ b/src/target/arm_dpm.h
@@ -1,18 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /*
  * Copyright (C) 2009 by David Brownell
- *
- * 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/>.
  */
 
 #ifndef OPENOCD_TARGET_ARM_DPM_H
@@ -83,6 +72,12 @@ struct arm_dpm {
        int (*instr_write_data_r0)(struct arm_dpm *dpm,
                        uint32_t opcode, uint32_t data);
 
+       /**
+        * Runs two instructions, writing data to R0 and R1 before execution.
+        */
+       int (*instr_write_data_r0_r1)(struct arm_dpm *dpm,
+                       uint32_t opcode, uint64_t data);
+
        /** Runs one instruction, writing data to R0 before execution. */
        int (*instr_write_data_r0_64)(struct arm_dpm *dpm,
                        uint32_t opcode, uint64_t data);
@@ -103,6 +98,13 @@ struct arm_dpm {
        int (*instr_read_data_r0)(struct arm_dpm *dpm,
                        uint32_t opcode, uint32_t *data);
 
+       /**
+        * Runs two instructions, reading data from r0 and r1 after
+        * execution.
+        */
+       int (*instr_read_data_r0_r1)(struct arm_dpm *dpm,
+                       uint32_t opcode, uint64_t *data);
+
        int (*instr_read_data_r0_64)(struct arm_dpm *dpm,
                        uint32_t opcode, uint64_t *data);
 
@@ -137,8 +139,12 @@ struct arm_dpm {
        struct dpm_bp *dbp;
        struct dpm_wp *dwp;
 
-       /** Address of the instruction which triggered a watchpoint. */
-       target_addr_t wp_pc;
+       /**
+        * Target dependent watchpoint address.
+        * Either the address of the instruction which triggered a watchpoint
+        * or the memory address whose access triggered a watchpoint.
+        */
+       target_addr_t wp_addr;
 
        /** Recent value of DSCR. */
        uint32_t dscr;
@@ -237,7 +243,7 @@ void arm_dpm_report_dscr(struct arm_dpm *dpm, uint32_t dcsr);
 /* OSLSR (OS Lock Status Register) bits */
 #define OSLSR_OSLM0                      (1 << 0)
 #define OSLSR_OSLK                       (1 << 1)
-#define OSLSR_nTT                        (1 << 2)
+#define OSLSR_NTT                        (1 << 2)
 #define OSLSR_OSLM1                      (1 << 3)
 #define OSLSR_OSLM                       (OSLSR_OSLM0|OSLSR_OSLM1)