Remove whitespace that occurs after '('.
[fw/openocd] / src / flash / at91sam7.c
index 8bb572f94670048ffb5dca1303012b90f43a7739..6ac795b079ec30ec3593127a7d10bba006c90718 100644 (file)
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "at91sam7.h"
-
-#include "flash.h"
-#include "target.h"
-#include "log.h"
 #include "binarybuffer.h"
-#include "types.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 static int at91sam7_register_commands(struct command_context_s *cmd_ctx);
 static int at91sam7_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
 static int at91sam7_erase(struct flash_bank_s *bank, int first, int last);
 static int at91sam7_protect(struct flash_bank_s *bank, int set, int first, int last);
-static int at91sam7_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count);
+static int at91sam7_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
 static int at91sam7_probe(struct flash_bank_s *bank);
 //static int at91sam7_auto_probe(struct flash_bank_s *bank);
 static int at91sam7_erase_check(struct flash_bank_s *bank);
 static int at91sam7_protect_check(struct flash_bank_s *bank);
 static int at91sam7_info(struct flash_bank_s *bank, char *buf, int buf_size);
 
-static u32 at91sam7_get_flash_status(target_t *target, int bank_number);
+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 u32 at91sam7_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeout);
-static int at91sam7_flash_command(struct flash_bank_s *bank, u8 cmd, u16 pagen); 
+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 int at91sam7_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 
 flash_driver_t at91sam7_flash =
 {
-       .name = "at91sam7_new",
+       .name = "at91sam7",
        .register_commands = at91sam7_register_commands,
        .flash_bank_command = at91sam7_flash_bank_command,
        .erase = at91sam7_erase,
@@ -85,9 +75,9 @@ flash_driver_t at91sam7_flash =
        .info = at91sam7_info
 };
 
-static u32 MC_FMR[4] = { 0xFFFFFF60, 0xFFFFFF70, 0xFFFFFF80, 0xFFFFFF90 };
-static u32 MC_FCR[4] = { 0xFFFFFF64, 0xFFFFFF74, 0xFFFFFF84, 0xFFFFFF94 };
-static u32 MC_FSR[4] = { 0xFFFFFF68, 0xFFFFFF78, 0xFFFFFF88, 0xFFFFFF98 };
+static uint32_t MC_FMR[4] = { 0xFFFFFF60, 0xFFFFFF70, 0xFFFFFF80, 0xFFFFFF90 };
+static uint32_t MC_FCR[4] = { 0xFFFFFF64, 0xFFFFFF74, 0xFFFFFF84, 0xFFFFFF94 };
+static uint32_t MC_FSR[4] = { 0xFFFFFF68, 0xFFFFFF78, 0xFFFFFF88, 0xFFFFFF98 };
 
 static char * EPROC[8]= {"Unknown","ARM946-E","ARM7TDMI","Unknown","ARM920T","ARM926EJ-S","Unknown","Unknown"};
 
@@ -114,16 +104,16 @@ static long SRAMSIZ[16] = {
 
 static int at91sam7_register_commands(struct command_context_s *cmd_ctx)
 {
-       command_t *at91sam7_cmd = register_command(cmd_ctx, NULL, "at91sam7_new", NULL, COMMAND_ANY, NULL);
+       command_t *at91sam7_cmd = register_command(cmd_ctx, NULL, "at91sam7", NULL, COMMAND_ANY, NULL);
 
        register_command(cmd_ctx, at91sam7_cmd, "gpnvm", at91sam7_handle_gpnvm_command, COMMAND_EXEC,
-                                       "at91sam7 gpnvm <bit> set|clear, set or clear one gpnvm bit");
+                                       "at91sam7 gpnvm <bit> set | clear, set or clear one gpnvm bit");
        return ERROR_OK;
 }
 
