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, 100 insertions, 129 deletions

diff --git a/src/flash/nor/avrf.c b/src/flash/nor/avrf.c
index 462aee2..1dc5f07 100644
--- a/src/flash/nor/avrf.c
+++ b/src/flash/nor/avrf.c
@@ -17,6 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -24,33 +25,31 @@
 #include "imp.h"
 #include <target/avrt.h>
 
-
 /* AVR_JTAG_Instructions */
-#define AVR_JTAG_INS_LEN							4
-// Public Instructions:
-#define AVR_JTAG_INS_EXTEST							0x00
-#define AVR_JTAG_INS_IDCODE							0x01
-#define AVR_JTAG_INS_SAMPLE_PRELOAD					0x02
-#define AVR_JTAG_INS_BYPASS							0x0F
-// AVR Specified Public Instructions:
-#define AVR_JTAG_INS_AVR_RESET						0x0C
-#define AVR_JTAG_INS_PROG_ENABLE					0x04
-#define AVR_JTAG_INS_PROG_COMMANDS					0x05
-#define AVR_JTAG_INS_PROG_PAGELOAD					0x06
-#define AVR_JTAG_INS_PROG_PAGEREAD					0x07
-
-// Data Registers:
-#define AVR_JTAG_REG_Bypass_Len						1
-#define AVR_JTAG_REG_DeviceID_Len					32
-
-#define AVR_JTAG_REG_Reset_Len						1
-#define AVR_JTAG_REG_JTAGID_Len						32
-#define AVR_JTAG_REG_ProgrammingEnable_Len			16
-#define AVR_JTAG_REG_ProgrammingCommand_Len			15
-#define AVR_JTAG_REG_FlashDataByte_Len				16
-
-struct avrf_type
-{
+#define AVR_JTAG_INS_LEN                                        4
+/* Public Instructions: */
+#define AVR_JTAG_INS_EXTEST                                     0x00
+#define AVR_JTAG_INS_IDCODE                                     0x01
+#define AVR_JTAG_INS_SAMPLE_PRELOAD                             0x02
+#define AVR_JTAG_INS_BYPASS                                     0x0F
+/* AVR Specified Public Instructions: */
+#define AVR_JTAG_INS_AVR_RESET                                  0x0C
+#define AVR_JTAG_INS_PROG_ENABLE                                0x04
+#define AVR_JTAG_INS_PROG_COMMANDS                              0x05
+#define AVR_JTAG_INS_PROG_PAGELOAD                              0x06
+#define AVR_JTAG_INS_PROG_PAGEREAD                              0x07
+
+/* Data Registers: */
+#define AVR_JTAG_REG_Bypass_Len                                 1
+#define AVR_JTAG_REG_DeviceID_Len                               32
+
+#define AVR_JTAG_REG_Reset_Len                                  1
+#define AVR_JTAG_REG_JTAGID_Len                                 32
+#define AVR_JTAG_REG_ProgrammingEnable_Len                      16
+#define AVR_JTAG_REG_ProgrammingCommand_Len                     15
+#define AVR_JTAG_REG_FlashDataByte_Len                          16
+
+struct avrf_type {
 	char name[15];
 	uint16_t chip_id;
 	int flash_page_size;
@@ -59,26 +58,24 @@ struct avrf_type
 	int eeprom_page_num;
 };
 
-struct avrf_flash_bank
-{
+struct avrf_flash_bank {
 	int ppage_size;
 	int probed;
 };
 
-static struct avrf_type avft_chips_info[] =
-{
+static struct avrf_type avft_chips_info[] = {
 /*	name, chip_id,	flash_page_size, flash_page_num,
  *			eeprom_page_size, eeprom_page_num
  */
-	{"atmega128",	0x9702, 256, 512, 8, 512},
-	{"at90can128",	0x9781, 256, 512, 8, 512},
+	{"atmega128", 0x9702, 256, 512, 8, 512},
+	{"at90can128", 0x9781, 256, 512, 8, 512},
 };
 
 /* avr program functions */
 static int avr_jtag_reset(struct avr_common *avr, uint32_t reset)
 {
 	avr_jtag_sendinstr(avr->jtag_info.tap, NULL, AVR_JTAG_INS_AVR_RESET);
-	avr_jtag_senddat(avr->jtag_info.tap, NULL, reset ,AVR_JTAG_REG_Reset_Len);
+	avr_jtag_senddat(avr->jtag_info.tap, NULL, reset, AVR_JTAG_REG_Reset_Len);
 
 	return ERROR_OK;
 }
@@ -127,42 +124,48 @@ static int avr_jtagprg_chiperase(struct avr_common *avr)
 
 	do {
 		poll_value = 0;
-		avr_jtag_senddat(avr->jtag_info.tap, &poll_value, 0x3380, AVR_JTAG_REG_ProgrammingCommand_Len);
+		avr_jtag_senddat(avr->jtag_info.tap,
+			&poll_value,
+			0x3380,
+			AVR_JTAG_REG_ProgrammingCommand_Len);
 		if (ERROR_OK != mcu_execute_queue())
-		{
 			return ERROR_FAIL;
-		}
 		LOG_DEBUG("poll_value = 0x%04" PRIx32 "", poll_value);
 	} while (!(poll_value & 0x0200));
 
 	return ERROR_OK;
 }
 
-static int avr_jtagprg_writeflashpage(struct avr_common *avr, uint8_t *page_buf, uint32_t buf_size, uint32_t addr, uint32_t page_size)
+static int avr_jtagprg_writeflashpage(struct avr_common *avr,
+	uint8_t *page_buf,
+	uint32_t buf_size,
+	uint32_t addr,
+	uint32_t page_size)
 {
 	uint32_t i, poll_value;
 
 	avr_jtag_sendinstr(avr->jtag_info.tap, NULL, AVR_JTAG_INS_PROG_COMMANDS);
 	avr_jtag_senddat(avr->jtag_info.tap, NULL, 0x2310, AVR_JTAG_REG_ProgrammingCommand_Len);
 
-	// load addr high byte
-	avr_jtag_senddat(avr->jtag_info.tap, NULL, 0x0700 | ((addr >> 9) & 0xFF), AVR_JTAG_REG_ProgrammingCommand_Len);
+	/* load addr high byte */
+	avr_jtag_senddat(avr->jtag_info.tap,
+		NULL,
+		0x0700 | ((addr >> 9) & 0xFF),
+		AVR_JTAG_REG_ProgrammingCommand_Len);
 
-	// load addr low byte
-	avr_jtag_senddat(avr->jtag_info.tap, NULL, 0x0300 | ((addr >> 1) & 0xFF), AVR_JTAG_REG_ProgrammingCommand_Len);
+	/* load addr low byte */
+	avr_jtag_senddat(avr->jtag_info.tap,
+		NULL,
+		0x0300 | ((addr >> 1) & 0xFF),
+		AVR_JTAG_REG_ProgrammingCommand_Len);
 
 	avr_jtag_sendinstr(avr->jtag_info.tap, NULL, AVR_JTAG_INS_PROG_PAGELOAD);
 
-	for (i = 0; i < page_size; i++)
-	{
+	for (i = 0; i < page_size; i++) {
 		if (i < buf_size)
-		{
 			avr_jtag_senddat(avr->jtag_info.tap, NULL, page_buf[i], 8);
-		}
 		else
-		{
 			avr_jtag_senddat(avr->jtag_info.tap, NULL, 0xFF, 8);
-		}
 	}
 
 	avr_jtag_sendinstr(avr->jtag_info.tap, NULL, AVR_JTAG_INS_PROG_COMMANDS);
@@ -174,11 +177,12 @@ static int avr_jtagprg_writeflashpage(struct avr_common *avr, uint8_t *page_buf,
 
 	do {
 		poll_value = 0;
-		avr_jtag_senddat(avr->jtag_info.tap, &poll_value, 0x3700, AVR_JTAG_REG_ProgrammingCommand_Len);
+		avr_jtag_senddat(avr->jtag_info.tap,
+			&poll_value,
+			0x3700,
+			AVR_JTAG_REG_ProgrammingCommand_Len);
 		if (ERROR_OK != mcu_execute_queue())
-		{
 			return ERROR_FAIL;
-		}
 		LOG_DEBUG("poll_value = 0x%04" PRIx32 "", poll_value);
 	} while (!(poll_value & 0x0200));
 
@@ -190,9 +194,7 @@ FLASH_BANK_COMMAND_HANDLER(avrf_flash_bank_command)
 	struct avrf_flash_bank *avrf_info;
 
 	if (CMD_ARGC < 6)
-	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
-	}
 
 	avrf_info = malloc(sizeof(struct avrf_flash_bank));
 	bank->driver_priv = avrf_info;
@@ -208,10 +210,9 @@ static int avrf_erase(struct flash_bank *bank, int first, int last)
 	struct avr_common *avr = target->arch_info;
 	int status;
 
-	LOG_DEBUG("%s", __FUNCTION__);
+	LOG_DEBUG("%s", __func__);
 
-	if (target->state != TARGET_HALTED)
-	{
+	if (target->state != TARGET_HALTED) {
 		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
@@ -229,7 +230,7 @@ static int avrf_erase(struct flash_bank *bank, int first, int last)
 
 static int avrf_protect(struct flash_bank *bank, int set, int first, int last)
 {
-	LOG_INFO("%s", __FUNCTION__);
+	LOG_INFO("%s", __func__);
 	return ERROR_OK;
 }
 
@@ -239,16 +240,16 @@ static int avrf_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset,
 	struct avr_common *avr = target->arch_info;
 	uint32_t cur_size, cur_buffer_size, page_size;
 
-	if (bank->target->state != TARGET_HALTED)
-	{
+	if (bank->target->state != TARGET_HALTED) {
 		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
 
 	page_size = bank->sectors[0].size;
-	if ((offset % page_size) != 0)
-	{
-		LOG_WARNING("offset 0x%" PRIx32 " breaks required %" PRIu32 "-byte alignment", offset, page_size);
+	if ((offset % page_size) != 0) {
+		LOG_WARNING("offset 0x%" PRIx32 " breaks required %" PRIu32 "-byte alignment",
+			offset,
+			page_size);
 		return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
 	}
 
@@ -256,22 +257,19 @@ static int avrf_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset,
 	LOG_DEBUG("count is %" PRId32 "", count);
 
 	if (ERROR_OK != avr_jtagprg_enterprogmode(avr))
-	{
 		return ERROR_FAIL;
-	}
 
 	cur_size = 0;
-	while (count > 0)
-	{
+	while (count > 0) {
 		if (count > page_size)
-		{
 			cur_buffer_size = page_size;
-		}
 		else
-		{
 			cur_buffer_size = count;
-		}
-		avr_jtagprg_writeflashpage(avr, buffer + cur_size, cur_buffer_size, offset + cur_size, page_size);
+		avr_jtagprg_writeflashpage(avr,
+			buffer + cur_size,
+			cur_buffer_size,
+			offset + cur_size,
+			page_size);
 		count -= cur_buffer_size;
 		cur_size += cur_buffer_size;
 
@@ -284,6 +282,7 @@ static int avrf_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset,
 #define EXTRACT_MFG(X)  (((X) & 0xffe) >> 1)
 #define EXTRACT_PART(X) (((X) & 0xffff000) >> 12)
 #define EXTRACT_VER(X)  (((X) & 0xf0000000) >> 28)
+
 static int avrf_probe(struct flash_bank *bank)
 {
 	struct target *target = bank->target;
@@ -293,8 +292,7 @@ static int avrf_probe(struct flash_bank *bank)
 	int i;
 	uint32_t device_id;
 
-	if (bank->target->state != TARGET_HALTED)
-	{
+	if (bank->target->state != TARGET_HALTED) {
 		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
@@ -303,42 +301,35 @@ static int avrf_probe(struct flash_bank *bank)
 
 	avr_jtag_read_jtagid(avr, &device_id);
 	if (ERROR_OK != mcu_execute_queue())
-	{
 		return ERROR_FAIL;
-	}
 
 	LOG_INFO("device id = 0x%08" PRIx32 "", device_id);
 	if (EXTRACT_MFG(device_id) != 0x1F)
-	{
-		LOG_ERROR("0x%" PRIx32 " is invalid Manufacturer for avr, 0x%X is expected", EXTRACT_MFG(device_id), 0x1F);
-	}
+		LOG_ERROR("0x%" PRIx32 " is invalid Manufacturer for avr, 0x%X is expected",
+			EXTRACT_MFG(device_id),
+			0x1F);
 
-	for (i = 0; i < (int)ARRAY_SIZE(avft_chips_info); i++)
-	{
-		if (avft_chips_info[i].chip_id == EXTRACT_PART(device_id))
-		{
+	for (i = 0; i < (int)ARRAY_SIZE(avft_chips_info); i++) {
+		if (avft_chips_info[i].chip_id == EXTRACT_PART(device_id)) {
 			avr_info = &avft_chips_info[i];
 			LOG_INFO("target device is %s", avr_info->name);
 			break;
 		}
 	}
 
-	if (avr_info != NULL)
-	{
-		if (bank->sectors)
-		{
+	if (avr_info != NULL) {
+		if (bank->sectors) {
 			free(bank->sectors);
 			bank->sectors = NULL;
 		}
 
-		// chip found
+		/* chip found */
 		bank->base = 0x00000000;
 		bank->size = (avr_info->flash_page_size * avr_info->flash_page_num);
 		bank->num_sectors = avr_info->flash_page_num;
 		bank->sectors = malloc(sizeof(struct flash_sector) * avr_info->flash_page_num);
 
-		for (i = 0; i < avr_info->flash_page_num; i++)
-		{
+		for (i = 0; i < avr_info->flash_page_num; i++) {
 			bank->sectors[i].offset = i * avr_info->flash_page_size;
 			bank->sectors[i].size = avr_info->flash_page_size;
 			bank->sectors[i].is_erased = -1;
@@ -347,10 +338,8 @@ static int avrf_probe(struct flash_bank *bank)
 
 		avrf_info->probed = 1;
 		return ERROR_OK;
-	}
-	else
-	{
-		// chip not supported
+	} else {
+		/* chip not supported */
 		LOG_ERROR("0x%" PRIx32 " is not support for avr", EXTRACT_PART(device_id));
 
 		avrf_info->probed = 1;
@@ -368,7 +357,7 @@ static int avrf_auto_probe(struct flash_bank *bank)
 
 static int avrf_protect_check(struct flash_bank *bank)
 {
-	LOG_INFO("%s", __FUNCTION__);
+	LOG_INFO("%s", __func__);
 	return ERROR_OK;
 }
 
@@ -380,28 +369,23 @@ static int avrf_info(struct flash_bank *bank, char *buf, int buf_size)
 	int i;
 	uint32_t device_id;
 
-	if (bank->target->state != TARGET_HALTED)
-	{
+	if (bank->target->state != TARGET_HALTED) {
 		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
 
 	avr_jtag_read_jtagid(avr, &device_id);
 	if (ERROR_OK != mcu_execute_queue())
-	{
 		return ERROR_FAIL;
-	}
 
 	LOG_INFO("device id = 0x%08" PRIx32 "", device_id);
 	if (EXTRACT_MFG(device_id) != 0x1F)
-	{
-		LOG_ERROR("0x%" PRIx32 " is invalid Manufacturer for avr, 0x%X is expected", EXTRACT_MFG(device_id), 0x1F);
-	}
+		LOG_ERROR("0x%" PRIx32 " is invalid Manufacturer for avr, 0x%X is expected",
+			EXTRACT_MFG(device_id),
+			0x1F);
 
-	for (i = 0; i < (int)ARRAY_SIZE(avft_chips_info); i++)
-	{
-		if (avft_chips_info[i].chip_id == EXTRACT_PART(device_id))
-		{
+	for (i = 0; i < (int)ARRAY_SIZE(avft_chips_info); i++) {
+		if (avft_chips_info[i].chip_id == EXTRACT_PART(device_id)) {
 			avr_info = &avft_chips_info[i];
 			LOG_INFO("target device is %s", avr_info->name);
 
@@ -409,15 +393,13 @@ static int avrf_info(struct flash_bank *bank, char *buf, int buf_size)
 		}
 	}
 
-	if (avr_info != NULL)
-	{
-		// chip found
-		snprintf(buf, buf_size, "%s - Rev: 0x%" PRIx32 "", avr_info->name, EXTRACT_VER(device_id));
+	if (avr_info != NULL) {
+		/* chip found */
+		snprintf(buf, buf_size, "%s - Rev: 0x%" PRIx32 "", avr_info->name,
+			EXTRACT_VER(device_id));
 		return ERROR_OK;
-	}
-	else
-	{
-		// chip not supported
+	} else {
+		/* chip not supported */
 		snprintf(buf, buf_size, "Cannot identify target as a avr\n");
 		return ERROR_FLASH_OPERATION_FAILED;
 	}
@@ -428,18 +410,15 @@ static int avrf_mass_erase(struct flash_bank *bank)
 	struct target *target = bank->target;
 	struct avr_common *avr = target->arch_info;
 
-	if (target->state != TARGET_HALTED)
-	{
+	if (target->state != TARGET_HALTED) {
 		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
 
 	if ((ERROR_OK != avr_jtagprg_enterprogmode(avr))
-		|| (ERROR_OK != avr_jtagprg_chiperase(avr))
-		|| (ERROR_OK != avr_jtagprg_leaveprogmode(avr)))
-	{
+	    || (ERROR_OK != avr_jtagprg_chiperase(avr))
+	    || (ERROR_OK != avr_jtagprg_leaveprogmode(avr)))
 		return ERROR_FAIL;
-	}
 
 	return ERROR_OK;
 }
@@ -449,31 +428,23 @@ COMMAND_HANDLER(avrf_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 (avrf_mass_erase(bank) == ERROR_OK)
-	{
+	if (avrf_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, "avr mass erase complete");
-	}
-	else
-	{
+	} else
 		command_print(CMD_CTX, "avr mass erase failed");
-	}
 
-	LOG_DEBUG("%s", __FUNCTION__);
+	LOG_DEBUG("%s", __func__);
 	return ERROR_OK;
 }