target_t -> struct target

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

diff --git a/src/flash/aduc702x.c b/src/flash/aduc702x.c
index a4007d07248f0e9a85fdd0c17d8149f70faa541f..76f38b5668cb0e77103a9d82ebb3e0d05603a5cc 100644 (file)
--- a/src/flash/aduc702x.c
+++ b/src/flash/aduc702x.c
@@ -29,19 +29,9 @@
 #include "time_support.h"
 
 
-static int aduc702x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
-static int aduc702x_register_commands(struct command_context_s *cmd_ctx);
-static int aduc702x_erase(struct flash_bank_s *bank, int first, int last);
-static int aduc702x_protect(struct flash_bank_s *bank, int set, int first, int last);
-static int aduc702x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
-static int aduc702x_write_single(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
-static int aduc702x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
-static int aduc702x_probe(struct flash_bank_s *bank);
-static int aduc702x_info(struct flash_bank_s *bank, char *buf, int buf_size);
-static int aduc702x_protect_check(struct flash_bank_s *bank);
 static int aduc702x_build_sector_list(struct flash_bank_s *bank);
-static int aduc702x_check_flash_completion(target_t* target, unsigned int timeout_ms);
-static int aduc702x_set_write_enable(target_t *target, int enable);
+static int aduc702x_check_flash_completion(struct target* target, unsigned int timeout_ms);
+static int aduc702x_set_write_enable(struct target *target, int enable);
 
 #define ADUC702x_FLASH                         0xfffff800
 #define ADUC702x_FLASH_FEESTA          (0*4)
@@ -53,49 +43,17 @@ static int aduc702x_set_write_enable(target_t *target, int enable);
 #define ADUC702x_FLASH_FEEPRO          (6*4)
 #define ADUC702x_FLASH_FEEHIDE         (7*4)
 
-typedef struct {
-       uint32_t feesta;
-       uint32_t feemod;
-       uint32_t feecon;
-       uint32_t feedat;
-       uint32_t feeadr;
-       uint32_t feesign;
-       uint32_t feepro;
-       uint32_t feehide;
-} ADUC702x_FLASH_MMIO;
-
-typedef struct
-{
-       working_area_t *write_algorithm;
-} aduc702x_flash_bank_t;
-
-flash_driver_t aduc702x_flash =
-{
-       .name = "aduc702x",
-       .register_commands = aduc702x_register_commands,
-       .flash_bank_command = aduc702x_flash_bank_command,
-       .erase = aduc702x_erase,
-       .protect = aduc702x_protect,
-       .write = aduc702x_write,
-       .probe = aduc702x_probe,
-       .auto_probe = aduc702x_probe,
-       .erase_check = default_flash_blank_check,
-       .protect_check = aduc702x_protect_check,
-       .info = aduc702x_info
+struct aduc702x_flash_bank {
+       struct working_area *write_algorithm;
 };
 
-static int aduc702x_register_commands(struct command_context_s *cmd_ctx)
-{
-       return ERROR_OK;
-}
-
 /* flash bank aduc702x 0 0 0 0 <target#>
  * The ADC7019-28 devices all have the same flash layout */
-static int aduc702x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
+FLASH_BANK_COMMAND_HANDLER(aduc702x_flash_bank_command)
 {
-       aduc702x_flash_bank_t *nbank;
+       struct aduc702x_flash_bank *nbank;
 
-       nbank = malloc(sizeof(aduc702x_flash_bank_t));
+       nbank = malloc(sizeof(struct aduc702x_flash_bank));
 
         bank->base = 0x80000;
         bank->size = 0xF800; // top 4k not accessible
@@ -115,7 +73,7 @@ static int aduc702x_build_sector_list(struct flash_bank_s *bank)
 
         // sector size is 512
         bank->num_sectors = bank->size / 512;
-        bank->sectors = malloc(sizeof(flash_sector_t) * bank->num_sectors);
+        bank->sectors = malloc(sizeof(struct flash_sector) * bank->num_sectors);
         for (i = 0; i < bank->num_sectors; ++i)
         {
                 bank->sectors[i].offset = offset;
@@ -140,7 +98,7 @@ static int aduc702x_erase(struct flash_bank_s *bank, int first, int last)
        int x;
        int count;
        //uint32_t v;
-       target_t *target = bank->target;
+       struct target *target = bank->target;
 
         aduc702x_set_write_enable(target, 1);
 
@@ -200,13 +158,13 @@ static int aduc702x_protect(struct flash_bank_s *bank, int set, int first, int l
  */
 static int aduc702x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
-       aduc702x_flash_bank_t *aduc702x_info = bank->driver_priv;
-       target_t *target = bank->target;
+       struct aduc702x_flash_bank *aduc702x_info = bank->driver_priv;
+       struct target *target = bank->target;
        uint32_t buffer_size = 7000;
-       working_area_t *source;
+       struct working_area *source;
        uint32_t address = bank->base + offset;
-       reg_param_t reg_params[6];
-       armv4_5_algorithm_t armv4_5_info;
+       struct reg_param reg_params[6];
+       struct armv4_5_algorithm armv4_5_info;
        int retval = ERROR_OK;
 
        if (((count%2)!=0)||((offset%2)!=0))
@@ -347,7 +305,7 @@ static int aduc702x_write_single(struct flash_bank_s *bank, uint8_t *buffer, uin
 {
        uint32_t x;
         uint8_t b;
-       target_t *target = bank->target;
+       struct target *target = bank->target;
 
         aduc702x_set_write_enable(target, 1);
 
@@ -421,7 +379,7 @@ static int aduc702x_info(struct flash_bank_s *bank, char *buf, int buf_size)
 
 /* sets FEEMOD bit 3
  * enable = 1 enables writes & erases, 0 disables them */
-static int aduc702x_set_write_enable(target_t *target, int enable)
+static int aduc702x_set_write_enable(struct target *target, int enable)
 {
         // don't bother to preserve int enable bit here
         target_write_u16(target, ADUC702x_FLASH + ADUC702x_FLASH_FEEMOD, enable ? 8 : 0);
@@ -434,7 +392,7 @@ static int aduc702x_set_write_enable(target_t *target, int enable)
  *
  * this function sleeps 1ms between checks (after the first one),
  * so in some cases may slow things down without a usleep after the first read */
-static int aduc702x_check_flash_completion(target_t* target, unsigned int timeout_ms)
+static int aduc702x_check_flash_completion(struct target* target, unsigned int timeout_ms)
 {
         uint8_t v = 4;
 
@@ -452,3 +410,15 @@ static int aduc702x_check_flash_completion(target_t* target, unsigned int timeou
         else return ERROR_OK;
 }
 
+struct flash_driver aduc702x_flash = {
+               .name = "aduc702x",
+               .flash_bank_command = &aduc702x_flash_bank_command,
+               .erase = &aduc702x_erase,
+               .protect = &aduc702x_protect,
+               .write = &aduc702x_write,
+               .probe = &aduc702x_probe,
+               .auto_probe = &aduc702x_probe,
+               .erase_check = &default_flash_blank_check,
+               .protect_check = &aduc702x_protect_check,
+               .info = &aduc702x_info
+       };