X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fcfi.c;h=6ab84f1f828e6ff81d4d726f6ba3064c7311710a;hp=39eb16c7ef028af6d23064c05223f1a9325cf8e9;hb=0f1163e823c6ca3c2a81fa296157f5dde0635fea;hpb=1f328f2885f370aa9f79d2ed08515821bc8d856a

diff --git a/src/flash/cfi.c b/src/flash/cfi.c
index 39eb16c7ef..6ab84f1f82 100644
--- a/src/flash/cfi.c
+++ b/src/flash/cfi.c
@@ -35,7 +35,7 @@
 /* defines internal maximum size for code fragment in cfi_intel_write_block() */
 #define CFI_MAX_INTEL_CODESIZE 256
 
-static cfi_unlock_addresses_t cfi_unlock_addresses[] =
+static struct cfi_unlock_addresses cfi_unlock_addresses[] =
 {
 	[CFI_UNLOCK_555_2AA] = { .unlock1 = 0x555, .unlock2 = 0x2aa },
 	[CFI_UNLOCK_5555_2AAA] = { .unlock1 = 0x5555, .unlock2 = 0x2aaa },
@@ -47,7 +47,7 @@ static void cfi_fixup_0002_unlock_addresses(flash_bank_t *flash, void *param);
 static void cfi_fixup_atmel_reversed_erase_regions(flash_bank_t *flash, void *param);
 
 /* fixup after reading cmdset 0002 primary query table */
-static const cfi_fixup_t cfi_0002_fixups[] = {
+static const struct cfi_fixup cfi_0002_fixups[] = {
 	{CFI_MFR_SST, 0x00D4, cfi_fixup_0002_unlock_addresses, &cfi_unlock_addresses[CFI_UNLOCK_5555_2AAA]},
 	{CFI_MFR_SST, 0x00D5, cfi_fixup_0002_unlock_addresses, &cfi_unlock_addresses[CFI_UNLOCK_5555_2AAA]},
 	{CFI_MFR_SST, 0x00D6, cfi_fixup_0002_unlock_addresses, &cfi_unlock_addresses[CFI_UNLOCK_5555_2AAA]},
@@ -63,14 +63,14 @@ static const cfi_fixup_t cfi_0002_fixups[] = {
 };
 
 /* fixup after reading cmdset 0001 primary query table */
-static const cfi_fixup_t cfi_0001_fixups[] = {
+static const struct cfi_fixup cfi_0001_fixups[] = {
 	{0, 0, NULL, NULL}
 };
 
-static void cfi_fixup(flash_bank_t *bank, const cfi_fixup_t *fixups)
+static void cfi_fixup(flash_bank_t *bank, const struct cfi_fixup *fixups)
 {
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
-	const cfi_fixup_t *f;
+	const struct cfi_fixup *f;
 
 	for (f = fixups; f->fixup; f++)
 	{
@@ -136,7 +136,7 @@ static void cfi_command(flash_bank_t *bank, uint8_t cmd, uint8_t *cmd_buf)
  */
 static uint8_t cfi_query_u8(flash_bank_t *bank, int sector, uint32_t offset)
 {
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint8_t data[CFI_MAX_BUS_WIDTH];
 
 	target_read_memory(target, flash_address(bank, sector, offset), bank->bus_width, 1, data);
@@ -153,7 +153,7 @@ static uint8_t cfi_query_u8(flash_bank_t *bank, int sector, uint32_t offset)
  */
 static uint8_t cfi_get_u8(flash_bank_t *bank, int sector, uint32_t offset)
 {
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint8_t data[CFI_MAX_BUS_WIDTH];
 	int i;
 
@@ -178,7 +178,7 @@ static uint8_t cfi_get_u8(flash_bank_t *bank, int sector, uint32_t offset)
 
 static uint16_t cfi_query_u16(flash_bank_t *bank, int sector, uint32_t offset)
 {
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
 	uint8_t data[CFI_MAX_BUS_WIDTH * 2];
 
@@ -200,7 +200,7 @@ static uint16_t cfi_query_u16(flash_bank_t *bank, int sector, uint32_t offset)
 
 static uint32_t cfi_query_u32(flash_bank_t *bank, int sector, uint32_t offset)
 {
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
 	uint8_t data[CFI_MAX_BUS_WIDTH * 4];
 
@@ -223,7 +223,7 @@ static uint32_t cfi_query_u32(flash_bank_t *bank, int sector, uint32_t offset)
 
 static void cfi_intel_clear_status_register(flash_bank_t *bank)
 {
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint8_t command[8];
 
 	if (target->state != TARGET_HALTED)
@@ -317,7 +317,7 @@ static int cfi_read_intel_pri_ext(flash_bank_t *bank)
 	int retval;
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
 	struct cfi_intel_pri_ext *pri_ext = malloc(sizeof(struct cfi_intel_pri_ext));
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint8_t command[8];
 
 	cfi_info->pri_ext = pri_ext;
@@ -382,8 +382,8 @@ static int cfi_read_spansion_pri_ext(flash_bank_t *bank)
 {
 	int retval;
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
-	cfi_spansion_pri_ext_t *pri_ext = malloc(sizeof(cfi_spansion_pri_ext_t));
-	target_t *target = bank->target;
+	struct cfi_spansion_pri_ext *pri_ext = malloc(sizeof(struct cfi_spansion_pri_ext));
+	struct target *target = bank->target;
 	uint8_t command[8];
 
 	cfi_info->pri_ext = pri_ext;
@@ -446,10 +446,10 @@ static int cfi_read_spansion_pri_ext(flash_bank_t *bank)
 static int cfi_read_atmel_pri_ext(flash_bank_t *bank)
 {
 	int retval;
-	cfi_atmel_pri_ext_t atmel_pri_ext;
+	struct cfi_atmel_pri_ext atmel_pri_ext;
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
-	cfi_spansion_pri_ext_t *pri_ext = malloc(sizeof(cfi_spansion_pri_ext_t));
-	target_t *target = bank->target;
+	struct cfi_spansion_pri_ext *pri_ext = malloc(sizeof(struct cfi_spansion_pri_ext));
+	struct target *target = bank->target;
 	uint8_t command[8];
 
 	/* ATMEL devices use the same CFI primary command set (0x2) as AMD/Spansion,
@@ -457,7 +457,7 @@ static int cfi_read_atmel_pri_ext(flash_bank_t *bank)
 	 * We read the atmel table, and prepare a valid AMD/Spansion query table.
 	 */
 
-	memset(pri_ext, 0, sizeof(cfi_spansion_pri_ext_t));
+	memset(pri_ext, 0, sizeof(struct cfi_spansion_pri_ext));
 
 	cfi_info->pri_ext = pri_ext;
 
@@ -528,7 +528,7 @@ static int cfi_spansion_info(struct flash_bank_s *bank, char *buf, int buf_size)
 {
 	int printed;
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
-	cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
+	struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
 
 	printed = snprintf(buf, buf_size, "\nSpansion primary algorithm extend information:\n");
 	buf += printed;
@@ -656,7 +656,7 @@ static int cfi_intel_erase(struct flash_bank_s *bank, int first, int last)
 {
 	int retval;
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint8_t command[8];
 	int i;
 
@@ -700,8 +700,8 @@ static int cfi_spansion_erase(struct flash_bank_s *bank, int first, int last)
 {
 	int retval;
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
-	cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
-	target_t *target = bank->target;
+	struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
+	struct target *target = bank->target;
 	uint8_t command[8];
 	int i;
 
@@ -802,7 +802,7 @@ static int cfi_intel_protect(struct flash_bank_s *bank, int set, int first, int
 	int retval;
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
 	struct cfi_intel_pri_ext *pri_ext = cfi_info->pri_ext;
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint8_t command[8];
 	int retry = 0;
 	int i;
@@ -949,7 +949,7 @@ static int cfi_protect(struct flash_bank_s *bank, int set, int first, int last)
 /* FIXME Replace this by a simple memcpy() - still unsure about sideeffects */
 static void cfi_add_byte(struct flash_bank_s *bank, uint8_t *word, uint8_t byte)
 {
-	/* target_t *target = bank->target; */
+	/* struct target *target = bank->target; */
 
 	int i;
 
@@ -982,7 +982,7 @@ static void cfi_add_byte(struct flash_bank_s *bank, uint8_t *word, uint8_t byte)
 
 /* Convert code image to target endian */
 /* FIXME create general block conversion fcts in target.c?) */
-static void cfi_fix_code_endian(target_t *target, uint8_t *dest, const uint32_t *src, uint32_t count)
+static void cfi_fix_code_endian(struct target *target, uint8_t *dest, const uint32_t *src, uint32_t count)
 {
 	uint32_t i;
 	for (i = 0; i< count; i++)
@@ -995,7 +995,7 @@ static void cfi_fix_code_endian(target_t *target, uint8_t *dest, const uint32_t
 
 static uint32_t cfi_command_val(flash_bank_t *bank, uint8_t cmd)
 {
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 
 	uint8_t buf[CFI_MAX_BUS_WIDTH];
 	cfi_command(bank, cmd, buf);
@@ -1019,10 +1019,10 @@ static uint32_t cfi_command_val(flash_bank_t *bank, uint8_t cmd)
 static int cfi_intel_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_t address, uint32_t count)
 {
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
-	target_t *target = bank->target;
-	reg_param_t reg_params[7];
-	armv4_5_algorithm_t armv4_5_info;
-	working_area_t *source;
+	struct target *target = bank->target;
+	struct reg_param reg_params[7];
+	struct armv4_5_algorithm armv4_5_info;
+	struct working_area *source;
 	uint32_t buffer_size = 32768;
 	uint32_t write_command_val, busy_pattern_val, error_pattern_val;
 
@@ -1263,11 +1263,11 @@ cleanup:
 static int cfi_spansion_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_t address, uint32_t count)
 {
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
-	cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
-	target_t *target = bank->target;
-	reg_param_t reg_params[10];
-	armv4_5_algorithm_t armv4_5_info;
-	working_area_t *source;
+	struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
+	struct target *target = bank->target;
+	struct reg_param reg_params[10];
+	struct armv4_5_algorithm armv4_5_info;
+	struct working_area *source;
 	uint32_t buffer_size = 32768;
 	uint32_t status;
 	int retval, retvaltemp;
@@ -1563,7 +1563,7 @@ static int cfi_intel_write_word(struct flash_bank_s *bank, uint8_t *word, uint32
 {
 	int retval;
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint8_t command[8];
 
 	cfi_intel_clear_status_register(bank);
@@ -1597,7 +1597,7 @@ static int cfi_intel_write_words(struct flash_bank_s *bank, uint8_t *word, uint3
 {
 	int retval;
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint8_t command[8];
 
 	/* Calculate buffer size and boundary mask */
@@ -1690,8 +1690,8 @@ static int cfi_spansion_write_word(struct flash_bank_s *bank, uint8_t *word, uin
 {
 	int retval;
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
-	cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
-	target_t *target = bank->target;
+	struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
+	struct target *target = bank->target;
 	uint8_t command[8];
 
 	cfi_command(bank, 0xaa, command);
@@ -1736,9 +1736,9 @@ static int cfi_spansion_write_words(struct flash_bank_s *bank, uint8_t *word, ui
 {
 	int retval;
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint8_t command[8];
-	cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
+	struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
 
 	/* Calculate buffer size and boundary mask */
 	uint32_t buffersize = (1UL << cfi_info->max_buf_write_size) * (bank->bus_width / bank->chip_width);
@@ -1869,7 +1869,7 @@ static int cfi_write_words(struct flash_bank_s *bank, uint8_t *word, uint32_t wo
 int cfi_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint32_t address = bank->base + offset;	/* address of first byte to be programmed */
 	uint32_t write_p, copy_p;
 	int align;	/* number of unaligned bytes */
@@ -2079,7 +2079,7 @@ static void cfi_fixup_atmel_reversed_erase_regions(flash_bank_t *bank, void *par
 {
 	(void) param;
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
-	cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
+	struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
 
 	pri_ext->_reversed_geometry = 1;
 }
@@ -2088,7 +2088,7 @@ static void cfi_fixup_0002_erase_regions(flash_bank_t *bank, void *param)
 {
 	int i;
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
-	cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
+	struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
 	(void) param;
 
 	if ((pri_ext->_reversed_geometry) || (pri_ext->TopBottom == 3))
@@ -2110,8 +2110,8 @@ static void cfi_fixup_0002_erase_regions(flash_bank_t *bank, void *param)
 static void cfi_fixup_0002_unlock_addresses(flash_bank_t *bank, void *param)
 {
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
-	cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
-	cfi_unlock_addresses_t *unlock_addresses = param;
+	struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
+	struct cfi_unlock_addresses *unlock_addresses = param;
 
 	pri_ext->_unlock1 = unlock_addresses->unlock1;
 	pri_ext->_unlock2 = unlock_addresses->unlock2;
@@ -2121,7 +2121,7 @@ static void cfi_fixup_0002_unlock_addresses(flash_bank_t *bank, void *param)
 static int cfi_query_string(struct flash_bank_s *bank, int address)
 {
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	int retval;
 	uint8_t command[8];
 
@@ -2159,7 +2159,7 @@ static int cfi_query_string(struct flash_bank_s *bank, int address)
 static int cfi_probe(struct flash_bank_s *bank)
 {
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint8_t command[8];
 	int num_sectors = 0;
 	int i;
@@ -2391,7 +2391,7 @@ static int cfi_probe(struct flash_bank_s *bank)
 	{
 		/* a device might have only one erase block, spanning the whole device */
 		bank->num_sectors = 1;
-		bank->sectors = malloc(sizeof(flash_sector_t));
+		bank->sectors = malloc(sizeof(struct flash_sector));
 
 		bank->sectors[sector].offset = 0x0;
 		bank->sectors[sector].size = bank->size;
@@ -2408,7 +2408,7 @@ static int cfi_probe(struct flash_bank_s *bank)
 		}
 
 		bank->num_sectors = num_sectors;
-		bank->sectors = malloc(sizeof(flash_sector_t) * num_sectors);
+		bank->sectors = malloc(sizeof(struct flash_sector) * num_sectors);
 
 		for (i = 0; i < cfi_info->num_erase_regions; i++)
 		{
@@ -2449,7 +2449,7 @@ static int cfi_intel_protect_check(struct flash_bank_s *bank)
 	int retval;
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
 	struct cfi_intel_pri_ext *pri_ext = cfi_info->pri_ext;
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint8_t command[CFI_MAX_BUS_WIDTH];
 	int i;
 
@@ -2481,8 +2481,8 @@ static int cfi_spansion_protect_check(struct flash_bank_s *bank)
 {
 	int retval;
 	struct cfi_flash_bank *cfi_info = bank->driver_priv;
-	cfi_spansion_pri_ext_t *pri_ext = cfi_info->pri_ext;
-	target_t *target = bank->target;
+	struct cfi_spansion_pri_ext *pri_ext = cfi_info->pri_ext;
+	struct target *target = bank->target;
 	uint8_t command[8];
 	int i;
 
@@ -2626,7 +2626,7 @@ static int cfi_info(struct flash_bank_s *bank, char *buf, int buf_size)
 	return ERROR_OK;
 }
 
-flash_driver_t cfi_flash = {
+struct flash_driver cfi_flash = {
 		.name = "cfi",
 		.register_commands = &cfi_register_commands,
 		.flash_bank_command = &cfi_flash_bank_command,