X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fstr7x.c;h=d5defe5f8bd11c934baee81292ac3881d74d5ef5;hp=ed107f313c0862d188109648d8bedd6990f74323;hb=46fc1d57ac9462fd788277609707a379c7a406cb;hpb=6cd97f48d032e3ead3ee94c56699e162f7032ddd

diff --git a/src/flash/str7x.c b/src/flash/str7x.c
index ed107f313c..d5defe5f8b 100644
--- a/src/flash/str7x.c
+++ b/src/flash/str7x.c
@@ -29,7 +29,7 @@
 #include "binarybuffer.h"
 
 
-str7x_mem_layout_t mem_layout_str7bank0[] = {
+struct str7x_mem_layout mem_layout_str7bank0[] = {
 	{0x00000000, 0x02000, 0x01},
 	{0x00002000, 0x02000, 0x02},
 	{0x00004000, 0x02000, 0x04},
@@ -40,20 +40,20 @@ str7x_mem_layout_t mem_layout_str7bank0[] = {
 	{0x00030000, 0x10000, 0x80}
 };
 
-str7x_mem_layout_t mem_layout_str7bank1[] = {
+struct str7x_mem_layout mem_layout_str7bank1[] = {
 	{0x00000000, 0x02000, 0x10000},
 	{0x00002000, 0x02000, 0x20000}
 };
 
 static int str7x_get_flash_adr(struct flash_bank_s *bank, uint32_t reg)
 {
-	str7x_flash_bank_t *str7x_info = bank->driver_priv;
+	struct str7x_flash_bank *str7x_info = bank->driver_priv;
 	return (str7x_info->register_base | reg);
 }
 
 static int str7x_build_block_list(struct flash_bank_s *bank)
 {
-	str7x_flash_bank_t *str7x_info = bank->driver_priv;
+	struct str7x_flash_bank *str7x_info = bank->driver_priv;
 
 	int i;
 	int num_sectors;
@@ -81,7 +81,7 @@ static int str7x_build_block_list(struct flash_bank_s *bank)
 	num_sectors = b0_sectors + b1_sectors;
 
 	bank->num_sectors = num_sectors;
-	bank->sectors = malloc(sizeof(flash_sector_t) * num_sectors);
+	bank->sectors = malloc(sizeof(struct flash_sector) * num_sectors);
 	str7x_info->sector_bits = malloc(sizeof(uint32_t) * num_sectors);
 
 	num_sectors = 0;
@@ -109,9 +109,9 @@ static int str7x_build_block_list(struct flash_bank_s *bank)
 
 /* flash bank str7x <base> <size> 0 0 <target#> <str71_variant>
  */
-static int str7x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
+FLASH_BANK_COMMAND_HANDLER(str7x_flash_bank_command)
 {
-	str7x_flash_bank_t *str7x_info;
+	struct str7x_flash_bank *str7x_info;
 
 	if (argc < 7)
 	{
@@ -119,7 +119,7 @@ static int str7x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd
 		return ERROR_FLASH_BANK_INVALID;
 	}
 
-	str7x_info = malloc(sizeof(str7x_flash_bank_t));
+	str7x_info = malloc(sizeof(struct str7x_flash_bank));
 	bank->driver_priv = str7x_info;
 
 	/* set default bits for str71x flash */
@@ -176,7 +176,7 @@ static uint32_t str7x_result(struct flash_bank_s *bank)
 
 static int str7x_protect_check(struct flash_bank_s *bank)
 {
-	str7x_flash_bank_t *str7x_info = bank->driver_priv;
+	struct str7x_flash_bank *str7x_info = bank->driver_priv;
 	target_t *target = bank->target;
 
 	int i;
@@ -203,7 +203,7 @@ static int str7x_protect_check(struct flash_bank_s *bank)
 
 static int str7x_erase(struct flash_bank_s *bank, int first, int last)
 {
-	str7x_flash_bank_t *str7x_info = bank->driver_priv;
+	struct str7x_flash_bank *str7x_info = bank->driver_priv;
 	target_t *target = bank->target;
 
 	int i;
@@ -256,7 +256,7 @@ static int str7x_erase(struct flash_bank_s *bank, int first, int last)
 
 static int str7x_protect(struct flash_bank_s *bank, int set, int first, int last)
 {
-	str7x_flash_bank_t *str7x_info = bank->driver_priv;
+	struct str7x_flash_bank *str7x_info = bank->driver_priv;
 	target_t *target = bank->target;
 	int i;
 	uint32_t cmd;
@@ -310,13 +310,13 @@ static int str7x_protect(struct flash_bank_s *bank, int set, int first, int last
 
 static int str7x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
-	str7x_flash_bank_t *str7x_info = bank->driver_priv;
+	struct str7x_flash_bank *str7x_info = bank->driver_priv;
 	target_t *target = bank->target;
 	uint32_t buffer_size = 8192;
-	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;
 
 	uint32_t str7x_flash_write_code[] = {
@@ -426,7 +426,7 @@ static int str7x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_
 static int str7x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
 	target_t *target = bank->target;
-	str7x_flash_bank_t *str7x_info = bank->driver_priv;
+	struct str7x_flash_bank *str7x_info = bank->driver_priv;
 	uint32_t dwords_remaining = (count / 8);
 	uint32_t bytes_remaining = (count & 0x00000007);
 	uint32_t address = bank->base + offset;
@@ -589,7 +589,7 @@ static int str7x_probe(struct flash_bank_s *bank)
 }
 
 #if 0
-static int str7x_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str7x_handle_part_id_command)
 {
 	return ERROR_OK;
 }
@@ -601,10 +601,10 @@ static int str7x_info(struct flash_bank_s *bank, char *buf, int buf_size)
 	return ERROR_OK;
 }
 
-static int str7x_handle_disable_jtag_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(str7x_handle_disable_jtag_command)
 {
 	target_t *target = NULL;
-	str7x_flash_bank_t *str7x_info = NULL;
+	struct str7x_flash_bank *str7x_info = NULL;
 
 	uint32_t flash_cmd;
 	uint16_t ProtectionLevel = 0;
@@ -683,7 +683,7 @@ static int str7x_register_commands(struct command_context_s *cmd_ctx)
 	return ERROR_OK;
 }
 
-flash_driver_t str7x_flash = {
+struct flash_driver str7x_flash = {
 		.name = "str7x",
 		.register_commands = &str7x_register_commands,
 		.flash_bank_command = &str7x_flash_bank_command,