X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fflash%2Ffaux.c;h=52d372892a0e7ff8d23b4a87c46069837b9ea585;hb=632fd663a821047df9a9b965ec1c35d6b034ebba;hp=474dee5b3b5f68be136bb4c4eb76328f31afc883;hpb=041c319d9dbdc8159cef3257b7f607aaf91b468c;p=openocd.git

diff --git a/src/flash/faux.c b/src/flash/faux.c
index 474dee5b3b..52d372892a 100644
--- a/src/flash/faux.c
+++ b/src/flash/faux.c
@@ -25,21 +25,21 @@
 #include "image.h"
 
 
-typedef struct faux_flash_bank_s
+struct faux_flash_bank
 {
 	struct target_s *target;
 	uint8_t *memory;
 	uint32_t start_address;
-} faux_flash_bank_t;
+};
 
 static const int sectorSize = 0x10000;
 
 
 /* flash bank faux <base> <size> <chip_width> <bus_width> <target#> <driverPath>
  */
-static int faux_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
+FLASH_BANK_COMMAND_HANDLER(faux_flash_bank_command)
 {
-	faux_flash_bank_t *info;
+	struct faux_flash_bank *info;
 
 	if (argc < 6)
 	{
@@ -47,7 +47,7 @@ static int faux_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd,
 		return ERROR_FLASH_BANK_INVALID;
 	}
 
-	info = malloc(sizeof(faux_flash_bank_t));
+	info = malloc(sizeof(struct faux_flash_bank));
 	if (info == NULL)
 	{
 		LOG_ERROR("no memory for flash bank info");
@@ -66,7 +66,7 @@ static int faux_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd,
 	int i = 0;
 	uint32_t offset = 0;
 	bank->num_sectors = bank->size/sectorSize;
-	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;
@@ -94,7 +94,7 @@ static int faux_register_commands(struct command_context_s *cmd_ctx)
 
 static int faux_erase(struct flash_bank_s *bank, int first, int last)
 {
-	faux_flash_bank_t *info = bank->driver_priv;
+	struct faux_flash_bank *info = bank->driver_priv;
 	memset(info->memory + first*sectorSize, 0xff, sectorSize*(last-first + 1));
 	return ERROR_OK;
 }
@@ -107,7 +107,7 @@ static int faux_protect(struct flash_bank_s *bank, int set, int first, int last)
 
 static int faux_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
-	faux_flash_bank_t *info = bank->driver_priv;
+	struct faux_flash_bank *info = bank->driver_priv;
 	memcpy(info->memory + offset, buffer, count);
 	return ERROR_OK;
 }
@@ -128,7 +128,7 @@ static int faux_probe(struct flash_bank_s *bank)
 	return ERROR_OK;
 }
 
-flash_driver_t faux_flash = {
+struct flash_driver faux_flash = {
 		.name = "faux",
 		.register_commands = &faux_register_commands,
 		.flash_bank_command = &faux_flash_bank_command,