X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farmv7m.c;h=4a6869fae6b3dc3eb18a49e5507a36471f5bbf3a;hp=0f9d811405a5d5efde32df098f5b8fdbc53a3a18;hb=46fc1d57ac9462fd788277609707a379c7a406cb;hpb=d02fee197f62331e36e9de110040f0170341c3e8

diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index 0f9d811405..4a6869fae6 100644
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -136,7 +136,7 @@ static int armv7m_core_reg_arch_type = -1;
 int armv7m_restore_context(target_t *target)
 {
 	int i;
-	struct armv7m_common_s *armv7m = target_to_armv7m(target);
+	struct armv7m_common *armv7m = target_to_armv7m(target);
 
 	LOG_DEBUG(" ");
 
@@ -181,9 +181,9 @@ char *armv7m_exception_string(int number)
 static int armv7m_get_core_reg(reg_t *reg)
 {
 	int retval;
-	armv7m_core_reg_t *armv7m_reg = reg->arch_info;
+	struct armv7m_core_reg *armv7m_reg = reg->arch_info;
 	target_t *target = armv7m_reg->target;
-	struct armv7m_common_s *armv7m = target_to_armv7m(target);
+	struct armv7m_common *armv7m = target_to_armv7m(target);
 
 	if (target->state != TARGET_HALTED)
 	{
@@ -197,7 +197,7 @@ static int armv7m_get_core_reg(reg_t *reg)
 
 static int armv7m_set_core_reg(reg_t *reg, uint8_t *buf)
 {
-	armv7m_core_reg_t *armv7m_reg = reg->arch_info;
+	struct armv7m_core_reg *armv7m_reg = reg->arch_info;
 	target_t *target = armv7m_reg->target;
 	uint32_t value = buf_get_u32(buf, 0, 32);
 
@@ -217,8 +217,8 @@ static int armv7m_read_core_reg(struct target_s *target, int num)
 {
 	uint32_t reg_value;
 	int retval;
-	armv7m_core_reg_t * armv7m_core_reg;
-	struct armv7m_common_s *armv7m = target_to_armv7m(target);
+	struct armv7m_core_reg * armv7m_core_reg;
+	struct armv7m_common *armv7m = target_to_armv7m(target);
 
 	if ((num < 0) || (num >= ARMV7M_NUM_REGS))
 		return ERROR_INVALID_ARGUMENTS;
@@ -236,8 +236,8 @@ static int armv7m_write_core_reg(struct target_s *target, int num)
 {
 	int retval;
 	uint32_t reg_value;
-	armv7m_core_reg_t *armv7m_core_reg;
-	struct armv7m_common_s *armv7m = target_to_armv7m(target);
+	struct armv7m_core_reg *armv7m_core_reg;
+	struct armv7m_common *armv7m = target_to_armv7m(target);
 
 	if ((num < 0) || (num >= ARMV7M_NUM_REGS))
 		return ERROR_INVALID_ARGUMENTS;
@@ -261,7 +261,7 @@ static int armv7m_write_core_reg(struct target_s *target, int num)
 /** Invalidates cache of core registers set up by armv7m_build_reg_cache(). */
 int armv7m_invalidate_core_regs(target_t *target)
 {
-	struct armv7m_common_s *armv7m = target_to_armv7m(target);
+	struct armv7m_common *armv7m = target_to_armv7m(target);
 	int i;
 
 	for (i = 0; i < armv7m->core_cache->num_regs; i++)
@@ -281,7 +281,7 @@ int armv7m_invalidate_core_regs(target_t *target)
  */
 int armv7m_get_gdb_reg_list(target_t *target, reg_t **reg_list[], int *reg_list_size)
 {
-	struct armv7m_common_s *armv7m = target_to_armv7m(target);
+	struct armv7m_common *armv7m = target_to_armv7m(target);
 	int i;
 
 	*reg_list_size = 26;
@@ -321,7 +321,7 @@ int armv7m_get_gdb_reg_list(target_t *target, reg_t **reg_list[], int *reg_list_
 }
 
 /* run to exit point. return error if exit point was not reached. */
-static int armv7m_run_and_wait(struct target_s *target, uint32_t entry_point, int timeout_ms, uint32_t exit_point, armv7m_common_t *armv7m)
+static int armv7m_run_and_wait(struct target_s *target, uint32_t entry_point, int timeout_ms, uint32_t exit_point, struct armv7m_common *armv7m)
 {
 	uint32_t pc;
 	int retval;
@@ -357,13 +357,13 @@ static int armv7m_run_and_wait(struct target_s *target, uint32_t entry_point, in
 
 /** Runs a Thumb algorithm in the target. */
 int armv7m_run_algorithm(struct target_s *target,
-	int num_mem_params, mem_param_t *mem_params,
-	int num_reg_params, reg_param_t *reg_params,
+	int num_mem_params, struct mem_param *mem_params,
+	int num_reg_params, struct reg_param *reg_params,
 	uint32_t entry_point, uint32_t exit_point,
 	int timeout_ms, void *arch_info)
 {
-	struct armv7m_common_s *armv7m = target_to_armv7m(target);
-	armv7m_algorithm_t *armv7m_algorithm_info = arch_info;
+	struct armv7m_common *armv7m = target_to_armv7m(target);
+	struct armv7m_algorithm *armv7m_algorithm_info = arch_info;
 	enum armv7m_mode core_mode = armv7m->core_mode;
 	int retval = ERROR_OK;
 	int i;
@@ -503,7 +503,7 @@ int armv7m_run_algorithm(struct target_s *target,
 /** Logs summary of ARMv7-M state for a halted target. */
 int armv7m_arch_state(struct target_s *target)
 {
-	struct armv7m_common_s *armv7m = target_to_armv7m(target);
+	struct armv7m_common *armv7m = target_to_armv7m(target);
 	uint32_t ctrl, sp;
 
 	ctrl = buf_get_u32(armv7m->core_cache->reg_list[ARMV7M_CONTROL].value, 0, 32);
@@ -524,14 +524,14 @@ int armv7m_arch_state(struct target_s *target)
 }
 
 /** Builds cache of architecturally defined registers.  */
-reg_cache_t *armv7m_build_reg_cache(target_t *target)
+struct reg_cache *armv7m_build_reg_cache(target_t *target)
 {
-	struct armv7m_common_s *armv7m = target_to_armv7m(target);
+	struct armv7m_common *armv7m = target_to_armv7m(target);
 	int num_regs = ARMV7M_NUM_REGS;
-	reg_cache_t **cache_p = register_get_last_cache_p(&target->reg_cache);
-	reg_cache_t *cache = malloc(sizeof(reg_cache_t));
+	struct reg_cache **cache_p = register_get_last_cache_p(&target->reg_cache);
+	struct reg_cache *cache = malloc(sizeof(struct reg_cache));
 	reg_t *reg_list = calloc(num_regs, sizeof(reg_t));
-	armv7m_core_reg_t *arch_info = calloc(num_regs, sizeof(armv7m_core_reg_t));
+	struct armv7m_core_reg *arch_info = calloc(num_regs, sizeof(struct armv7m_core_reg));
 	int i;
 
 	if (armv7m_core_reg_arch_type == -1)
@@ -573,7 +573,7 @@ reg_cache_t *armv7m_build_reg_cache(target_t *target)
 }
 
 /** Sets up target as a generic ARMv7-M core */
-int armv7m_init_arch_info(target_t *target, armv7m_common_t *armv7m)
+int armv7m_init_arch_info(target_t *target, struct armv7m_common *armv7m)
 {
 	/* register arch-specific functions */
 
@@ -588,9 +588,9 @@ int armv7m_init_arch_info(target_t *target, armv7m_common_t *armv7m)
 int armv7m_checksum_memory(struct target_s *target,
 		uint32_t address, uint32_t count, uint32_t* checksum)
 {
-	working_area_t *crc_algorithm;
-	armv7m_algorithm_t armv7m_info;
-	reg_param_t reg_params[2];
+	struct working_area *crc_algorithm;
+	struct armv7m_algorithm armv7m_info;
+	struct reg_param reg_params[2];
 	int retval;
 
 	static const uint16_t cortex_m3_crc_code[] = {
@@ -671,9 +671,9 @@ int armv7m_checksum_memory(struct target_s *target,
 int armv7m_blank_check_memory(struct target_s *target,
 		uint32_t address, uint32_t count, uint32_t* blank)
 {
-	working_area_t *erase_check_algorithm;
-	reg_param_t reg_params[3];
-	armv7m_algorithm_t armv7m_info;
+	struct working_area *erase_check_algorithm;
+	struct reg_param reg_params[3];
+	struct armv7m_algorithm armv7m_info;
 	int retval;
 	uint32_t i;
 
@@ -748,8 +748,8 @@ int armv7m_blank_check_memory(struct target_s *target,
 COMMAND_HANDLER(handle_dap_baseaddr_command)
 {
 	target_t *target = get_current_target(cmd_ctx);
-	struct armv7m_common_s *armv7m = target_to_armv7m(target);
-	swjdp_common_t *swjdp = &armv7m->swjdp_info;
+	struct armv7m_common *armv7m = target_to_armv7m(target);
+	struct swjdp_common *swjdp = &armv7m->swjdp_info;
 	uint32_t apsel, apselsave, baseaddr;
 	int retval;
 
@@ -785,8 +785,8 @@ COMMAND_HANDLER(handle_dap_baseaddr_command)
 COMMAND_HANDLER(handle_dap_apid_command)
 {
 	target_t *target = get_current_target(cmd_ctx);
-	struct armv7m_common_s *armv7m = target_to_armv7m(target);
-	swjdp_common_t *swjdp = &armv7m->swjdp_info;
+	struct armv7m_common *armv7m = target_to_armv7m(target);
+	struct swjdp_common *swjdp = &armv7m->swjdp_info;
 
 	return CALL_COMMAND_HANDLER(dap_apid_command, swjdp);
 }
@@ -794,8 +794,8 @@ COMMAND_HANDLER(handle_dap_apid_command)
 COMMAND_HANDLER(handle_dap_apsel_command)
 {
 	target_t *target = get_current_target(cmd_ctx);
-	struct armv7m_common_s *armv7m = target_to_armv7m(target);
-	swjdp_common_t *swjdp = &armv7m->swjdp_info;
+	struct armv7m_common *armv7m = target_to_armv7m(target);
+	struct swjdp_common *swjdp = &armv7m->swjdp_info;
 
 	return CALL_COMMAND_HANDLER(dap_apsel_command, swjdp);
 }
@@ -803,8 +803,8 @@ COMMAND_HANDLER(handle_dap_apsel_command)
 COMMAND_HANDLER(handle_dap_memaccess_command)
 {
 	target_t *target = get_current_target(cmd_ctx);
-	struct armv7m_common_s *armv7m = target_to_armv7m(target);
-	swjdp_common_t *swjdp = &armv7m->swjdp_info;
+	struct armv7m_common *armv7m = target_to_armv7m(target);
+	struct swjdp_common *swjdp = &armv7m->swjdp_info;
 
 	return CALL_COMMAND_HANDLER(dap_memaccess_command, swjdp);
 }
@@ -813,8 +813,8 @@ COMMAND_HANDLER(handle_dap_memaccess_command)
 COMMAND_HANDLER(handle_dap_info_command)
 {
 	target_t *target = get_current_target(cmd_ctx);
-	struct armv7m_common_s *armv7m = target_to_armv7m(target);
-	swjdp_common_t *swjdp = &armv7m->swjdp_info;
+	struct armv7m_common *armv7m = target_to_armv7m(target);
+	struct swjdp_common *swjdp = &armv7m->swjdp_info;
 	uint32_t apsel;
 
 	switch (argc) {