X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fat91sam7.c;h=9d05d7b5847d4b356463d92a386115186c3e19c1;hp=ede5491321fcc315d6621f35c5f21c77e16964d3;hb=a94748ec6da9bdc6e25a7f73bbea723b8b55fa33;hpb=3877201581c96a02d0e49b74050272ae77753cf1

diff --git a/src/flash/at91sam7.c b/src/flash/at91sam7.c
index ede5491321..9d05d7b584 100644
--- a/src/flash/at91sam7.c
+++ b/src/flash/at91sam7.c
@@ -52,13 +52,13 @@
 #include "at91sam7.h"
 #include "binarybuffer.h"
 
-static int at91sam7_protect_check(struct flash_bank_s *bank);
-static int at91sam7_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
+static int at91sam7_protect_check(struct flash_bank *bank);
+static int at91sam7_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
 
-static uint32_t at91sam7_get_flash_status(target_t *target, int bank_number);
-static void at91sam7_set_flash_mode(flash_bank_t *bank, int mode);
-static uint32_t at91sam7_wait_status_busy(flash_bank_t *bank, uint32_t waitbits, int timeout);
-static int at91sam7_flash_command(struct flash_bank_s *bank, uint8_t cmd, uint16_t pagen);
+static uint32_t at91sam7_get_flash_status(struct target *target, int bank_number);
+static void at91sam7_set_flash_mode(struct flash_bank *bank, int mode);
+static uint32_t at91sam7_wait_status_busy(struct flash_bank *bank, uint32_t waitbits, int timeout);
+static int at91sam7_flash_command(struct flash_bank *bank, uint8_t cmd, uint16_t pagen);
 
 static uint32_t MC_FMR[4] = { 0xFFFFFF60, 0xFFFFFF70, 0xFFFFFF80, 0xFFFFFF90 };
 static uint32_t MC_FCR[4] = { 0xFFFFFF64, 0xFFFFFF74, 0xFFFFFF84, 0xFFFFFF94 };
