Make #include guard naming consistent

[openocd] / src / target / cortex_a.h

diff --git a/src/target/cortex_a.h b/src/target/cortex_a.h
index d33188ffcff98eb8557f696d19c556e90c7f1e2c..ea08c670f732ee2ce9865610a6a9daa2bf31f7cd 100644 (file)
--- a/src/target/cortex_a.h
+++ b/src/target/cortex_a.h
@@ -22,13 +22,11 @@
  *   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, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef CORTEX_A_H
-#define CORTEX_A_H
+#ifndef OPENOCD_TARGET_CORTEX_A_H
+#define OPENOCD_TARGET_CORTEX_A_H
 
 #include "armv7a.h"
 
@@ -60,6 +58,11 @@ enum cortex_a_isrmasking_mode {
        CORTEX_A_ISRMASK_ON,
 };
 
+enum cortex_a_dacrfixup_mode {
+       CORTEX_A_DACRFIXUP_OFF,
+       CORTEX_A_DACRFIXUP_ON
+};
+
 struct cortex_a_brp {
        int used;
        int type;
@@ -78,9 +81,12 @@ struct cortex_a_common {
        uint32_t cp15_control_reg;
        /* latest cp15 register value written and cpsr processor mode */
        uint32_t cp15_control_reg_curr;
+       /* auxiliary control reg */
+       uint32_t cp15_aux_control_reg;
+       /* DACR */
+       uint32_t cp15_dacr_reg;
        enum arm_mode curr_mode;
 
-
        /* Breakpoint register pairs */
        int brp_num_context;
        int brp_num;
@@ -96,6 +102,7 @@ struct cortex_a_common {
        uint32_t didr;
 
        enum cortex_a_isrmasking_mode isrmasking_mode;
+       enum cortex_a_dacrfixup_mode dacrfixup_mode;
 
        struct armv7a_common armv7a_common;
 
@@ -107,4 +114,4 @@ target_to_cortex_a(struct target *target)
        return container_of(target->arch_info, struct cortex_a_common, armv7a_common.arm);
 }
 
-#endif /* CORTEX_A_H */
+#endif /* OPENOCD_TARGET_CORTEX_A_H */