X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm966e.h;h=e7ace9299ed59d961fe1542bdf2a57d8746edfb6;hb=a6c4eb03455f6e97fc25183aae249d6ccdcbfb0f;hp=74e1a0308f4ce9f1fcdf981b3a9bf5bfc005f809;hpb=0f1163e823c6ca3c2a81fa296157f5dde0635fea;p=openocd.git

diff --git a/src/target/arm966e.h b/src/target/arm966e.h
index 74e1a0308f..e7ace9299e 100644
--- a/src/target/arm966e.h
+++ b/src/target/arm966e.h
@@ -18,8 +18,9 @@
  *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
+
 #ifndef ARM966E_H
 #define ARM966E_H
 
@@ -27,9 +28,8 @@
 
 #define	ARM966E_COMMON_MAGIC 0x20f920f9
 
-struct arm966e_common
-{
-	struct arm9tdmi_common arm9tdmi_common;
+struct arm966e_common {
+	struct arm7_9_common arm7_9_common;
 	int common_magic;
 	uint32_t cp15_control_reg;
 };
@@ -38,12 +38,13 @@ static inline struct arm966e_common *
 target_to_arm966(struct target *target)
 {
 	return container_of(target->arch_info, struct arm966e_common,
-			arm9tdmi_common.arm7_9_common.armv4_5_common);
+			arm7_9_common.arm);
 }
 
 int arm966e_init_arch_info(struct target *target,
 		struct arm966e_common *arm966e, struct jtag_tap *tap);
-int arm966e_register_commands(struct command_context_s *cmd_ctx);
 int arm966e_write_cp15(struct target *target, int reg_addr, uint32_t value);
 
+extern const struct command_registration arm966e_command_handlers[];
+
 #endif /* ARM966E_H */