ARM11: partial support for standard ARM register interfaces.

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

diff --git a/src/target/arm_adi_v5.h b/src/target/arm_adi_v5.h
index 5f2c96977e604da8c9082d6e4606d2a32517a584..a78193c6d0dd8ed076b4216d5001b7917621c5ba 100644 (file)
--- a/src/target/arm_adi_v5.h
+++ b/src/target/arm_adi_v5.h
@@ -23,8 +23,6 @@
 #ifndef ARM_ADI_V5_H
 #define ARM_ADI_V5_H
 
-#include "target.h"
-#include "register.h"
 #include "arm_jtag.h"
 
 #define DAP_IR_DPACC   0xA
@@ -79,12 +77,12 @@
 struct swjdp_reg
 {
        int addr;
-       arm_jtag_t *jtag_info;
+       struct arm_jtag *jtag_info;
 };
 
 struct swjdp_common
 {
-       arm_jtag_t *jtag_info;
+       struct arm_jtag *jtag_info;
        /* Control config */
        uint32_t dp_ctrl_stat;
        /* Support for several AP's in one DAP */
@@ -156,7 +154,7 @@ int ahbap_debugport_init(struct swjdp_common *swjdp);
 
 
 /* Commands for user dap access */
-int dap_info_command(struct command_context_s *cmd_ctx,
+int dap_info_command(struct command_context *cmd_ctx,
                struct swjdp_common *swjdp, int apsel);
 
 #define DAP_COMMAND_HANDLER(name) \