-static u32 at91sam7_get_flash_status(target_t *target, int bank_number)
+static uint32_t at91sam7_get_flash_status(target_t *target, int bank_number)
 {
-       u32 fsr;
+       uint32_t fsr;
        target_read_u32(target, MC_FSR[bank_number], &fsr);
 
        return fsr;
@@ -134,7 +124,7 @@ static void at91sam7_read_clock_info(flash_bank_t *bank)
 {
        at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv;
        target_t *target = bank->target;
-       u32 mckr, mcfr, pllr, mor;
+       uint32_t mckr, mcfr, pllr, mor;
        unsigned long tmp = 0, mainfreq;
 
        /* Read Clock Generator Main Oscillator Register */
@@ -197,7 +187,7 @@ static void at91sam7_read_clock_info(flash_bank_t *bank)
        }
 
        /* Prescaler adjust */
-       if ( (((mckr & PMC_MCKR_PRES) >> 2) == 7) || (tmp == 0) )
+       if ((((mckr & PMC_MCKR_PRES) >> 2) == 7) || (tmp == 0) )
        {
                at91sam7_info->mck_valid = 0;
                at91sam7_info->mck_freq = 0;
@@ -211,7 +201,7 @@ 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)
 {
-       u32 fmr, fmcn = 0, fws = 0;
+       uint32_t fmr, fmcn = 0, fws = 0;
        at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv;
        target_t *target = bank->target;
 
@@ -223,33 +213,33 @@ static void at91sam7_set_flash_mode(flash_bank_t *bank, int mode)
                        if (at91sam7_info->cidr_arch == 0x60)
                        {
                                /* AT91SAM7A3 uses master clocks in 100 ns */
-                               fmcn = (at91sam7_info->mck_freq/10000000ul)+1;
+                               fmcn = (at91sam7_info->mck_freq/10000000ul) + 1;
                        }
                        else
                        {
                                /* master clocks in 1uS for ARCH 0x7 types */
-                               fmcn = (at91sam7_info->mck_freq/1000000ul)+1;
+                               fmcn = (at91sam7_info->mck_freq/1000000ul) + 1;
                        }
                }
                else if (mode == FMR_TIMING_FLASH)
                {
                        /* main clocks in 1.5uS */
                        fmcn = (at91sam7_info->mck_freq/1000000ul)+
-                               (at91sam7_info->mck_freq/2000000ul)+1;
+                               (at91sam7_info->mck_freq/2000000ul) + 1;
                }
 
                /* hard overclocking */
                if (fmcn > 0xFF)
                        fmcn = 0xFF;
 
-               /* Only allow fmcn=0 if clock period is > 30 us = 33kHz. */
+               /* Only allow fmcn = 0 if clock period is > 30 us = 33kHz. */
                if (at91sam7_info->mck_freq <= 33333ul)
                        fmcn = 0;
-               /* Only allow fws=0 if clock frequency is < 30 MHz. */
+               /* Only allow fws = 0 if clock frequency is < 30 MHz. */
                if (at91sam7_info->mck_freq > 30000000ul)
                        fws = 1;
 
-               LOG_DEBUG("fmcn[%i]: %i", bank->bank_number, fmcn);
+               LOG_DEBUG("fmcn[%i]: %i", bank->bank_number, (int)(fmcn));
                fmr = fmcn << 16 | fws << 8;
                target_write_u32(target, MC_FMR[bank->bank_number], fmr);
        }
@@ -257,21 +247,21 @@ static void at91sam7_set_flash_mode(flash_bank_t *bank, int mode)
        at91sam7_info->flashmode = mode;
 }
 
