X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fstm32x.c;h=cf842fcf74f0f6002685dd0da5eb2bb3aba170d2;hp=eab9708b37a2a151de0fae484652ebb1e954ffe0;hb=96b62996d2d81b09a48bf253bc9e60e637f687bd;hpb=632fd663a821047df9a9b965ec1c35d6b034ebba

diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c
index eab9708b37..cf842fcf74 100644
--- a/src/flash/stm32x.c
+++ b/src/flash/stm32x.c
@@ -29,13 +29,13 @@
 #include "binarybuffer.h"
 
 
-static int stm32x_mass_erase(struct flash_bank_s *bank);
+static int stm32x_mass_erase(struct flash_bank *bank);
 
 /* flash bank stm32x <base> <size> 0 0 <target#>
  */
 FLASH_BANK_COMMAND_HANDLER(stm32x_flash_bank_command)
 {
-	stm32x_flash_bank_t *stm32x_info;
+	struct stm32x_flash_bank *stm32x_info;
 
 	if (argc < 6)
 	{
@@ -43,7 +43,7 @@ FLASH_BANK_COMMAND_HANDLER(stm32x_flash_bank_command)
 		return ERROR_FLASH_BANK_INVALID;
 	}
 
-	stm32x_info = malloc(sizeof(stm32x_flash_bank_t));
+	stm32x_info = malloc(sizeof(struct stm32x_flash_bank));
 	bank->driver_priv = stm32x_info;
 
 	stm32x_info->write_algorithm = NULL;
@@ -52,9 +52,9 @@ FLASH_BANK_COMMAND_HANDLER(stm32x_flash_bank_command)
 	return ERROR_OK;
 }
 
-static uint32_t stm32x_get_flash_status(flash_bank_t *bank)
+static uint32_t stm32x_get_flash_status(struct flash_bank *bank)
 {
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint32_t status;
 
 	target_read_u32(target, STM32_FLASH_SR, &status);
@@ -62,9 +62,9 @@ static uint32_t stm32x_get_flash_status(flash_bank_t *bank)
 	return status;
 }
 
-static uint32_t stm32x_wait_status_busy(flash_bank_t *bank, int timeout)
+static uint32_t stm32x_wait_status_busy(struct flash_bank *bank, int timeout)
 {
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint32_t status;
 
 	/* wait for busy to clear */
@@ -81,11 +81,11 @@ static uint32_t stm32x_wait_status_busy(flash_bank_t *bank, int timeout)
 	return status;
 }
 
-static int stm32x_read_options(struct flash_bank_s *bank)
+static int stm32x_read_options(struct flash_bank *bank)
 {
 	uint32_t optiondata;
-	stm32x_flash_bank_t *stm32x_info = NULL;
-	target_t *target = bank->target;
+	struct stm32x_flash_bank *stm32x_info = NULL;
+	struct target *target = bank->target;
 
 	stm32x_info = bank->driver_priv;
 
@@ -109,10 +109,10 @@ static int stm32x_read_options(struct flash_bank_s *bank)
 	return ERROR_OK;
 }
 
-static int stm32x_erase_options(struct flash_bank_s *bank)
+static int stm32x_erase_options(struct flash_bank *bank)
 {
-	stm32x_flash_bank_t *stm32x_info = NULL;
-	target_t *target = bank->target;
+	struct stm32x_flash_bank *stm32x_info = NULL;
+	struct target *target = bank->target;
 	uint32_t status;
 
 	stm32x_info = bank->driver_priv;
@@ -146,10 +146,10 @@ static int stm32x_erase_options(struct flash_bank_s *bank)
 	return ERROR_OK;
 }
 
-static int stm32x_write_options(struct flash_bank_s *bank)
+static int stm32x_write_options(struct flash_bank *bank)
 {
-	stm32x_flash_bank_t *stm32x_info = NULL;
-	target_t *target = bank->target;
+	struct stm32x_flash_bank *stm32x_info = NULL;
+	struct target *target = bank->target;
 	uint32_t status;
 
 	stm32x_info = bank->driver_priv;
@@ -230,10 +230,10 @@ static int stm32x_write_options(struct flash_bank_s *bank)
 	return ERROR_OK;
 }
 
-static int stm32x_protect_check(struct flash_bank_s *bank)
+static int stm32x_protect_check(struct flash_bank *bank)
 {
-	target_t *target = bank->target;
-	stm32x_flash_bank_t *stm32x_info = bank->driver_priv;
+	struct target *target = bank->target;
+	struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
 
 	uint32_t protection;
 	int i, s;
@@ -302,9 +302,9 @@ static int stm32x_protect_check(struct flash_bank_s *bank)
 	return ERROR_OK;
 }
 
-static int stm32x_erase(struct flash_bank_s *bank, int first, int last)
+static int stm32x_erase(struct flash_bank *bank, int first, int last)
 {
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	int i;
 	uint32_t status;
 
@@ -343,10 +343,10 @@ static int stm32x_erase(struct flash_bank_s *bank, int first, int last)
 	return ERROR_OK;
 }
 
-static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int last)
+static int stm32x_protect(struct flash_bank *bank, int set, int first, int last)
 {
-	stm32x_flash_bank_t *stm32x_info = NULL;
-	target_t *target = bank->target;
+	struct stm32x_flash_bank *stm32x_info = NULL;
+	struct target *target = bank->target;
 	uint16_t prot_reg[4] = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF};
 	int i, reg, bit;
 	int status;
@@ -430,15 +430,15 @@ static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int las
 	return stm32x_write_options(bank);
 }
 