@@ -88,7 +88,7 @@ static long SRAMSIZ[16] = {
 #endif
 
 
-static uint32_t at91sam7_get_flash_status(target_t *target, int bank_number)
+static uint32_t at91sam7_get_flash_status(struct target *target, int bank_number)
 {
 	uint32_t fsr;
 	target_read_u32(target, MC_FSR[bank_number], &fsr);
@@ -97,10 +97,10 @@ static uint32_t at91sam7_get_flash_status(target_t *target, int bank_number)
 }
 
 /* Read clock configuration and set at91sam7_info->mck_freq */
-static void at91sam7_read_clock_info(flash_bank_t *bank)
+static void at91sam7_read_clock_info(struct flash_bank *bank)
 {
 	struct at91sam7_flash_bank *at91sam7_info = bank->driver_priv;
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint32_t mckr, mcfr, pllr, mor;
 	unsigned long tmp = 0, mainfreq;
 
@@ -176,11 +176,11 @@ static void at91sam7_read_clock_info(flash_bank_t *bank)
 }
 
 /* Setup the timimg registers for nvbits or normal flash */
-static void at91sam7_set_flash_mode(flash_bank_t *bank, int mode)
+static void at91sam7_set_flash_mode(struct flash_bank *bank, int mode)
 {
 	uint32_t fmr, fmcn = 0, fws = 0;
 	struct at91sam7_flash_bank *at91sam7_info = bank->driver_priv;
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 
 	if (mode && (mode != at91sam7_info->flashmode))
 	{
@@ -224,7 +224,7 @@ static void at91sam7_set_flash_mode(flash_bank_t *bank, int mode)
 	at91sam7_info->flashmode = mode;
 }
 
-static uint32_t at91sam7_wait_status_busy(flash_bank_t *bank, uint32_t waitbits, int timeout)
+static uint32_t at91sam7_wait_status_busy(struct flash_bank *bank, uint32_t waitbits, int timeout)
 {
 	uint32_t status;
 
@@ -251,11 +251,11 @@ static uint32_t at91sam7_wait_status_busy(flash_bank_t *bank, uint32_t waitbits,
 }
 
 /* Send one command to the AT91SAM flash controller */
-static int at91sam7_flash_command(struct flash_bank_s *bank, uint8_t cmd, uint16_t pagen)
+static int at91sam7_flash_command(struct flash_bank *bank, uint8_t cmd, uint16_t pagen)
 {
 	uint32_t fcr;
 	struct at91sam7_flash_bank *at91sam7_info = bank->driver_priv;
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 
 	fcr = (0x5A << 24) | ((pagen&0x3FF) << 8) | cmd;
 	target_write_u32(target, MC_FCR[bank->bank_number], fcr);
@@ -280,11 +280,11 @@ static int at91sam7_flash_command(struct flash_bank_s *bank, uint8_t cmd, uint16
 }
 
 /* Read device id register, main clock frequency register and fill in driver info structure */
-static int at91sam7_read_part_info(struct flash_bank_s *bank)
+static int at91sam7_read_part_info(struct flash_bank *bank)
 {
-	flash_bank_t *t_bank = bank;
+	struct flash_bank *t_bank = bank;
 	struct at91sam7_flash_bank *at91sam7_info;
-	target_t *target = t_bank->target;
+	struct target *target = t_bank->target;
 
 	uint16_t bnk, sec;
 	uint16_t arch;
@@ -304,7 +304,7 @@ static int at91sam7_read_part_info(struct flash_bank_s *bank)
 	if (at91sam7_info->cidr != 0)
 	{
 		/* flash already configured, update clock and check for protected sectors */
-		flash_bank_t *fb = bank;
+		struct flash_bank *fb = bank;
 		t_bank = fb;
 
 		while (t_bank)
@@ -336,7 +336,7 @@ static int at91sam7_read_part_info(struct flash_bank_s *bank)
 	if (at91sam7_info->flash_autodetection == 0)
 	{
 		/* banks and sectors are already created, based on data from input file */
-		flash_bank_t *fb = bank;
+		struct flash_bank *fb = bank;
 		t_bank = fb;
 		while (t_bank)
 		{
@@ -532,7 +532,7 @@ static int at91sam7_read_part_info(struct flash_bank_s *bank)
 		if (bnk > 0)
 		{
 			/* create a new flash bank element */
-			flash_bank_t *fb = malloc(sizeof(flash_bank_t));
+			struct flash_bank *fb = malloc(sizeof(struct flash_bank));
 			fb->target = target;
 			fb->driver = bank->driver;
 			fb->driver_priv = malloc(sizeof(struct at91sam7_flash_bank));
@@ -551,7 +551,7 @@ static int at91sam7_read_part_info(struct flash_bank_s *bank)
 		t_bank->num_sectors = sectors_num;
 
 		/* allocate sectors */
-		t_bank->sectors = malloc(sectors_num * sizeof(flash_sector_t));
+		t_bank->sectors = malloc(sectors_num * sizeof(struct flash_sector));
 		for (sec = 0; sec < sectors_num; sec++)
 		{
 			t_bank->sectors[sec].offset = sec * pages_per_sector * page_size;
@@ -595,9 +595,9 @@ static int at91sam7_read_part_info(struct flash_bank_s *bank)
 	return ERROR_OK;
 }
 
-static int at91sam7_erase_check(struct flash_bank_s *bank)
+static int at91sam7_erase_check(struct flash_bank *bank)
 {
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint16_t retval;
 	uint32_t blank;
 	uint16_t fast_check;
@@ -661,7 +661,7 @@ static int at91sam7_erase_check(struct flash_bank_s *bank)
 	return ERROR_OK;
 }
 
-static int at91sam7_protect_check(struct flash_bank_s *bank)
+static int at91sam7_protect_check(struct flash_bank *bank)
 {
 	uint8_t lock_pos, gpnvm_pos;
 	uint32_t status;
@@ -713,9 +713,9 @@ static int at91sam7_protect_check(struct flash_bank_s *bank)
 
 FLASH_BANK_COMMAND_HANDLER(at91sam7_flash_bank_command)
 {
-	flash_bank_t *t_bank = bank;
+	struct flash_bank *t_bank = bank;
 	struct at91sam7_flash_bank *at91sam7_info;
-	target_t *target = t_bank->target;
+	struct target *target = t_bank->target;
 
 	uint32_t base_address;
 	uint32_t bank_size;
@@ -785,7 +785,7 @@ FLASH_BANK_COMMAND_HANDLER(at91sam7_flash_bank_command)
 		if (bnk > 0)
 		{
 			/* create a new bank element */
-			flash_bank_t *fb = malloc(sizeof(flash_bank_t));
+			struct flash_bank *fb = malloc(sizeof(struct flash_bank));
 			fb->target = target;
 			fb->driver = bank->driver;
 			fb->driver_priv = malloc(sizeof(struct at91sam7_flash_bank));
@@ -804,7 +804,7 @@ FLASH_BANK_COMMAND_HANDLER(at91sam7_flash_bank_command)
 		t_bank->num_sectors = num_sectors;
 
 		/* allocate sectors */
-		t_bank->sectors = malloc(num_sectors * sizeof(flash_sector_t));
+		t_bank->sectors = malloc(num_sectors * sizeof(struct flash_sector));
 		for (sec = 0; sec < num_sectors; sec++)
 		{
 			t_bank->sectors[sec].offset = sec * pages_per_sector * page_size;
@@ -827,7 +827,7 @@ FLASH_BANK_COMMAND_HANDLER(at91sam7_flash_bank_command)
 	return ERROR_OK;
 }
 
-static int at91sam7_erase(struct flash_bank_s *bank, int first, int last)
+static int at91sam7_erase(struct flash_bank *bank, int first, int last)
 {
 	struct at91sam7_flash_bank *at91sam7_info = bank->driver_priv;
 	int sec;
@@ -895,7 +895,7 @@ static int at91sam7_erase(struct flash_bank_s *bank, int first, int last)
 	return ERROR_OK;
 }
 
-static int at91sam7_protect(struct flash_bank_s *bank, int set, int first, int last)
+static int at91sam7_protect(struct flash_bank *bank, int set, int first, int last)
 {
 	uint32_t cmd;
 	int sector;
@@ -945,11 +945,11 @@ static int at91sam7_protect(struct flash_bank_s *bank, int set, int first, int l
 	return ERROR_OK;
 }
 
-static int at91sam7_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int at91sam7_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
 	int retval;
 	struct at91sam7_flash_bank *at91sam7_info = bank->driver_priv;
-	target_t *target = bank->target;
+	struct target *target = bank->target;
 	uint32_t dst_min_alignment, wcount, bytes_remaining = count;
 	uint32_t first_page, last_page, pagen, buffer_pos;
 
@@ -979,7 +979,7 @@ static int at91sam7_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t o
 		return ERROR_FLASH_BANK_NOT_PROBED;
 
 	first_page = offset/dst_min_alignment;
-	last_page = CEIL(offset + count, dst_min_alignment);
+	last_page = DIV_ROUND_UP(offset + count, dst_min_alignment);
 
 	LOG_DEBUG("first_page: %i, last_page: %i, count %i", (int)first_page, (int)last_page, (int)count);
 
@@ -997,7 +997,7 @@ static int at91sam7_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t o
 
 		/* Write one block to the PageWriteBuffer */
 		buffer_pos = (pagen-first_page)*dst_min_alignment;
-		wcount = CEIL(count,4);
+		wcount = DIV_ROUND_UP(count,4);
 		if ((retval = target_write_memory(target, bank->base + pagen*dst_min_alignment, 4, wcount, buffer + buffer_pos)) != ERROR_OK)
 		{
 			return retval;
@@ -1014,7 +1014,7 @@ static int at91sam7_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t o
 	return ERROR_OK;
 }
 
-static int at91sam7_probe(struct flash_bank_s *bank)
+static int at91sam7_probe(struct flash_bank *bank)
 {
 	/* we can't probe on an at91sam7
 	 * if this is an at91sam7, it has the configured flash */
@@ -1033,7 +1033,7 @@ static int at91sam7_probe(struct flash_bank_s *bank)
 	return ERROR_OK;
 }
 
-static int at91sam7_info(struct flash_bank_s *bank, char *buf, int buf_size)
+static int at91sam7_info(struct flash_bank *bank, char *buf, int buf_size)
 {
 	int printed;
 	struct at91sam7_flash_bank *at91sam7_info = bank->driver_priv;
@@ -1100,7 +1100,7 @@ static int at91sam7_info(struct flash_bank_s *bank, char *buf, int buf_size)
 */
 COMMAND_HANDLER(at91sam7_handle_gpnvm_command)
 {
-	flash_bank_t *bank;
+	struct flash_bank *bank;
 	int bit;
 	uint8_t  flashcmd;
 	uint32_t status;
@@ -1178,9 +1178,9 @@ COMMAND_HANDLER(at91sam7_handle_gpnvm_command)
 	return ERROR_OK;
 }
 
-static int at91sam7_register_commands(struct command_context_s *cmd_ctx)
+static int at91sam7_register_commands(struct command_context *cmd_ctx)
 {
-	command_t *at91sam7_cmd = register_command(cmd_ctx, NULL, "at91sam7",
+	struct command *at91sam7_cmd = register_command(cmd_ctx, NULL, "at91sam7",
 			NULL, COMMAND_ANY, NULL);
 
 	register_command(cmd_ctx, at91sam7_cmd, "gpnvm",
@@ -1191,7 +1191,7 @@ static int at91sam7_register_commands(struct command_context_s *cmd_ctx)
 	return ERROR_OK;
 }
 
-flash_driver_t at91sam7_flash = {
+struct flash_driver at91sam7_flash = {
 		.name = "at91sam7",
 		.register_commands = &at91sam7_register_commands,
 		.flash_bank_command = &at91sam7_flash_bank_command,