-static u32 at91sam7_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeout)
+static uint32_t at91sam7_wait_status_busy(flash_bank_t *bank, uint32_t waitbits, int timeout)
 {
-       u32 status;
+       uint32_t status;
 
        while ((!((status = at91sam7_get_flash_status(bank->target, bank->bank_number)) & waitbits)) && (timeout-- > 0))
        {
-               LOG_DEBUG("status[%i]: 0x%x", bank->bank_number, status);
+               LOG_DEBUG("status[%i]: 0x%" PRIx32 "", (int)bank->bank_number, status);
                alive_sleep(1);
        }
 
-       LOG_DEBUG("status[%i]: 0x%x", bank->bank_number, status);
+       LOG_DEBUG("status[%i]: 0x%" PRIx32 "", bank->bank_number, status);
 
        if (status & 0x0C)
        {
-               LOG_ERROR("status register: 0x%x", status);
+               LOG_ERROR("status register: 0x%" PRIx32 "", status);
                if (status & 0x4)
                        LOG_ERROR("Lock Error Bit Detected, Operation Abort");
                if (status & 0x8)
@@ -284,17 +274,17 @@ static u32 at91sam7_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeo
 }
 
 /* Send one command to the AT91SAM flash controller */
-static int at91sam7_flash_command(struct flash_bank_s *bank, u8 cmd, u16 pagen)
+static int at91sam7_flash_command(struct flash_bank_s *bank, uint8_t cmd, uint16_t pagen)
 {
-       u32 fcr;
+       uint32_t fcr;
        at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv;
        target_t *target = bank->target;
 
-       fcr = (0x5A<<24) | ((pagen&0x3FF)<<8) | cmd; 
+       fcr = (0x5A << 24) | ((pagen&0x3FF) << 8) | cmd; 
        target_write_u32(target, MC_FCR[bank->bank_number], fcr);
-       LOG_DEBUG("Flash command: 0x%x, flash bank: %i, page number: %u", fcr, bank->bank_number+1, pagen);
+       LOG_DEBUG("Flash command: 0x%" PRIx32 ", flash bank: %i, page number: %u", fcr, bank->bank_number + 1, pagen);
 
-       if ((at91sam7_info->cidr_arch == 0x60)&&((cmd==SLB)|(cmd==CLB)))
+       if ((at91sam7_info->cidr_arch == 0x60) && ((cmd == SLB) | (cmd == CLB)))
        {
                /* Lock bit manipulation on AT91SAM7A3 waits for FC_FSR bit 1, EOL */
                if (at91sam7_wait_status_busy(bank, MC_FSR_EOL, 10)&0x0C)
@@ -319,17 +309,17 @@ static int at91sam7_read_part_info(struct flash_bank_s *bank)
        at91sam7_flash_bank_t *at91sam7_info;
        target_t *target = t_bank->target;
 
-       u16 bnk, sec;
-       u16 arch;
-       u32 cidr;
-       u8 banks_num = 0;
-       u16 num_nvmbits = 0;
-       u16 sectors_num = 0;
-       u16 pages_per_sector = 0;
-       u16 page_size = 0;
-       u32 ext_freq;
-       u32 bank_size;
-       u32 base_address = 0;
+       uint16_t bnk, sec;
+       uint16_t arch;
+       uint32_t cidr;
+       uint8_t banks_num = 0;
+       uint16_t num_nvmbits = 0;
+       uint16_t sectors_num = 0;
+       uint16_t pages_per_sector = 0;
+       uint16_t page_size = 0;
+       uint32_t ext_freq;
+       uint32_t bank_size;
+       uint32_t base_address = 0;
        char *target_name = "Unknown";
 
        at91sam7_info = t_bank->driver_priv;
@@ -376,13 +366,13 @@ static int at91sam7_read_part_info(struct flash_bank_s *bank)
                        at91sam7_info = t_bank->driver_priv;
 
                        at91sam7_info->cidr = cidr;
-                       at91sam7_info->cidr_ext = (cidr>>31)&0x0001;
-                       at91sam7_info->cidr_nvptyp = (cidr>>28)&0x0007;
-                       at91sam7_info->cidr_arch = (cidr>>20)&0x00FF;
-                       at91sam7_info->cidr_sramsiz = (cidr>>16)&0x000F;
-                       at91sam7_info->cidr_nvpsiz2 = (cidr>>12)&0x000F;
-                       at91sam7_info->cidr_nvpsiz = (cidr>>8)&0x000F;
-                       at91sam7_info->cidr_eproc = (cidr>>5)&0x0007;
+                       at91sam7_info->cidr_ext = (cidr >> 31)&0x0001;
+                       at91sam7_info->cidr_nvptyp = (cidr >> 28)&0x0007;
+                       at91sam7_info->cidr_arch = (cidr >> 20)&0x00FF;
+                       at91sam7_info->cidr_sramsiz = (cidr >> 16)&0x000F;
+                       at91sam7_info->cidr_nvpsiz2 = (cidr >> 12)&0x000F;
+                       at91sam7_info->cidr_nvpsiz = (cidr >> 8)&0x000F;
+                       at91sam7_info->cidr_eproc = (cidr >> 5)&0x0007;
                        at91sam7_info->cidr_version = cidr&0x001F;
 
                        /* calculate master clock frequency */
@@ -401,10 +391,10 @@ static int at91sam7_read_part_info(struct flash_bank_s *bank)
                return ERROR_OK;
        }
 
-       arch = (cidr>>20)&0x00FF;
+       arch = (cidr >> 20)&0x00FF;
 
        /* check flash size */
-       switch ((cidr>>8)&0x000F)
+       switch ((cidr >> 8)&0x000F)
        {
                case FLASH_SIZE_8KB:
                        break;
@@ -560,7 +550,7 @@ static int at91sam7_read_part_info(struct flash_bank_s *bank)
        /* calculate bank size  */
        bank_size = sectors_num * pages_per_sector * page_size;
 
-       for (bnk=0; bnk<banks_num; bnk++)
+       for (bnk = 0; bnk < banks_num; bnk++)
        {
                if (bnk > 0)
                {
@@ -585,7 +575,7 @@ static int at91sam7_read_part_info(struct flash_bank_s *bank)
 
                /* allocate sectors */
                t_bank->sectors = malloc(sectors_num * sizeof(flash_sector_t));
-               for (sec=0; sec<sectors_num; sec++)
+               for (sec = 0; sec < sectors_num; sec++)
                {
                        t_bank->sectors[sec].offset = sec * pages_per_sector * page_size;
                        t_bank->sectors[sec].size = pages_per_sector * page_size;
@@ -596,13 +586,13 @@ static int at91sam7_read_part_info(struct flash_bank_s *bank)
                at91sam7_info = t_bank->driver_priv;
 
                at91sam7_info->cidr = cidr;
-               at91sam7_info->cidr_ext = (cidr>>31)&0x0001;
-               at91sam7_info->cidr_nvptyp = (cidr>>28)&0x0007;
-               at91sam7_info->cidr_arch = (cidr>>20)&0x00FF;
-               at91sam7_info->cidr_sramsiz = (cidr>>16)&0x000F;
-               at91sam7_info->cidr_nvpsiz2 = (cidr>>12)&0x000F;
-               at91sam7_info->cidr_nvpsiz = (cidr>>8)&0x000F;
-               at91sam7_info->cidr_eproc = (cidr>>5)&0x0007;
+               at91sam7_info->cidr_ext = (cidr >> 31)&0x0001;
+               at91sam7_info->cidr_nvptyp = (cidr >> 28)&0x0007;
+               at91sam7_info->cidr_arch = (cidr >> 20)&0x00FF;
+               at91sam7_info->cidr_sramsiz = (cidr >> 16)&0x000F;
+               at91sam7_info->cidr_nvpsiz2 = (cidr >> 12)&0x000F;
+               at91sam7_info->cidr_nvpsiz = (cidr >> 8)&0x000F;
+               at91sam7_info->cidr_eproc = (cidr >> 5)&0x0007;
                at91sam7_info->cidr_version = cidr&0x001F;
 
                at91sam7_info->target_name  = target_name;
@@ -631,12 +621,12 @@ static int at91sam7_read_part_info(struct flash_bank_s *bank)
 static int at91sam7_erase_check(struct flash_bank_s *bank)
 {
        target_t *target = bank->target;
-       u16 retval;
-       u32 blank;
-       u16 fast_check;
-       u8 *buffer;
-       u16 nSector;
-       u16 nByte;
+       uint16_t retval;
+       uint32_t blank;
+       uint16_t fast_check;
+       uint8_t *buffer;
+       uint16_t nSector;
+       uint16_t nByte;
 
        if (bank->target->state != TARGET_HALTED)
        {
@@ -649,9 +639,9 @@ static int at91sam7_erase_check(struct flash_bank_s *bank)
        at91sam7_set_flash_mode(bank, FMR_TIMING_FLASH);
 
        fast_check = 1;
-       for (nSector=0; nSector<bank->num_sectors; nSector++)
+       for (nSector = 0; nSector < bank->num_sectors; nSector++)
        {
-               retval = target_blank_check_memory(target, bank->base+bank->sectors[nSector].offset,
+               retval = target_blank_check_memory(target, bank->base + bank->sectors[nSector].offset,
                        bank->sectors[nSector].size, &blank);
                if (retval != ERROR_OK)
                {
@@ -672,15 +662,15 @@ static int at91sam7_erase_check(struct flash_bank_s *bank)
        LOG_USER("Running slow fallback erase check - add working memory");
 
        buffer = malloc(bank->sectors[0].size);
-       for (nSector=0; nSector<bank->num_sectors; nSector++)
+       for (nSector = 0; nSector < bank->num_sectors; nSector++)
        {
                bank->sectors[nSector].is_erased = 1;
-               retval = target->type->read_memory(target, bank->base+bank->sectors[nSector].offset, 4,
+               retval = target_read_memory(target, bank->base + bank->sectors[nSector].offset, 4,
                        bank->sectors[nSector].size/4, buffer);
                if (retval != ERROR_OK)
                        return retval;
 
-               for (nByte=0; nByte<bank->sectors[nSector].size; nByte++)
+               for (nByte = 0; nByte < bank->sectors[nSector].size; nByte++)
                {
                        if (buffer[nByte] != 0xFF)
                        {
@@ -696,8 +686,8 @@ static int at91sam7_erase_check(struct flash_bank_s *bank)
 
 static int at91sam7_protect_check(struct flash_bank_s *bank)
 {
-       u8 lock_pos, gpnvm_pos;
-       u32 status;
+       uint8_t lock_pos, gpnvm_pos;
+       uint32_t status;
 
        at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv;
 
@@ -712,12 +702,12 @@ static int at91sam7_protect_check(struct flash_bank_s *bank)
        }
 
        status = at91sam7_get_flash_status(bank->target, bank->bank_number);
-       at91sam7_info->lockbits = (status>>16);
+       at91sam7_info->lockbits = (status >> 16);
 
        at91sam7_info->num_lockbits_on = 0;
-       for (lock_pos=0; lock_pos<bank->num_sectors; lock_pos++)
+       for (lock_pos = 0; lock_pos < bank->num_sectors; lock_pos++)
        {
-               if ( ((status>>(16+lock_pos))&(0x0001)) == 1)
+               if (((status >> (16 + lock_pos))&(0x0001)) == 1)
                {
                        at91sam7_info->num_lockbits_on++;
                        bank->sectors[lock_pos].is_protected = 1;
@@ -729,13 +719,13 @@ static int at91sam7_protect_check(struct flash_bank_s *bank)
        /* GPNVM and SECURITY bits apply only for MC_FSR of EFC0 */
        status = at91sam7_get_flash_status(bank->target, 0);
 
-       at91sam7_info->securitybit = (status>>4)&0x01;
-       at91sam7_info->nvmbits = (status>>8)&0xFF;
+       at91sam7_info->securitybit = (status >> 4)&0x01;
+       at91sam7_info->nvmbits = (status >> 8)&0xFF;
 
        at91sam7_info->num_nvmbits_on = 0;
-       for (gpnvm_pos=0; gpnvm_pos<at91sam7_info->num_nvmbits; gpnvm_pos++)
+       for (gpnvm_pos = 0; gpnvm_pos < at91sam7_info->num_nvmbits; gpnvm_pos++)
        {
-               if ( ((status>>(8+gpnvm_pos))&(0x01)) == 1)
+               if (((status >> (8 + gpnvm_pos))&(0x01)) == 1)
                {
                        at91sam7_info->num_nvmbits_on++;
                }
@@ -760,18 +750,18 @@ static int at91sam7_flash_bank_command(struct command_context_s *cmd_ctx, char *
        at91sam7_flash_bank_t *at91sam7_info;
        target_t *target = t_bank->target;
 
-       u32 base_address;
-       u32 bank_size;
-       u32 ext_freq;
+       uint32_t base_address;
+       uint32_t bank_size;
+       uint32_t ext_freq;
 
        int chip_width;
        int bus_width;
        int banks_num;
        int num_sectors;
 
-       u16 pages_per_sector;
-       u16 page_size;
-       u16 num_nvmbits;
+       uint16_t pages_per_sector;
+       uint16_t page_size;
+       uint16_t num_nvmbits;
 
        char *target_name;
 
@@ -813,13 +803,13 @@ static int at91sam7_flash_bank_command(struct command_context_s *cmd_ctx, char *
        page_size = atoi(args[11]);
        num_nvmbits = atoi(args[12]);
 
-       target_name = calloc(strlen(args[7])+1, sizeof(char));
+       target_name = calloc(strlen(args[7]) + 1, sizeof(char));
        strcpy(target_name, args[7]);
 
        /* calculate bank size  */
        bank_size = num_sectors * pages_per_sector * page_size;
 
-       for (bnk=0; bnk<banks_num; bnk++)
+       for (bnk = 0; bnk < banks_num; bnk++)
        {
                if (bnk > 0)
                {
@@ -844,7 +834,7 @@ static int at91sam7_flash_bank_command(struct command_context_s *cmd_ctx, char *
 
                /* allocate sectors */
                t_bank->sectors = malloc(num_sectors * sizeof(flash_sector_t));
-               for (sec=0; sec<num_sectors; sec++)
+               for (sec = 0; sec < num_sectors; sec++)
                {
                        t_bank->sectors[sec].offset = sec * pages_per_sector * page_size;
                        t_bank->sectors[sec].size = pages_per_sector * page_size;
@@ -870,9 +860,9 @@ static int at91sam7_erase(struct flash_bank_s *bank, int first, int last)
 {
        at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv;
        int sec;
-       u32 nbytes, pos;
-       u8 *buffer;
-       u8 erase_all;
+       uint32_t nbytes, pos;
+       uint8_t *buffer;
+       uint8_t erase_all;
 
        if (at91sam7_info->cidr == 0)
        {
@@ -900,7 +890,7 @@ static int at91sam7_erase(struct flash_bank_s *bank, int first, int last)
        at91sam7_read_clock_info(bank);
        at91sam7_set_flash_mode(bank, FMR_TIMING_FLASH);
 
-       if(erase_all)
+       if (erase_all)
        {
                if (at91sam7_flash_command(bank, EA, 0) != ERROR_OK) 
                {
@@ -911,13 +901,13 @@ static int at91sam7_erase(struct flash_bank_s *bank, int first, int last)
        {
                /* allocate and clean buffer  */
                nbytes = (last - first + 1) * bank->sectors[first].size;
-               buffer = malloc(nbytes * sizeof(u8));
-               for (pos=0; pos<nbytes; pos++)
+               buffer = malloc(nbytes * sizeof(uint8_t));
+               for (pos = 0; pos < nbytes; pos++)
                {
                        buffer[pos] = 0xFF;
                }
 
-               if ( at91sam7_write(bank, buffer, bank->sectors[first].offset, nbytes) != ERROR_OK)
+               if (at91sam7_write(bank, buffer, bank->sectors[first].offset, nbytes) != ERROR_OK)
                {
                        return ERROR_FLASH_OPERATION_FAILED;
                }
@@ -926,7 +916,7 @@ static int at91sam7_erase(struct flash_bank_s *bank, int first, int last)
        }
 
        /* mark erased sectors */
-       for (sec=first; sec<=last; sec++)
+       for (sec = first; sec <= last; sec++)
        {
                bank->sectors[sec].is_erased = 1;
        }
@@ -936,9 +926,9 @@ static int at91sam7_erase(struct flash_bank_s *bank, int first, int last)
 
 static int at91sam7_protect(struct flash_bank_s *bank, int set, int first, int last)
 {
-       u32 cmd;
+       uint32_t cmd;
        int sector;
-       u32 pagen;
+       uint32_t pagen;
 
        at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv;
 
@@ -962,7 +952,7 @@ static int at91sam7_protect(struct flash_bank_s *bank, int set, int first, int l
        at91sam7_read_clock_info(bank);
        at91sam7_set_flash_mode(bank, FMR_TIMING_NVBITS);
 
-       for (sector=first; sector<=last; sector++)
+       for (sector = first; sector <= last; sector++)
        {
                if (set)
                        cmd = SLB;
@@ -984,13 +974,13 @@ 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, u8 *buffer, u32 offset, u32 count)
+static int at91sam7_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
        int retval;
        at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv;
        target_t *target = bank->target;
-       u32 dst_min_alignment, wcount, bytes_remaining = count;
-       u32 first_page, last_page, pagen, buffer_pos;
+       uint32_t dst_min_alignment, wcount, bytes_remaining = count;
+       uint32_t first_page, last_page, pagen, buffer_pos;
 
        if (at91sam7_info->cidr == 0)
        {
@@ -1010,7 +1000,7 @@ static int at91sam7_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
 
        if (offset % dst_min_alignment)
        {
-               LOG_WARNING("offset 0x%x breaks required alignment 0x%x", offset, dst_min_alignment);
+               LOG_WARNING("offset 0x%" PRIx32 " breaks required alignment 0x%" PRIx32 "", offset, dst_min_alignment);
                return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
        }
 
@@ -1020,15 +1010,15 @@ static int at91sam7_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
        first_page = offset/dst_min_alignment;
        last_page = CEIL(offset + count, dst_min_alignment);
 
-       LOG_DEBUG("first_page: %i, last_page: %i, count %i", first_page, last_page, count);
+       LOG_DEBUG("first_page: %i, last_page: %i, count %i", (int)first_page, (int)last_page, (int)count);
 
        /* Configure the flash controller timing */
        at91sam7_read_clock_info(bank);
        at91sam7_set_flash_mode(bank, FMR_TIMING_FLASH);
 
-       for (pagen=first_page; pagen<last_page; pagen++)
+       for (pagen = first_page; pagen < last_page; pagen++)
        {
-               if (bytes_remaining<dst_min_alignment)
+               if (bytes_remaining < dst_min_alignment)
                        count = bytes_remaining;
                else
                        count = dst_min_alignment;
@@ -1037,7 +1027,7 @@ static int at91sam7_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
                /* Write one block to the PageWriteBuffer */
                buffer_pos = (pagen-first_page)*dst_min_alignment;
                wcount = CEIL(count,4);
-               if((retval = target->type->write_memory(target, bank->base+pagen*dst_min_alignment, 4, wcount, buffer+buffer_pos)) != ERROR_OK)
+               if ((retval = target_write_memory(target, bank->base + pagen*dst_min_alignment, 4, wcount, buffer + buffer_pos)) != ERROR_OK)
                {
                        return retval;
                }
@@ -1047,7 +1037,7 @@ static int at91sam7_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
                {
                        return ERROR_FLASH_OPERATION_FAILED;
                }
-               LOG_DEBUG("Write flash bank:%i page number:%i", bank->bank_number, pagen);
+               LOG_DEBUG("Write flash bank:%i page number:%" PRIi32 "", bank->bank_number, pagen);
        }
 
        return ERROR_OK;
@@ -1089,17 +1079,21 @@ static int at91sam7_info(struct flash_bank_s *bank, char *buf, int buf_size)
        buf += printed;
        buf_size -= printed;
 
-       printed = snprintf(buf, buf_size,
-               " Cidr: 0x%8.8x | Arch: 0x%4.4x | Eproc: %s | Version: 0x%3.3x | Flashsize: 0x%8.8x\n",
-               at91sam7_info->cidr, at91sam7_info->cidr_arch, EPROC[at91sam7_info->cidr_eproc],
-               at91sam7_info->cidr_version, bank->size);
+       printed = snprintf(buf, 
+                          buf_size,
+                          " Cidr: 0x%8.8" PRIx32 " | Arch: 0x%4.4x | Eproc: %s | Version: 0x%3.3x | Flashsize: 0x%8.8" PRIx32 "\n",
+                          at91sam7_info->cidr, 
+                          at91sam7_info->cidr_arch, 
+                          EPROC[at91sam7_info->cidr_eproc],
+                          at91sam7_info->cidr_version, 
+                          bank->size);
 
        buf += printed;
        buf_size -= printed;
 
        printed = snprintf(buf, buf_size,
                " Master clock (estimated): %u KHz | External clock: %u KHz\n",
-               at91sam7_info->mck_freq / 1000, at91sam7_info->ext_freq / 1000);
+               (unsigned)(at91sam7_info->mck_freq / 1000), (unsigned)(at91sam7_info->ext_freq / 1000));
 
        buf += printed;
        buf_size -= printed;
@@ -1137,14 +1131,14 @@ static int at91sam7_handle_gpnvm_command(struct command_context_s *cmd_ctx, char
 {
        flash_bank_t *bank;
        int bit;
-       u8  flashcmd;
-       u32 status;
+       uint8_t  flashcmd;
+       uint32_t status;
        at91sam7_flash_bank_t *at91sam7_info;
        int retval;
 
        if (argc != 2)
        {
-               command_print(cmd_ctx, "at91sam7 gpnvm <bit> <set|clear>");
+               command_print(cmd_ctx, "at91sam7 gpnvm <bit> <set | clear>");
                return ERROR_OK;
        }
 
@@ -1205,7 +1199,7 @@ static int at91sam7_handle_gpnvm_command(struct command_context_s *cmd_ctx, char
 
        /* GPNVM and SECURITY bits apply only for MC_FSR of EFC0 */
        status = at91sam7_get_flash_status(bank->target, 0);
-       LOG_DEBUG("at91sam7_handle_gpnvm_command: cmd 0x%x, value 0x%x, status 0x%x \n", flashcmd, bit, status);
+       LOG_DEBUG("at91sam7_handle_gpnvm_command: cmd 0x%x, value %d, status 0x%" PRIx32 " \n", flashcmd, bit, status);
 
        /* check protect state */
        at91sam7_protect_check(bank);