-static int stm32x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int stm32x_write_block(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
-	stm32x_flash_bank_t *stm32x_info = bank->driver_priv;
-	target_t *target = bank->target;
+	struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
+	struct target *target = bank->target;
 	uint32_t buffer_size = 16384;
-	working_area_t *source;
+	struct working_area *source;
 	uint32_t address = bank->base + offset;
-	reg_param_t reg_params[4];
-	armv7m_algorithm_t armv7m_info;
+	struct reg_param reg_params[4];
+	struct armv7m_algorithm armv7m_info;
 	int retval = ERROR_OK;
 
 	uint8_t stm32x_flash_write_code[] = {
@@ -549,9 +549,9 @@ static int stm32x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32
 	return retval;
 }
 
-static int stm32x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int stm32x_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint32_t words_remaining = (count / 2);
 	uint32_t bytes_remaining = (count & 0x00000001);
 	uint32_t address = bank->base + offset;
@@ -654,10 +654,10 @@ static int stm32x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t off
 	return ERROR_OK;
 }
 
-static int stm32x_probe(struct flash_bank_s *bank)
+static int stm32x_probe(struct flash_bank *bank)
 {
-	target_t *target = bank->target;
-	stm32x_flash_bank_t *stm32x_info = bank->driver_priv;
+	struct target *target = bank->target;
+	struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
 	int i;
 	uint16_t num_pages;
 	uint32_t device_id;
@@ -771,9 +771,9 @@ static int stm32x_probe(struct flash_bank_s *bank)
 	return ERROR_OK;
 }
 
-static int stm32x_auto_probe(struct flash_bank_s *bank)
+static int stm32x_auto_probe(struct flash_bank *bank)
 {
-	stm32x_flash_bank_t *stm32x_info = bank->driver_priv;
+	struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
 	if (stm32x_info->probed)
 		return ERROR_OK;
 	return stm32x_probe(bank);
@@ -786,9 +786,9 @@ COMMAND_HANDLER(stm32x_handle_part_id_command)
 }
 #endif
 
-static int stm32x_info(struct flash_bank_s *bank, char *buf, int buf_size)
+static int stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
 {
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint32_t device_id;
 	int printed;
 
@@ -894,8 +894,8 @@ static int stm32x_info(struct flash_bank_s *bank, char *buf, int buf_size)
 
 COMMAND_HANDLER(stm32x_handle_lock_command)
 {
-	target_t *target = NULL;
-	stm32x_flash_bank_t *stm32x_info = NULL;
+	struct target *target = NULL;
+	struct stm32x_flash_bank *stm32x_info = NULL;
 
 	if (argc < 1)
 	{
@@ -903,7 +903,7 @@ COMMAND_HANDLER(stm32x_handle_lock_command)
 		return ERROR_OK;
 	}
 
-	flash_bank_t *bank;
+	struct flash_bank *bank;
 	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
 	if (ERROR_OK != retval)
 		return retval;
@@ -940,8 +940,8 @@ COMMAND_HANDLER(stm32x_handle_lock_command)
 
 COMMAND_HANDLER(stm32x_handle_unlock_command)
 {
-	target_t *target = NULL;
-	stm32x_flash_bank_t *stm32x_info = NULL;
+	struct target *target = NULL;
+	struct stm32x_flash_bank *stm32x_info = NULL;
 
 	if (argc < 1)
 	{
@@ -949,7 +949,7 @@ COMMAND_HANDLER(stm32x_handle_unlock_command)
 		return ERROR_OK;
 	}
 
-	flash_bank_t *bank;
+	struct flash_bank *bank;
 	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
 	if (ERROR_OK != retval)
 		return retval;
@@ -984,8 +984,8 @@ COMMAND_HANDLER(stm32x_handle_unlock_command)
 COMMAND_HANDLER(stm32x_handle_options_read_command)
 {
 	uint32_t optionbyte;
-	target_t *target = NULL;
-	stm32x_flash_bank_t *stm32x_info = NULL;
+	struct target *target = NULL;
+	struct stm32x_flash_bank *stm32x_info = NULL;
 
 	if (argc < 1)
 	{
@@ -993,7 +993,7 @@ COMMAND_HANDLER(stm32x_handle_options_read_command)
 		return ERROR_OK;
 	}
 
-	flash_bank_t *bank;
+	struct flash_bank *bank;
 	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
 	if (ERROR_OK != retval)
 		return retval;
@@ -1039,8 +1039,8 @@ COMMAND_HANDLER(stm32x_handle_options_read_command)
 
 COMMAND_HANDLER(stm32x_handle_options_write_command)
 {
-	target_t *target = NULL;
-	stm32x_flash_bank_t *stm32x_info = NULL;
+	struct target *target = NULL;
+	struct stm32x_flash_bank *stm32x_info = NULL;
 	uint16_t optionbyte = 0xF8;
 
 	if (argc < 4)
@@ -1049,7 +1049,7 @@ COMMAND_HANDLER(stm32x_handle_options_write_command)
 		return ERROR_OK;
 	}
 
-	flash_bank_t *bank;
+	struct flash_bank *bank;
 	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
 	if (ERROR_OK != retval)
 		return retval;
@@ -1110,9 +1110,9 @@ COMMAND_HANDLER(stm32x_handle_options_write_command)
 	return ERROR_OK;
 }
 
-static int stm32x_mass_erase(struct flash_bank_s *bank)
+static int stm32x_mass_erase(struct flash_bank *bank)
 {
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint32_t status;
 
 	if (target->state != TARGET_HALTED)
@@ -1158,7 +1158,7 @@ COMMAND_HANDLER(stm32x_handle_mass_erase_command)
 		return ERROR_OK;
 	}
 
-	flash_bank_t *bank;
+	struct flash_bank *bank;
 	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
 	if (ERROR_OK != retval)
 		return retval;