target_t -> struct target

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

diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c
index 41b9008f70495f763fc95c7b7a072dd533a315a7..a9b4fb3fd0d99a69310209f5e5c180ec4b5feaee 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;
@@ -54,7 +54,7 @@ FLASH_BANK_COMMAND_HANDLER(stm32x_flash_bank_command)
 
 static uint32_t stm32x_get_flash_status(flash_bank_t *bank)
 {
-       target_t *target = bank->target;
+       struct target *target = bank->target;
        uint32_t status;
 
        target_read_u32(target, STM32_FLASH_SR, &status);
@@ -64,7 +64,7 @@ static uint32_t stm32x_get_flash_status(flash_bank_t *bank)
 
 static uint32_t stm32x_wait_status_busy(flash_bank_t *bank, int timeout)
 {
-       target_t *target = bank->target;
+       struct target *target = bank->target;
        uint32_t status;
 
        /* wait for busy to clear */
@@ -84,8 +84,8 @@ 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;
-       target_t *target = bank->target;
+       struct stm32x_flash_bank *stm32x_info = NULL;
+       struct target *target = bank->target;
 
        stm32x_info = bank->driver_priv;
 
@@ -111,8 +111,8 @@ 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;
-       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;
@@ -148,8 +148,8 @@ 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;
-       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;
@@ -232,8 +232,8 @@ 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 target *target = bank->target;
+       struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
 
        uint32_t protection;
        int i, s;
@@ -304,7 +304,7 @@ static int stm32x_protect_check(struct flash_bank_s *bank)
 
 static int stm32x_erase(struct flash_bank_s *bank, int first, int last)
 {
-       target_t *target = bank->target;
+       struct target *target = bank->target;
        int i;
        uint32_t status;
 
@@ -345,8 +345,8 @@ 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;
-       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;
@@ -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;
-       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[] = {
@@ -551,7 +551,7 @@ static int stm32x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32
 
 static int stm32x_write(struct flash_bank_s *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;
@@ -656,8 +656,8 @@ 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 target *target = bank->target;
+       struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
        int i;
        uint16_t num_pages;
        uint32_t device_id;
@@ -756,7 +756,7 @@ static int stm32x_probe(struct flash_bank_s *bank)
        bank->base = 0x08000000;
        bank->size = (num_pages * page_size);
        bank->num_sectors = num_pages;
-       bank->sectors = malloc(sizeof(flash_sector_t) * num_pages);
+       bank->sectors = malloc(sizeof(struct flash_sector) * num_pages);
 
        for (i = 0; i < num_pages; i++)
        {
@@ -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);
@@ -788,7 +788,7 @@ COMMAND_HANDLER(stm32x_handle_part_id_command)
 
 static int stm32x_info(struct flash_bank_s *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)
        {
@@ -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)
        {
@@ -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)
        {
@@ -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)
@@ -1112,7 +1112,7 @@ COMMAND_HANDLER(stm32x_handle_options_write_command)
 
 static int stm32x_mass_erase(struct flash_bank_s *bank)
 {
-       target_t *target = bank->target;
+       struct target *target = bank->target;
        uint32_t status;
 
        if (target->state != TARGET_HALTED)
@@ -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,