X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Flpc2000.c;h=31e81b3bb651c5adec0419a2d7e0b00b493e18bb;hb=4bc80e5a65dde09ca795e50e77bcfe77b8dd444f;hp=4d4d9a2aee6e997b064e6c317969e4bd9c125dbe;hpb=cfc4d5c6b7b6f8f82dc5bbf3ee661c179814666e;p=openocd.git

diff --git a/src/flash/lpc2000.c b/src/flash/lpc2000.c
index 4d4d9a2aee..31e81b3bb6 100644
--- a/src/flash/lpc2000.c
+++ b/src/flash/lpc2000.c
@@ -55,7 +55,7 @@
 
 static int lpc2000_build_sector_list(struct flash_bank_s *bank)
 {
-	lpc2000_flash_bank_t *lpc2000_info = bank->driver_priv;
+	struct lpc2000_flash_bank *lpc2000_info = bank->driver_priv;
 	int i;
 	uint32_t offset = 0;
 
@@ -68,7 +68,7 @@ static int lpc2000_build_sector_list(struct flash_bank_s *bank)
 		if (bank->size == 128 * 1024)
 		{
 			bank->num_sectors = 16;
-			bank->sectors = malloc(sizeof(flash_sector_t) * 16);
+			bank->sectors = malloc(sizeof(struct flash_sector) * 16);
 			for (i = 0; i < 16; i++)
 			{
 				bank->sectors[i].offset = offset;
@@ -81,7 +81,7 @@ static int lpc2000_build_sector_list(struct flash_bank_s *bank)
 		else if (bank->size == 256 * 1024)
 		{
 			bank->num_sectors = 18;
-			bank->sectors = malloc(sizeof(flash_sector_t) * 18);
+			bank->sectors = malloc(sizeof(struct flash_sector) * 18);
 
 			for (i = 0; i < 8; i++)
 			{
@@ -152,7 +152,7 @@ static int lpc2000_build_sector_list(struct flash_bank_s *bank)
 				break;
 		}
 
-		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++)
 		{
@@ -206,7 +206,7 @@ static int lpc2000_build_sector_list(struct flash_bank_s *bank)
 				exit(-1);
 		}
 
-		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++)
 		{
@@ -237,12 +237,12 @@ static int lpc2000_build_sector_list(struct flash_bank_s *bank)
 static int lpc2000_iap_call(flash_bank_t *bank, int code, uint32_t param_table[5], uint32_t result_table[4])
 {
 	int retval;
-	lpc2000_flash_bank_t *lpc2000_info = bank->driver_priv;
+	struct lpc2000_flash_bank *lpc2000_info = bank->driver_priv;
 	target_t *target = bank->target;
-	mem_param_t mem_params[2];
-	reg_param_t reg_params[5];
-	armv4_5_algorithm_t armv4_5_info; /* for LPC2000 */
-	armv7m_algorithm_t armv7m_info;   /* for LPC1700 */
+	struct mem_param mem_params[2];
+	struct reg_param reg_params[5];
+	struct armv4_5_algorithm armv4_5_info; /* for LPC2000 */
+	struct armv7m_algorithm armv7m_info;   /* for LPC1700 */
  	uint32_t status_code;
 	uint32_t iap_entry_point = 0; /* to make compiler happier */
 
@@ -419,9 +419,9 @@ static int lpc2000_iap_blank_check(struct flash_bank_s *bank, int first, int las
 /*
  * flash bank lpc2000 <base> <size> 0 0 <target#> <lpc_variant> <cclk> [calc_checksum]
  */
-static int lpc2000_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
+FLASH_BANK_COMMAND_HANDLER(lpc2000_flash_bank_command)
 {
-	lpc2000_flash_bank_t *lpc2000_info;
+	struct lpc2000_flash_bank *lpc2000_info;
 
 	if (argc < 8)
 	{
@@ -429,7 +429,7 @@ static int lpc2000_flash_bank_command(struct command_context_s *cmd_ctx, char *c
 		return ERROR_FLASH_BANK_INVALID;
 	}
 
-	lpc2000_info = malloc(sizeof(lpc2000_flash_bank_t));
+	lpc2000_info = malloc(sizeof(struct lpc2000_flash_bank));
 	bank->driver_priv = lpc2000_info;
 
 	if (strcmp(args[6], "lpc2000_v1") == 0)
@@ -479,7 +479,7 @@ static int lpc2000_flash_bank_command(struct command_context_s *cmd_ctx, char *c
 
 static int lpc2000_erase(struct flash_bank_s *bank, int first, int last)
 {
-	lpc2000_flash_bank_t *lpc2000_info = bank->driver_priv;
+	struct lpc2000_flash_bank *lpc2000_info = bank->driver_priv;
 	uint32_t param_table[5];
 	uint32_t result_table[4];
 	int status_code;
@@ -537,7 +537,7 @@ static int lpc2000_protect(struct flash_bank_s *bank, int set, int first, int la
 
 static int lpc2000_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
-	lpc2000_flash_bank_t *lpc2000_info = bank->driver_priv;
+	struct lpc2000_flash_bank *lpc2000_info = bank->driver_priv;
 	target_t *target = bank->target;
 	uint32_t dst_min_alignment;
 	uint32_t bytes_remaining = count;
@@ -730,7 +730,7 @@ static int lpc2000_protect_check(struct flash_bank_s *bank)
 
 static int lpc2000_info(struct flash_bank_s *bank, char *buf, int buf_size)
 {
-	lpc2000_flash_bank_t *lpc2000_info = bank->driver_priv;
+	struct lpc2000_flash_bank *lpc2000_info = bank->driver_priv;
 
 	snprintf(buf, buf_size, "lpc2000 flash driver variant: %i, clk: %" PRIi32 "kHz" , lpc2000_info->variant, lpc2000_info->cclk);
 
@@ -788,7 +788,7 @@ static int lpc2000_register_commands(struct command_context_s *cmd_ctx)
 	return ERROR_OK;
 }
 
-flash_driver_t lpc2000_flash = {
+struct flash_driver lpc2000_flash = {
 		.name = "lpc2000",
 		.register_commands = &lpc2000_register_commands,
 		.flash_bank_command = &lpc2000_flash_bank_command,