working_area_t -> struct working_area

[openocd.git] / src / flash / stm32x.c

diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c
index 8725fad63ba1d0012a9f9a5b678f531a7b8c8880..35da209c5c663f956a1c46058df3d283baa1b788 100644 (file)
--- a/src/flash/stm32x.c
+++ b/src/flash/stm32x.c
@@ -35,7 +35,7 @@ static int stm32x_mass_erase(struct flash_bank_s *bank);
  */
 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;
@@ -84,7 +84,7 @@ static uint32_t stm32x_wait_status_busy(flash_bank_t *bank, int timeout)
 static int stm32x_read_options(struct flash_bank_s *bank)
 {
        uint32_t optiondata;
-       stm32x_flash_bank_t *stm32x_info = NULL;
+       struct stm32x_flash_bank *stm32x_info = NULL;
        target_t *target = bank->target;
 
        stm32x_info = bank->driver_priv;
@@ -111,7 +111,7 @@ static int stm32x_read_options(struct flash_bank_s *bank)
 
 static int stm32x_erase_options(struct flash_bank_s *bank)
 {
-       stm32x_flash_bank_t *stm32x_info = NULL;
+       struct stm32x_flash_bank *stm32x_info = NULL;
        target_t *target = bank->target;
        uint32_t status;
 
@@ -148,7 +148,7 @@ static int stm32x_erase_options(struct flash_bank_s *bank)
 
 static int stm32x_write_options(struct flash_bank_s *bank)
 {
-       stm32x_flash_bank_t *stm32x_info = NULL;
+       struct stm32x_flash_bank *stm32x_info = NULL;
        target_t *target = bank->target;
        uint32_t status;
 
@@ -233,7 +233,7 @@ static int stm32x_write_options(struct flash_bank_s *bank)
 static int stm32x_protect_check(struct flash_bank_s *bank)
 {
        target_t *target = bank->target;
-       stm32x_flash_bank_t *stm32x_info = bank->driver_priv;
+       struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
 
        uint32_t protection;
        int i, s;
@@ -345,7 +345,7 @@ static int stm32x_erase(struct flash_bank_s *bank, int first, int last)
 
 static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int last)
 {
-       stm32x_flash_bank_t *stm32x_info = NULL;
+       struct stm32x_flash_bank *stm32x_info = NULL;
        target_t *target = bank->target;
        uint16_t prot_reg[4] = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF};
        int i, reg, bit;
@@ -432,13 +432,13 @@ static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int las
 
 static int stm32x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
-       stm32x_flash_bank_t *stm32x_info = bank->driver_priv;
+       struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
        target_t *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[] = {
@@ -657,7 +657,7 @@ static int stm32x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t off
 static int stm32x_probe(struct flash_bank_s *bank)
 {
        target_t *target = bank->target;
-       stm32x_flash_bank_t *stm32x_info = bank->driver_priv;
+       struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
        int i;
        uint16_t num_pages;
        uint32_t device_id;
@@ -773,7 +773,7 @@ static int stm32x_probe(struct flash_bank_s *bank)
 
 static int stm32x_auto_probe(struct flash_bank_s *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);
@@ -895,7 +895,7 @@ 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 stm32x_flash_bank *stm32x_info = NULL;
 
        if (argc < 1)
        {
@@ -941,7 +941,7 @@ COMMAND_HANDLER(stm32x_handle_lock_command)
 COMMAND_HANDLER(stm32x_handle_unlock_command)
 {
        target_t *target = NULL;
-       stm32x_flash_bank_t *stm32x_info = NULL;
+       struct stm32x_flash_bank *stm32x_info = NULL;
 
        if (argc < 1)
        {
@@ -985,7 +985,7 @@ COMMAND_HANDLER(stm32x_handle_options_read_command)
 {
        uint32_t optionbyte;
        target_t *target = NULL;
-       stm32x_flash_bank_t *stm32x_info = NULL;
+       struct stm32x_flash_bank *stm32x_info = NULL;
 
        if (argc < 1)
        {
@@ -1040,7 +1040,7 @@ 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 stm32x_flash_bank *stm32x_info = NULL;
        uint16_t optionbyte = 0xF8;
 
        if (argc < 4)
@@ -1205,7 +1205,7 @@ static int stm32x_register_commands(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
-flash_driver_t stm32x_flash = {
+struct flash_driver stm32x_flash = {
                .name = "stm32x",
                .register_commands = &stm32x_register_commands,
                .flash_bank_command = &stm32x_flash_bank_command,