X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fflash%2Faduc702x.c;h=8011e9334c93ce2485fd4e04c24293071ee01b21;hb=af949b2531d2a8863d077025db40cbb170d13a63;hp=7d6fa24ed4d77530bbe1fccd4ca20e92342ca35b;hpb=712d3fc0fb3ed69342a649d8bbb0d6d901a64720;p=openocd

diff --git a/src/flash/aduc702x.c b/src/flash/aduc702x.c
index 7d6fa24e..8011e933 100644
--- a/src/flash/aduc702x.c
+++ b/src/flash/aduc702x.c
@@ -43,29 +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;
+struct aduc702x_flash_bank {
+	struct working_area *write_algorithm;
+};
 
 /* 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
@@ -85,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;
@@ -170,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;
+	struct aduc702x_flash_bank *aduc702x_info = bank->driver_priv;
 	target_t *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))
@@ -422,7 +410,7 @@ static int aduc702x_check_flash_completion(target_t* target, unsigned int timeou
         else return ERROR_OK;
 }
 
-flash_driver_t aduc702x_flash = {
+struct flash_driver aduc702x_flash = {
 		.name = "aduc702x",
 		.flash_bank_command = &aduc702x_flash_bank_command,
 		.erase = &aduc702x_erase,