X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fflash%2Fstr9x.c;h=b3e8dffc7a3a36ac734a6fc5626b77b4b781e06f;hb=96b62996d2d81b09a48bf253bc9e60e637f687bd;hp=f7bc3c61b5b39c8aed9c2c5edf0de310c6a2ec09;hpb=2f6e56e38320350bb300b363d0b3737fa8d1f3ea;p=fw%2Fopenocd

diff --git a/src/flash/str9x.c b/src/flash/str9x.c
index f7bc3c61b..b3e8dffc7 100644
--- a/src/flash/str9x.c
+++ b/src/flash/str9x.c
@@ -33,7 +33,7 @@
 
 static uint32_t bank1start = 0x00080000;
 
-static int str9x_build_block_list(struct flash_bank_s *bank)
+static int str9x_build_block_list(struct flash_bank *bank)
 {
 	struct str9x_flash_bank *str9x_info = bank->driver_priv;
 
@@ -136,7 +136,7 @@ FLASH_BANK_COMMAND_HANDLER(str9x_flash_bank_command)
 	return ERROR_OK;
 }
 
-static int str9x_protect_check(struct flash_bank_s *bank)
+static int str9x_protect_check(struct flash_bank *bank)
 {
 	int retval;
 	struct str9x_flash_bank *str9x_info = bank->driver_priv;
@@ -214,7 +214,7 @@ static int str9x_protect_check(struct flash_bank_s *bank)
 	return ERROR_OK;
 }
 
-static int str9x_erase(struct flash_bank_s *bank, int first, int last)
+static int str9x_erase(struct flash_bank *bank, int first, int last)
 {
 	struct target *target = bank->target;
 	int i;
@@ -306,7 +306,7 @@ static int str9x_erase(struct flash_bank_s *bank, int first, int last)
 	return ERROR_OK;
 }
 
-static int str9x_protect(struct flash_bank_s *bank,
+static int str9x_protect(struct flash_bank *bank,
 		int set, int first, int last)
 {
 	struct target *target = bank->target;
@@ -345,7 +345,7 @@ static int str9x_protect(struct flash_bank_s *bank,
 	return ERROR_OK;
 }
 
-static int str9x_write_block(struct flash_bank_s *bank,
+static int str9x_write_block(struct flash_bank *bank,
 		uint8_t *buffer, uint32_t offset, uint32_t count)
 {
 	struct str9x_flash_bank *str9x_info = bank->driver_priv;
@@ -454,7 +454,7 @@ static int str9x_write_block(struct flash_bank_s *bank,
 	return retval;
 }
 
-static int str9x_write(struct flash_bank_s *bank,
+static int str9x_write(struct flash_bank *bank,
 		uint8_t *buffer, uint32_t offset, uint32_t count)
 {
 	struct target *target = bank->target;
@@ -612,7 +612,7 @@ static int str9x_write(struct flash_bank_s *bank,
 	return ERROR_OK;
 }
 
-static int str9x_probe(struct flash_bank_s *bank)
+static int str9x_probe(struct flash_bank *bank)
 {
 	return ERROR_OK;
 }
@@ -624,7 +624,7 @@ COMMAND_HANDLER(str9x_handle_part_id_command)
 }
 #endif
 
-static int str9x_info(struct flash_bank_s *bank, char *buf, int buf_size)
+static int str9x_info(struct flash_bank *bank, char *buf, int buf_size)
 {
 	snprintf(buf, buf_size, "str9x flash driver info");
 	return ERROR_OK;
@@ -640,7 +640,7 @@ COMMAND_HANDLER(str9x_handle_flash_config_command)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
-	flash_bank_t *bank;
+	struct flash_bank *bank;
 	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
 	if (ERROR_OK != retval)
 		return retval;