target: don't implicitly include "breakpoint.h"

[openocd.git] / src / target / arm_adi_v5.c

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 3323485eaa7e6b5368daf4eaa26208ecebb9a0b4..958844bb00bda1efde006ed27fd4dcc98c05d760 100644 (file)
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -73,7 +73,7 @@ static uint32_t max_tar_block_size(uint32_t tar_autoincr_block, uint32_t address
 /* Scan out and in from target ordered uint8_t buffers */
 int adi_jtag_dp_scan(struct swjdp_common *swjdp, uint8_t instr, uint8_t reg_addr, uint8_t RnW, uint8_t *outvalue, uint8_t *invalue, uint8_t *ack)
 {
-       arm_jtag_t *jtag_info = swjdp->jtag_info;
+       struct arm_jtag *jtag_info = swjdp->jtag_info;
        struct scan_field fields[2];
        uint8_t out_addr_buf;
 
@@ -103,7 +103,7 @@ int adi_jtag_dp_scan(struct swjdp_common *swjdp, uint8_t instr, uint8_t reg_addr
 /* Scan out and in from host ordered uint32_t variables */
 int adi_jtag_dp_scan_u32(struct swjdp_common *swjdp, uint8_t instr, uint8_t reg_addr, uint8_t RnW, uint32_t outvalue, uint32_t *invalue, uint8_t *ack)
 {
-       arm_jtag_t *jtag_info = swjdp->jtag_info;
+       struct arm_jtag *jtag_info = swjdp->jtag_info;
        struct scan_field fields[2];
        uint8_t out_value_buf[4];
        uint8_t out_addr_buf;
@@ -1022,7 +1022,7 @@ is_dap_cid_ok(uint32_t cid3, uint32_t cid2, uint32_t cid1, uint32_t cid0)
                        && ((cid1 & 0x0f) == 0) && cid0 == 0x0d;
 }
 
-int dap_info_command(struct command_context_s *cmd_ctx, struct swjdp_common *swjdp, int apsel)
+int dap_info_command(struct command_context *cmd_ctx, struct swjdp_common *swjdp, int apsel)
 {
 
        uint32_t dbgbase,apid;