From f96d6054e65708e7abdceac673f1a18fec3204b6 Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Fri, 13 Nov 2009 08:40:31 -0800 Subject: swjdp_common_t -> struct swjdp_common Remove misleading typedef and redundant suffix from struct swjdp_common. --- src/target/arm_adi_v5.h | 56 ++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'src/target/arm_adi_v5.h') diff --git a/src/target/arm_adi_v5.h b/src/target/arm_adi_v5.h index a52a0964..5f2c9697 100644 --- a/src/target/arm_adi_v5.h +++ b/src/target/arm_adi_v5.h @@ -82,7 +82,7 @@ struct swjdp_reg arm_jtag_t *jtag_info; }; -typedef struct swjdp_common_s +struct swjdp_common { arm_jtag_t *jtag_info; /* Control config */ @@ -102,65 +102,65 @@ typedef struct swjdp_common_s /* 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) +static inline uint8_t dap_ap_get_select(struct swjdp_common *swjdp) { return (uint8_t)(swjdp ->apsel >> 24); } /* Internal functions used in the module, partial transactions, use with caution */ -int dap_dp_write_reg(swjdp_common_t *swjdp, uint32_t value, uint8_t reg_addr); -/* int swjdp_write_apacc(swjdp_common_t *swjdp, uint32_t value, uint8_t reg_addr); */ -int dap_dp_read_reg(swjdp_common_t *swjdp, uint32_t *value, uint8_t reg_addr); -/* int swjdp_read_apacc(swjdp_common_t *swjdp, uint32_t *value, uint8_t reg_addr); */ -int dap_setup_accessport(swjdp_common_t *swjdp, uint32_t csw, uint32_t tar); -int dap_ap_select(swjdp_common_t *swjdp,uint8_t apsel); - -int dap_ap_write_reg(swjdp_common_t *swjdp, uint32_t addr, uint8_t* out_buf); -int dap_ap_write_reg_u32(swjdp_common_t *swjdp, uint32_t addr, uint32_t value); -int dap_ap_read_reg(swjdp_common_t *swjdp, uint32_t addr, uint8_t *in_buf); -int dap_ap_read_reg_u32(swjdp_common_t *swjdp, uint32_t addr, uint32_t *value); +int dap_dp_write_reg(struct swjdp_common *swjdp, uint32_t value, uint8_t reg_addr); +/* int swjdp_write_apacc(struct swjdp_common *swjdp, uint32_t value, uint8_t reg_addr); */ +int dap_dp_read_reg(struct swjdp_common *swjdp, uint32_t *value, uint8_t reg_addr); +/* int swjdp_read_apacc(struct swjdp_common *swjdp, uint32_t *value, uint8_t reg_addr); */ +int dap_setup_accessport(struct swjdp_common *swjdp, uint32_t csw, uint32_t tar); +int dap_ap_select(struct swjdp_common *swjdp,uint8_t apsel); + +int dap_ap_write_reg(struct swjdp_common *swjdp, uint32_t addr, uint8_t* out_buf); +int dap_ap_write_reg_u32(struct swjdp_common *swjdp, uint32_t addr, uint32_t value); +int dap_ap_read_reg(struct swjdp_common *swjdp, uint32_t addr, uint8_t *in_buf); +int dap_ap_read_reg_u32(struct swjdp_common *swjdp, uint32_t addr, uint32_t *value); /* External interface, partial operations must be completed with swjdp_transaction_endcheck() */ -int swjdp_transaction_endcheck(swjdp_common_t *swjdp); +int swjdp_transaction_endcheck(struct swjdp_common *swjdp); /* MEM-AP memory mapped bus single uint32_t register transfers, without endcheck */ -int mem_ap_read_u32(swjdp_common_t *swjdp, uint32_t address, uint32_t *value); -int mem_ap_write_u32(swjdp_common_t *swjdp, uint32_t address, uint32_t value); +int mem_ap_read_u32(struct swjdp_common *swjdp, uint32_t address, uint32_t *value); +int mem_ap_write_u32(struct swjdp_common *swjdp, uint32_t address, uint32_t value); /* MEM-AP memory mapped bus transfers, single registers, complete transactions */ -int mem_ap_read_atomic_u32(swjdp_common_t *swjdp, +int mem_ap_read_atomic_u32(struct swjdp_common *swjdp, uint32_t address, uint32_t *value); -int mem_ap_write_atomic_u32(swjdp_common_t *swjdp, +int mem_ap_write_atomic_u32(struct swjdp_common *swjdp, uint32_t address, uint32_t value); /* MEM-AP memory mapped bus block transfers */ -int mem_ap_read_buf_u8(swjdp_common_t *swjdp, +int mem_ap_read_buf_u8(struct swjdp_common *swjdp, uint8_t *buffer, int count, uint32_t address); -int mem_ap_read_buf_u16(swjdp_common_t *swjdp, +int mem_ap_read_buf_u16(struct swjdp_common *swjdp, uint8_t *buffer, int count, uint32_t address); -int mem_ap_read_buf_u32(swjdp_common_t *swjdp, +int mem_ap_read_buf_u32(struct swjdp_common *swjdp, uint8_t *buffer, int count, uint32_t address); -int mem_ap_write_buf_u8(swjdp_common_t *swjdp, +int mem_ap_write_buf_u8(struct swjdp_common *swjdp, uint8_t *buffer, int count, uint32_t address); -int mem_ap_write_buf_u16(swjdp_common_t *swjdp, +int mem_ap_write_buf_u16(struct swjdp_common *swjdp, uint8_t *buffer, int count, uint32_t address); -int mem_ap_write_buf_u32(swjdp_common_t *swjdp, +int mem_ap_write_buf_u32(struct swjdp_common *swjdp, uint8_t *buffer, int count, uint32_t address); /* Initialisation of the debug system, power domains and registers */ -int ahbap_debugport_init(swjdp_common_t *swjdp); +int ahbap_debugport_init(struct swjdp_common *swjdp); /* Commands for user dap access */ int dap_info_command(struct command_context_s *cmd_ctx, - swjdp_common_t *swjdp, int apsel); + struct swjdp_common *swjdp, int apsel); #define DAP_COMMAND_HANDLER(name) \ - COMMAND_HELPER(name, swjdp_common_t *swjdp) + COMMAND_HELPER(name, struct swjdp_common *swjdp) DAP_COMMAND_HANDLER(dap_baseaddr_command); DAP_COMMAND_HANDLER(dap_memaccess_command); DAP_COMMAND_HANDLER(dap_apsel_command); -- cgit v1.2.3