flash/nor/at91samd: Use 32-bit register writes for ST-Link compat

[fw/openocd] / src / target / arm946e.h

diff --git a/src/target/arm946e.h b/src/target/arm946e.h
index b205534fd924955da2b4630f1cf1122860b2de7a..0196c2b378e77351b84f98d1a3661d5266ac3bb6 100644 (file)
--- a/src/target/arm946e.h
+++ b/src/target/arm946e.h
@@ -16,11 +16,12 @@
 
 #include "arm9tdmi.h"
 
-#define ARM946E_COMMON_MAGIC 0x20f920f9
+#define ARM946E_COMMON_MAGIC 0x20f920f9U
 
 struct arm946e_common {
+       unsigned int common_magic;
+
        struct arm7_9_common arm7_9_common;
-       int common_magic;
        uint32_t cp15_control_reg;
        uint32_t cp15_cache_info;
 };
@@ -31,10 +32,4 @@ static inline struct arm946e_common *target_to_arm946(struct target *target)
                        arm7_9_common.arm);
 }
 
-int arm946e_init_arch_info(struct target *target,
-                          struct arm946e_common *arm946e, struct jtag_tap *tap);
-int arm946e_write_cp15(struct target *target, int reg_addr, uint32_t value);
-
-extern const struct command_registration arm946e_command_handlers[];
-
 #endif /* OPENOCD_TARGET_ARM946E_H */