build: cleanup src/flash/nor directory

Change-Id: Ic299de969ce566282c055ba4dd8b94892c4c4311
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/420
Tested-by: jenkins

1 files changed, 75 insertions, 132 deletions

diff --git a/src/flash/nor/stellaris.c b/src/flash/nor/stellaris.c
index 1aaa6e41..712077da 100644
--- a/src/flash/nor/stellaris.c
+++ b/src/flash/nor/stellaris.c
@@ -91,15 +91,14 @@
 static void stellaris_read_clock_info(struct flash_bank *bank);
 static int stellaris_mass_erase(struct flash_bank *bank);
 
-struct stellaris_flash_bank
-{
+struct stellaris_flash_bank {
 	/* chip id register */
 	uint32_t did0;
 	uint32_t did1;
 	uint32_t dc0;
 	uint32_t dc1;
 
-	const char * target_name;
+	const char *target_name;
 	uint8_t target_class;
 
 	uint32_t sramsiz;
@@ -123,8 +122,8 @@ struct stellaris_flash_bank
 	const char *mck_desc;
 };
 
-// Autogenerated by contrib/gen-stellaris-part-header.pl
-// From Stellaris Firmware Development Package revision 8049
+/* Autogenerated by contrib/gen-stellaris-part-header.pl */
+/* From Stellaris Firmware Development Package revision 8049 */
 static struct {
 	uint8_t class;
 	uint8_t partno;
@@ -415,8 +414,7 @@ static struct {
 	{0xFF, 0x00, "Unknown Part"}
 };
 
-static char * StellarisClassname[7] =
-{
+static char *StellarisClassname[7] = {
 	"Sandstorm",
 	"Fury",
 	"Unknown",
@@ -437,9 +435,7 @@ FLASH_BANK_COMMAND_HANDLER(stellaris_flash_bank_command)
 	struct stellaris_flash_bank *stellaris_info;
 
 	if (CMD_ARGC < 6)
-	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
-	}
 
 	stellaris_info = calloc(sizeof(struct stellaris_flash_bank), 1);
 	bank->base = 0x0;
@@ -503,8 +499,7 @@ static int get_stellaris_info(struct flash_bank *bank, char *buf, int buf_size)
 	buf += printed;
 	buf_size -= printed;
 
-	if (stellaris_info->num_lockbits > 0)
-	{
+	if (stellaris_info->num_lockbits > 0) {
 		snprintf(buf,
 				buf_size,
 				"pagesize: %" PRIi32 ", pages: %d, "
@@ -532,7 +527,7 @@ static void stellaris_set_flash_timing(struct flash_bank *bank)
 	if (stellaris_info->target_class > 1)
 		return;
 
-	LOG_DEBUG("usecrl = %i",(int)(usecrl));
+	LOG_DEBUG("usecrl = %i", (int)(usecrl));
 	target_write_u32(target, SCB_BASE | USECRL, usecrl);
 }
 
@@ -613,8 +608,7 @@ static void stellaris_read_clock_info(struct flash_bank *bank)
 
 	stellaris_info->mck_desc = "";
 
-	switch (oscsrc)
-	{
+	switch (oscsrc) {
 		case 0:				/* MOSC */
 			mainfreq = rcc_xtal[xtal];
 			break;
@@ -670,22 +664,19 @@ static int stellaris_read_part_info(struct flash_bank *bank)
 		  did0, did1, stellaris_info->dc0, stellaris_info->dc1);
 
 	ver = did0 >> 28;
-	if ((ver != 0) && (ver != 1))
-	{
+	if ((ver != 0) && (ver != 1)) {
 		LOG_WARNING("Unknown did0 version, cannot identify target");
 		return ERROR_FLASH_OPERATION_FAILED;
 	}
 
-	if (did1 == 0)
-	{
+	if (did1 == 0) {
 		LOG_WARNING("Cannot identify target as a Stellaris");
 		return ERROR_FLASH_OPERATION_FAILED;
 	}
 
 	ver = did1 >> 28;
 	fam = (did1 >> 24) & 0xF;
-	if (((ver != 0) && (ver != 1)) || (fam != 0))
-	{
+	if (((ver != 0) && (ver != 1)) || (fam != 0)) {
 		LOG_WARNING("Unknown did1 version/family.");
 		return ERROR_FLASH_OPERATION_FAILED;
 	}
@@ -754,7 +745,7 @@ static int stellaris_read_part_info(struct flash_bank *bank)
 	stellaris_info->did1 = did1;
 
 	stellaris_info->num_lockbits = 1 + (stellaris_info->dc0 & 0xFFFF);
-	stellaris_info->num_pages = 2 *(1 + (stellaris_info->dc0 & 0xFFFF));
+	stellaris_info->num_pages = 2 * (1 + (stellaris_info->dc0 & 0xFFFF));
 	stellaris_info->pagesize = 1024;
 	stellaris_info->pages_in_lockregion = 2;
 
@@ -823,8 +814,7 @@ static int stellaris_erase(struct flash_bank *bank, int first, int last)
 	struct stellaris_flash_bank *stellaris_info = bank->driver_priv;
 	struct target *target = bank->target;
 
-	if (bank->target->state != TARGET_HALTED)
-	{
+	if (bank->target->state != TARGET_HALTED) {
 		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
@@ -833,14 +823,10 @@ static int stellaris_erase(struct flash_bank *bank, int first, int last)
 		return ERROR_FLASH_BANK_NOT_PROBED;
 
 	if ((first < 0) || (last < first) || (last >= (int)stellaris_info->num_pages))
-	{
 		return ERROR_FLASH_SECTOR_INVALID;
-	}
 
 	if ((first == 0) && (last == ((int)stellaris_info->num_pages-1)))
-	{
 		return stellaris_mass_erase(bank);
-	}
 
 	/* Refresh flash controller timing */
 	stellaris_read_clock_info(bank);
@@ -854,24 +840,21 @@ static int stellaris_erase(struct flash_bank *bank, int first, int last)
 	 * it might want to process those IRQs.
 	 */
 
-	for (banknr = first; banknr <= last; banknr++)
-	{
+	for (banknr = first; banknr <= last; banknr++) {
 		/* Address is first word in page */
 		target_write_u32(target, FLASH_FMA, banknr * stellaris_info->pagesize);
 		/* Write erase command */
 		target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_ERASE);
 		/* Wait until erase complete */
-		do
-		{
+		do {
 			target_read_u32(target, FLASH_FMC, &flash_fmc);
-		}
-		while (flash_fmc & FMC_ERASE);
+		} while (flash_fmc & FMC_ERASE);
 
 		/* Check acess violations */
 		target_read_u32(target, FLASH_CRIS, &flash_cris);
-		if (flash_cris & (AMASK))
-		{
-			LOG_WARNING("Error erasing flash page %i,  flash_cris 0x%" PRIx32 "", banknr, flash_cris);
+		if (flash_cris & (AMASK)) {
+			LOG_WARNING("Error erasing flash page %i,  flash_cris 0x%" PRIx32 "",
+					banknr, flash_cris);
 			target_write_u32(target, FLASH_CRIS, 0);
 			return ERROR_FLASH_OPERATION_FAILED;
 		}
@@ -890,14 +873,12 @@ static int stellaris_protect(struct flash_bank *bank, int set, int first, int la
 	struct stellaris_flash_bank *stellaris_info = bank->driver_priv;
 	struct target *target = bank->target;
 
-	if (bank->target->state != TARGET_HALTED)
-	{
+	if (bank->target->state != TARGET_HALTED) {
 		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
 
-	if (!set)
-	{
+	if (!set) {
 		LOG_ERROR("Hardware doesn't support page-level unprotect. "
 			"Try the 'recover' command.");
 		return ERROR_COMMAND_SYNTAX_ERROR;
@@ -909,8 +890,7 @@ static int stellaris_protect(struct flash_bank *bank, int set, int first, int la
 	/* lockregions are 2 pages ... must protect [even..odd] */
 	if ((first < 0) || (first & 1)
 			|| (last < first) || !(last & 1)
-			|| (last >= 2 * stellaris_info->num_lockbits))
-	{
+			|| (last >= 2 * stellaris_info->num_lockbits)) {
 		LOG_ERROR("Can't protect unaligned or out-of-range pages.");
 		return ERROR_FLASH_SECTOR_INVALID;
 	}
@@ -944,7 +924,7 @@ static int stellaris_protect(struct flash_bank *bank, int set, int first, int la
 	 * it might want to process those IRQs.
 	 */
 
-	LOG_DEBUG("fmppe 0x%" PRIx32 "",fmppe);
+	LOG_DEBUG("fmppe 0x%" PRIx32 "", fmppe);
 	target_write_u32(target, SCB_BASE | FMPPE, fmppe);
 
 	/* Commit FMPPE */
@@ -960,16 +940,13 @@ static int stellaris_protect(struct flash_bank *bank, int set, int first, int la
 	/* target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_COMT); */
 
 	/* Wait until erase complete */
-	do
-	{
+	do {
 		target_read_u32(target, FLASH_FMC, &flash_fmc);
-	}
-	while (flash_fmc & FMC_COMT);
+	} while (flash_fmc & FMC_COMT);
 
 	/* Check acess violations */
 	target_read_u32(target, FLASH_CRIS, &flash_cris);
-	if (flash_cris & (AMASK))
-	{
+	if (flash_cris & (AMASK)) {
 		LOG_WARNING("Error setting flash page protection,  flash_cris 0x%" PRIx32 "", flash_cris);
 		target_write_u32(target, FLASH_CRIS, 0);
 		return ERROR_FLASH_OPERATION_FAILED;
@@ -980,8 +957,7 @@ static int stellaris_protect(struct flash_bank *bank, int set, int first, int la
 
 /* see contib/loaders/flash/stellaris.s for src */
 
-static const uint8_t stellaris_write_code[] =
-{
+static const uint8_t stellaris_write_code[] = {
 /*
 	Call with :
 	r0 = buffer address
@@ -995,28 +971,28 @@ static const uint8_t stellaris_write_code[] =
 	r6 = bytes written
 	r7 = temp reg
 */
-	0x07,0x4B,			/* ldr r3,pFLASH_CTRL_BASE */
-	0x08,0x4C,			/* ldr r4,FLASHWRITECMD */
-	0x01,0x25,			/* movs r5, 1 */
-	0x00,0x26,			/* movs r6, #0 */
+	0x07, 0x4B,			/* ldr r3,pFLASH_CTRL_BASE */
+	0x08, 0x4C,			/* ldr r4,FLASHWRITECMD */
+	0x01, 0x25,			/* movs r5, 1 */
+	0x00, 0x26,			/* movs r6, #0 */
 /* mainloop: */
-	0x19,0x60,			/* str	r1, [r3, #0] */
-	0x87,0x59,			/* ldr	r7, [r0, r6] */
-	0x5F,0x60,			/* str	r7, [r3, #4] */
-	0x9C,0x60,			/* str	r4, [r3, #8] */
+	0x19, 0x60,			/* str	r1, [r3, #0] */
+	0x87, 0x59,			/* ldr	r7, [r0, r6] */
+	0x5F, 0x60,			/* str	r7, [r3, #4] */
+	0x9C, 0x60,			/* str	r4, [r3, #8] */
 /* waitloop: */
-	0x9F,0x68,			/* ldr	r7, [r3, #8] */
-	0x2F,0x42,			/* tst	r7, r5 */
-	0xFC,0xD1,			/* bne	waitloop */
-	0x04,0x31,			/* adds	r1, r1, #4 */
-	0x04,0x36,			/* adds	r6, r6, #4 */
-	0x96,0x42,			/* cmp	r6, r2 */
-	0xF4,0xD1,			/* bne	mainloop */
-	0x00,0xBE,     		/* bkpt #0 */
+	0x9F, 0x68,			/* ldr	r7, [r3, #8] */
+	0x2F, 0x42,			/* tst	r7, r5 */
+	0xFC, 0xD1,			/* bne	waitloop */
+	0x04, 0x31,			/* adds	r1, r1, #4 */
+	0x04, 0x36,			/* adds	r6, r6, #4 */
+	0x96, 0x42,			/* cmp	r6, r2 */
+	0xF4, 0xD1,			/* bne	mainloop */
+	0x00, 0xBE,			/* bkpt #0 */
 /* pFLASH_CTRL_BASE: */
-	0x00,0xD0,0x0F,0x40,	/* .word	0x400FD000 */
+	0x00, 0xD0, 0x0F, 0x40,	/* .word	0x400FD000 */
 /* FLASHWRITECMD: */
-	0x01,0x00,0x42,0xA4	/* .word	0xA4420001 */
+	0x01, 0x00, 0x42, 0xA4	/* .word	0xA4420001 */
 };
 
 static int stellaris_write_block(struct flash_bank *bank,
@@ -1042,8 +1018,8 @@ static int stellaris_write_block(struct flash_bank *bank,
 			bank, buffer, offset, wcount);
 
 	/* flash write code */
-	if (target_alloc_working_area(target, sizeof(stellaris_write_code), &write_algorithm) != ERROR_OK)
-	{
+	if (target_alloc_working_area(target, sizeof(stellaris_write_code),
+			&write_algorithm) != ERROR_OK) {
 		LOG_DEBUG("no working area for block memory writes");
 		return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
 	};
@@ -1053,11 +1029,9 @@ static int stellaris_write_block(struct flash_bank *bank,
 		buffer_size = wcount * 4;
 
 	/* memory buffer */
-	while (target_alloc_working_area_try(target, buffer_size, &source) != ERROR_OK)
-	{
+	while (target_alloc_working_area_try(target, buffer_size, &source) != ERROR_OK) {
 		buffer_size /= 2;
-		if (buffer_size <= buf_min)
-		{
+		if (buffer_size <= buf_min) {
 			target_free_working_area(target, write_algorithm);
 			return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
 		}
@@ -1076,8 +1050,7 @@ static int stellaris_write_block(struct flash_bank *bank,
 	init_reg_param(&reg_params[1], "r1", 32, PARAM_OUT);
 	init_reg_param(&reg_params[2], "r2", 32, PARAM_OUT);
 
-	while (wcount > 0)
-	{
+	while (wcount > 0) {
 		uint32_t thisrun_count = (wcount > (buffer_size / 4)) ? (buffer_size / 4) : wcount;
 
 		target_write_buffer(target, source->address, thisrun_count * 4, buffer);
@@ -1093,8 +1066,7 @@ static int stellaris_write_block(struct flash_bank *bank,
 				write_algorithm->address,
 				0,
 				10000, &armv7m_info);
-		if (retval != ERROR_OK)
-		{
+		if (retval != ERROR_OK) {
 			LOG_ERROR("error %d executing stellaris "
 					"flash write algorithm",
 					retval);
@@ -1121,7 +1093,8 @@ static int stellaris_write_block(struct flash_bank *bank,
 	return retval;
 }
 
-static int stellaris_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int stellaris_write(struct flash_bank *bank, uint8_t *buffer,
+		uint32_t offset, uint32_t count)
 {
 	struct stellaris_flash_bank *stellaris_info = bank->driver_priv;
 	struct target *target = bank->target;
@@ -1132,8 +1105,7 @@ static int stellaris_write(struct flash_bank *bank, uint8_t *buffer, uint32_t of
 	uint32_t bytes_written = 0;
 	int retval;
 
-	if (bank->target->state != TARGET_HALTED)
-	{
+	if (bank->target->state != TARGET_HALTED) {
 		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
@@ -1144,8 +1116,7 @@ static int stellaris_write(struct flash_bank *bank, uint8_t *buffer, uint32_t of
 	if (stellaris_info->did1 == 0)
 		return ERROR_FLASH_BANK_NOT_PROBED;
 
-	if (offset & 0x3)
-	{
+	if (offset & 0x3) {
 		LOG_WARNING("offset size must be word aligned");
 		return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
 	}
@@ -1166,36 +1137,28 @@ static int stellaris_write(struct flash_bank *bank, uint8_t *buffer, uint32_t of
 	 */
 
 	/* multiple words to be programmed? */
-	if (words_remaining > 0)
-	{
+	if (words_remaining > 0) {
 		/* try using a block write */
 		retval = stellaris_write_block(bank, buffer, offset,
 				words_remaining);
-		if (retval != ERROR_OK)
-		{
-			if (retval == ERROR_TARGET_RESOURCE_NOT_AVAILABLE)
-			{
+		if (retval != ERROR_OK) {
+			if (retval == ERROR_TARGET_RESOURCE_NOT_AVAILABLE) {
 				LOG_DEBUG("writing flash word-at-a-time");
-			}
-			else if (retval == ERROR_FLASH_OPERATION_FAILED)
-			{
+			} else if (retval == ERROR_FLASH_OPERATION_FAILED) {
 				/* if an error occured, we examine the reason, and quit */
 				target_read_u32(target, FLASH_CRIS, &flash_cris);
 
 				LOG_ERROR("flash writing failed with CRIS: 0x%" PRIx32 "", flash_cris);
 				return ERROR_FLASH_OPERATION_FAILED;
 			}
-		}
-		else
-		{
+		} else {
 			buffer += words_remaining * 4;
 			address += words_remaining * 4;
 			words_remaining = 0;
 		}
 	}
 
-	while (words_remaining > 0)
-	{
+	while (words_remaining > 0) {
 		if (!(address & 0xff))
 			LOG_DEBUG("0x%" PRIx32 "", address);
 
@@ -1205,8 +1168,7 @@ static int stellaris_write(struct flash_bank *bank, uint8_t *buffer, uint32_t of
 		target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_WRITE);
 		/* LOG_DEBUG("0x%x 0x%x 0x%x",address,buf_get_u32(buffer, 0, 32),FMC_WRKEY | FMC_WRITE); */
 		/* Wait until write complete */
-		do
-		{
+		do {
 			target_read_u32(target, FLASH_FMC, &flash_fmc);
 		} while (flash_fmc & FMC_WRITE);
 
@@ -1215,8 +1177,7 @@ static int stellaris_write(struct flash_bank *bank, uint8_t *buffer, uint32_t of
 		words_remaining--;
 	}
 
-	if (bytes_remaining)
-	{
+	if (bytes_remaining) {
 		uint8_t last_word[4] = {0xff, 0xff, 0xff, 0xff};
 
 		/* copy the last remaining bytes into the write buffer */
@@ -1231,16 +1192,14 @@ static int stellaris_write(struct flash_bank *bank, uint8_t *buffer, uint32_t of
 		target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_WRITE);
 		/* LOG_DEBUG("0x%x 0x%x 0x%x",address,buf_get_u32(buffer, 0, 32),FMC_WRKEY | FMC_WRITE); */
 		/* Wait until write complete */
-		do
-		{
+		do {
 			target_read_u32(target, FLASH_FMC, &flash_fmc);
 		} while (flash_fmc & FMC_WRITE);
 	}
 
 	/* Check access violations */
 	target_read_u32(target, FLASH_CRIS, &flash_cris);
-	if (flash_cris & (AMASK))
-	{
+	if (flash_cris & (AMASK)) {
 		LOG_DEBUG("flash_cris 0x%" PRIx32 "", flash_cris);
 		return ERROR_FLASH_OPERATION_FAILED;
 	}
@@ -1266,8 +1225,7 @@ static int stellaris_probe(struct flash_bank *bank)
 	if (retval != ERROR_OK)
 		return retval;
 
-	if (bank->sectors)
-	{
+	if (bank->sectors) {
 		free(bank->sectors);
 		bank->sectors = NULL;
 	}
@@ -1276,8 +1234,7 @@ static int stellaris_probe(struct flash_bank *bank)
 	bank->size = 1024 * stellaris_info->num_pages;
 	bank->num_sectors = stellaris_info->num_pages;
 	bank->sectors = calloc(bank->num_sectors, sizeof(struct flash_sector));
-	for (int i = 0; i < bank->num_sectors; i++)
-	{
+	for (int i = 0; i < bank->num_sectors; i++) {
 		bank->sectors[i].offset = i * stellaris_info->pagesize;
 		bank->sectors[i].size = stellaris_info->pagesize;
 		bank->sectors[i].is_erased = -1;
@@ -1296,8 +1253,7 @@ static int stellaris_mass_erase(struct flash_bank *bank)
 	stellaris_info = bank->driver_priv;
 	target = bank->target;
 
-	if (target->state != TARGET_HALTED)
-	{
+	if (target->state != TARGET_HALTED) {
 		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
@@ -1320,24 +1276,19 @@ static int stellaris_mass_erase(struct flash_bank *bank)
 	target_write_u32(target, FLASH_FMA, 0);
 	target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_MERASE);
 	/* Wait until erase complete */
-	do
-	{
+	do {
 		target_read_u32(target, FLASH_FMC, &flash_fmc);
-	}
-	while (flash_fmc & FMC_MERASE);
+	} while (flash_fmc & FMC_MERASE);
 
 	/* if device has > 128k, then second erase cycle is needed
 	 * this is only valid for older devices, but will not hurt */
-	if (stellaris_info->num_pages * stellaris_info->pagesize > 0x20000)
-	{
+	if (stellaris_info->num_pages * stellaris_info->pagesize > 0x20000) {
 		target_write_u32(target, FLASH_FMA, 0x20000);
 		target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_MERASE);
 		/* Wait until erase complete */
-		do
-		{
+		do {
 			target_read_u32(target, FLASH_FMC, &flash_fmc);
-		}
-		while (flash_fmc & FMC_MERASE);
+		} while (flash_fmc & FMC_MERASE);
 	}
 
 	return ERROR_OK;
@@ -1348,29 +1299,21 @@ COMMAND_HANDLER(stellaris_handle_mass_erase_command)
 	int i;
 
 	if (CMD_ARGC < 1)
-	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
-	}
 
 	struct flash_bank *bank;
 	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
-	if (stellaris_mass_erase(bank) == ERROR_OK)
-	{
+	if (stellaris_mass_erase(bank) == ERROR_OK) {
 		/* set all sectors as erased */
 		for (i = 0; i < bank->num_sectors; i++)
-		{
 			bank->sectors[i].is_erased = 1;
-		}
 
 		command_print(CMD_CTX, "stellaris mass erase complete");
-	}
-	else
-	{
+	} else
 		command_print(CMD_CTX, "stellaris mass erase failed");
-	}
 
 	return ERROR_OK;
 }