X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm_adi_v5.h;h=3ff883af755bc8b508a5b49e633833d1e81614a7;hp=99789da2c1d7386bdfc75ea57d6a107a6c16d719;hb=6a2fd7cad507ef24a7dc4ce3c5f8b5351dd12656;hpb=573d9a036894670e64f7ed22a6e842961bc24b8e diff --git a/src/target/arm_adi_v5.h b/src/target/arm_adi_v5.h index 99789da2c1..3ff883af75 100644 --- a/src/target/arm_adi_v5.h +++ b/src/target/arm_adi_v5.h @@ -27,8 +27,8 @@ #include "register.h" #include "arm_jtag.h" -#define SWJDP_IR_DPACC 0xA -#define SWJDP_IR_APACC 0xB +#define DAP_IR_DPACC 0xA +#define DAP_IR_APACC 0xB #define DPAP_WRITE 0 #define DPAP_READ 1 @@ -37,15 +37,15 @@ #define DP_SELECT 0x8 #define DP_RDBUFF 0xC -#define CORUNDETECT (1<<0) -#define SSTICKYORUN (1<<1) -#define SSTICKYERR (1<<5) -#define CDBGRSTREQ (1<<26) -#define CDBGRSTACK (1<<27) -#define CDBGPWRUPREQ (1<<28) -#define CDBGPWRUPACK (1<<29) -#define CSYSPWRUPREQ (1<<30) -#define CSYSPWRUPACK (1<<31) +#define CORUNDETECT (1 << 0) +#define SSTICKYORUN (1 << 1) +#define SSTICKYERR (1 << 5) +#define CDBGRSTREQ (1 << 26) +#define CDBGRSTACK (1 << 27) +#define CDBGPWRUPREQ (1 << 28) +#define CDBGPWRUPACK (1 << 29) +#define CSYSPWRUPREQ (1 << 30) +#define CSYSPWRUPACK (1 << 31) #define AP_REG_CSW 0x00 #define AP_REG_TAR 0x04 @@ -61,13 +61,13 @@ #define CSW_16BIT 1 #define CSW_32BIT 2 -#define CSW_ADDRINC_MASK (3<<4) +#define CSW_ADDRINC_MASK (3 << 4) #define CSW_ADDRINC_OFF 0 -#define CSW_ADDRINC_SINGLE (1<<4) -#define CSW_ADDRINC_PACKED (2<<4) -#define CSW_HPROT (1<<25) -#define CSW_MASTER_DEBUG (1<<29) -#define CSW_DBGSWENABLE (1<<31) +#define CSW_ADDRINC_SINGLE (1 << 4) +#define CSW_ADDRINC_PACKED (2 << 4) +#define CSW_HPROT (1 << 25) +#define CSW_MASTER_DEBUG (1 << 29) +#define CSW_DBGSWENABLE (1 << 31) /* transaction mode */ #define TRANS_MODE_NONE 0 @@ -86,57 +86,76 @@ typedef struct swjdp_common_s { arm_jtag_t *jtag_info; /* Control config */ - u32 dp_ctrl_stat; + uint32_t dp_ctrl_stat; /* Support for several AP's in one DAP */ - u32 apsel; + uint32_t apsel; /* Register select cache */ - u32 dp_select_value; - u32 ap_csw_value; - u32 ap_tar_value; + uint32_t dp_select_value; + uint32_t ap_csw_value; + uint32_t ap_tar_value; /* information about current pending SWjDP-AHBAP transaction */ - u8 trans_mode; - u8 trans_rw; - u8 ack; + uint8_t trans_mode; + uint8_t trans_rw; + uint8_t ack; + /* extra tck clocks for memory bus access */ + uint32_t memaccess_tck; + /* Size of TAR autoincrement block, ARM ADI Specification requires at least 10 bits */ + uint32_t tar_autoincr_block; + } swjdp_common_t; +/* Accessor function for currently selected DAP-AP number */ +static inline uint8_t dap_ap_get_select(swjdp_common_t *swjdp) +{ + return (uint8_t)(swjdp ->apsel >> 24); +} + /* Internal functions used in the module, partial transactions, use with caution */ -extern int dap_dp_write_reg(swjdp_common_t *swjdp, u32 value, u8 reg_addr); -/* extern int swjdp_write_apacc(swjdp_common_t *swjdp, u32 value, u8 reg_addr); */ -extern int dap_dp_read_reg(swjdp_common_t *swjdp, u32 *value, u8 reg_addr); -/* extern int swjdp_read_apacc(swjdp_common_t *swjdp, u32 *value, u8 reg_addr); */ -extern int dap_setup_accessport(swjdp_common_t *swjdp, u32 csw, u32 tar); -extern int dap_ap_select(swjdp_common_t *swjdp,u8 apsel); - -extern int dap_ap_write_reg(swjdp_common_t *swjdp, u32 reg_addr, u8* out_value_buf); -extern int dap_ap_write_reg_u32(swjdp_common_t *swjdp, u32 reg_addr, u32 value); -extern int dap_ap_read_reg(swjdp_common_t *swjdp, u32 reg_addr, u8 *in_value_buf); -extern int dap_ap_read_reg_u32(swjdp_common_t *swjdp, u32 reg_addr, u32 *value); +extern int dap_dp_write_reg(swjdp_common_t *swjdp, uint32_t value, uint8_t reg_addr); +/* extern int swjdp_write_apacc(swjdp_common_t *swjdp, uint32_t value, uint8_t reg_addr); */ +extern int dap_dp_read_reg(swjdp_common_t *swjdp, uint32_t *value, uint8_t reg_addr); +/* extern int swjdp_read_apacc(swjdp_common_t *swjdp, uint32_t *value, uint8_t reg_addr); */ +extern int dap_setup_accessport(swjdp_common_t *swjdp, uint32_t csw, uint32_t tar); +extern int dap_ap_select(swjdp_common_t *swjdp,uint8_t apsel); + +extern int dap_ap_write_reg(swjdp_common_t *swjdp, uint32_t reg_addr, uint8_t* out_value_buf); +extern int dap_ap_write_reg_u32(swjdp_common_t *swjdp, uint32_t reg_addr, uint32_t value); +extern int dap_ap_read_reg(swjdp_common_t *swjdp, uint32_t reg_addr, uint8_t *in_value_buf); +extern int dap_ap_read_reg_u32(swjdp_common_t *swjdp, uint32_t reg_addr, uint32_t *value); /* External interface, partial operations must be completed with swjdp_transaction_endcheck() */ extern int swjdp_transaction_endcheck(swjdp_common_t *swjdp); -/* MEM-AP memory mapped bus single u32 register transfers, without endcheck */ -extern int mem_ap_read_u32(swjdp_common_t *swjdp, u32 address, u32 *value); -extern int mem_ap_write_u32(swjdp_common_t *swjdp, u32 address, u32 value); +/* MEM-AP memory mapped bus single uint32_t register transfers, without endcheck */ +extern int mem_ap_read_u32(swjdp_common_t *swjdp, uint32_t address, uint32_t *value); +extern int mem_ap_write_u32(swjdp_common_t *swjdp, uint32_t address, uint32_t value); /* MEM-AP memory mapped bus transfers, single registers, complete transactions */ -extern int mem_ap_read_atomic_u32(swjdp_common_t *swjdp, u32 address, u32 *value); -extern int mem_ap_write_atomic_u32(swjdp_common_t *swjdp, u32 address, u32 value); +extern int mem_ap_read_atomic_u32(swjdp_common_t *swjdp, uint32_t address, uint32_t *value); +extern int mem_ap_write_atomic_u32(swjdp_common_t *swjdp, uint32_t address, uint32_t value); /* MEM-AP memory mapped bus block transfers */ -extern int mem_ap_read_buf_u8(swjdp_common_t *swjdp, u8 *buffer, int count, u32 address); -extern int mem_ap_read_buf_u16(swjdp_common_t *swjdp, u8 *buffer, int count, u32 address); -extern int mem_ap_read_buf_u32(swjdp_common_t *swjdp, u8 *buffer, int count, u32 address); -extern int mem_ap_write_buf_u8(swjdp_common_t *swjdp, u8 *buffer, int count, u32 address); -extern int mem_ap_write_buf_u16(swjdp_common_t *swjdp, u8 *buffer, int count, u32 address); -extern int mem_ap_write_buf_u32(swjdp_common_t *swjdp, u8 *buffer, int count, u32 address); +extern int mem_ap_read_buf_u8(swjdp_common_t *swjdp, uint8_t *buffer, int count, uint32_t address); +extern int mem_ap_read_buf_u16(swjdp_common_t *swjdp, uint8_t *buffer, int count, uint32_t address); +extern int mem_ap_read_buf_u32(swjdp_common_t *swjdp, uint8_t *buffer, int count, uint32_t address); +extern int mem_ap_write_buf_u8(swjdp_common_t *swjdp, uint8_t *buffer, int count, uint32_t address); +extern int mem_ap_write_buf_u16(swjdp_common_t *swjdp, uint8_t *buffer, int count, uint32_t address); +extern int mem_ap_write_buf_u32(swjdp_common_t *swjdp, uint8_t *buffer, int count, uint32_t address); /* Initialisation of the debug system, power domains and registers */ extern int ahbap_debugport_init(swjdp_common_t *swjdp); -extern int dap_info_command(struct command_context_s *cmd_ctx, swjdp_common_t *swjdp, int apsel); + /* Commands for user dap access */ -extern int handle_dap_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -extern int handle_dap_apsel_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +int dap_info_command(struct command_context_s *cmd_ctx, + swjdp_common_t *swjdp, int apsel); +int dap_baseaddr_command(struct command_context_s *cmd_ctx, + swjdp_common_t *swjdp, char **args, int argc); +int dap_memaccess_command(struct command_context_s *cmd_ctx, + swjdp_common_t *swjdp, char **args, int argc); +int dap_apsel_command(struct command_context_s *cmd_ctx, + swjdp_common_t *swjdp, char **args, int argc); +int dap_apid_command(struct command_context_s *cmd_ctx, + swjdp_common_t *swjdp, char **args, int argc); #endif