- Replace 'while(' with 'while ('.

[fw/openocd] / src / flash / str7x.c

diff --git a/src/flash/str7x.c b/src/flash/str7x.c
index 88f4f9eb7f503a62e38a7504f4fc162b9c713b4d..13b22be54f1f222861bc70ec6086fc3f487bfe7e 100644 (file)
--- a/src/flash/str7x.c
+++ b/src/flash/str7x.c
@@ -49,7 +49,7 @@ static int str7x_register_commands(struct command_context_s *cmd_ctx);
 static int str7x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
 static int str7x_erase(struct flash_bank_s *bank, int first, int last);
 static int str7x_protect(struct flash_bank_s *bank, int set, int first, int last);
-static int str7x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count);
+static int str7x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
 static int str7x_probe(struct flash_bank_s *bank);
 //static int str7x_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 static int str7x_protect_check(struct flash_bank_s *bank);
@@ -82,7 +82,7 @@ static int str7x_register_commands(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
-static int str7x_get_flash_adr(struct flash_bank_s *bank, u32 reg)
+static int str7x_get_flash_adr(struct flash_bank_s *bank, uint32_t reg)
 {
        str7x_flash_bank_t *str7x_info = bank->driver_priv;
        return (str7x_info->register_base | reg);
@@ -119,7 +119,7 @@ static int str7x_build_block_list(struct flash_bank_s *bank)
        
        bank->num_sectors = num_sectors;
        bank->sectors = malloc(sizeof(flash_sector_t) * num_sectors);
-       str7x_info->sector_bits = malloc(sizeof(u32) * num_sectors);
+       str7x_info->sector_bits = malloc(sizeof(uint32_t) * num_sectors);
        
        num_sectors = 0;
        
@@ -191,20 +191,20 @@ static int str7x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd
        return ERROR_OK;
 }
 
-static u32 str7x_status(struct flash_bank_s *bank)
+static uint32_t str7x_status(struct flash_bank_s *bank)
 {
        target_t *target = bank->target;
-       u32 retval;
+       uint32_t retval;
 
        target_read_u32(target, str7x_get_flash_adr(bank, FLASH_CR0), &retval);
 
        return retval;
 }
 
-static u32 str7x_result(struct flash_bank_s *bank)
+static uint32_t str7x_result(struct flash_bank_s *bank)
 {
        target_t *target = bank->target;
-       u32 retval;
+       uint32_t retval;
 
        target_read_u32(target, str7x_get_flash_adr(bank, FLASH_ER), &retval);
        
@@ -217,7 +217,7 @@ static int str7x_protect_check(struct flash_bank_s *bank)
        target_t *target = bank->target;
        
        int i;
-       u32 retval;
+       uint32_t retval;
 
        if (bank->target->state != TARGET_HALTED)
        {
@@ -244,9 +244,9 @@ static int str7x_erase(struct flash_bank_s *bank, int first, int last)
        target_t *target = bank->target;
        
        int i;
-       u32 cmd;
-       u32 retval;
-       u32 sectors = 0;
+       uint32_t cmd;
+       uint32_t retval;
+       uint32_t sectors = 0;
        
        if (bank->target->state != TARGET_HALTED)
        {
@@ -259,7 +259,7 @@ static int str7x_erase(struct flash_bank_s *bank, int first, int last)
                sectors |= str7x_info->sector_bits[i];
        }
        
-       LOG_DEBUG("sectors: 0x%x", sectors);
+       LOG_DEBUG("sectors: 0x%" PRIx32 "", sectors);
        
        /* clear FLASH_ER register */   
        target_write_u32(target, str7x_get_flash_adr(bank, FLASH_ER), 0x0);
@@ -281,7 +281,7 @@ static int str7x_erase(struct flash_bank_s *bank, int first, int last)
        
        if (retval)
        {
-               LOG_ERROR("error erasing flash bank, FLASH_ER: 0x%x", retval);
+               LOG_ERROR("error erasing flash bank, FLASH_ER: 0x%" PRIx32 "", retval);
                return ERROR_FLASH_OPERATION_FAILED;
        }
        
@@ -296,9 +296,9 @@ static int str7x_protect(struct flash_bank_s *bank, int set, int first, int last
        str7x_flash_bank_t *str7x_info = bank->driver_priv;
        target_t *target = bank->target;
        int i;
-       u32 cmd;
-       u32 retval;
-       u32 protect_blocks;
+       uint32_t cmd;
+       uint32_t retval;
+       uint32_t protect_blocks;
        
        if (bank->target->state != TARGET_HALTED)
        {
@@ -335,7 +335,7 @@ static int str7x_protect(struct flash_bank_s *bank, int set, int first, int last
        
        retval = str7x_result(bank);
        
-       LOG_DEBUG("retval: 0x%8.8x", retval);
+       LOG_DEBUG("retval: 0x%8.8" PRIx32 "", retval);
        
        if (retval & FLASH_ERER)
                return ERROR_FLASH_SECTOR_NOT_ERASED;
@@ -345,18 +345,18 @@ static int str7x_protect(struct flash_bank_s *bank, int set, int first, int last
        return ERROR_OK;
 }
 
-static int str7x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
+static int str7x_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
        str7x_flash_bank_t *str7x_info = bank->driver_priv;
        target_t *target = bank->target;
-       u32 buffer_size = 8192;
+       uint32_t buffer_size = 8192;
        working_area_t *source;
-       u32 address = bank->base + offset;
+       uint32_t address = bank->base + offset;
        reg_param_t reg_params[6];
        armv4_5_algorithm_t armv4_5_info;
        int retval = ERROR_OK;
        
-       u32 str7x_flash_write_code[] = {
+       uint32_t str7x_flash_write_code[] = {
                                        /* write:                               */
                0xe3a04201, /*  mov r4, #0x10000000     */
                0xe5824000, /*  str r4, [r2, #0x0]      */
@@ -389,7 +389,7 @@ static int str7x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset,
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        };
        
-       target_write_buffer(target, str7x_info->write_algorithm->address, 20 * 4, (u8*)str7x_flash_write_code);
+       target_write_buffer(target, str7x_info->write_algorithm->address, 20 * 4, (uint8_t*)str7x_flash_write_code);
 
        /* memory buffer */
        while (target_alloc_working_area(target, buffer_size, &source) != ERROR_OK)
@@ -419,7 +419,7 @@ static int str7x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset,
        
        while (count > 0)
        {
-               u32 thisrun_count = (count > (buffer_size / 8)) ? (buffer_size / 8) : count;
+               uint32_t thisrun_count = (count > (buffer_size / 8)) ? (buffer_size / 8) : count;
                
                target_write_buffer(target, source->address, thisrun_count * 8, buffer);
                
@@ -460,17 +460,17 @@ static int str7x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset,
        return retval;
 }
 
-static int str7x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
+static int str7x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
        target_t *target = bank->target;
        str7x_flash_bank_t *str7x_info = bank->driver_priv;
-       u32 dwords_remaining = (count / 8);
-       u32 bytes_remaining = (count & 0x00000007);
-       u32 address = bank->base + offset;
-       u32 bytes_written = 0;
-       u32 cmd;
+       uint32_t dwords_remaining = (count / 8);
+       uint32_t bytes_remaining = (count & 0x00000007);
+       uint32_t address = bank->base + offset;
+       uint32_t bytes_written = 0;
+       uint32_t cmd;
        int retval;
-       u32 check_address = offset;
+       uint32_t check_address = offset;
        int i;
        
        if (bank->target->state != TARGET_HALTED)
@@ -481,14 +481,14 @@ static int str7x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 co
 
        if (offset & 0x7)
        {
-               LOG_WARNING("offset 0x%x breaks required 8-byte alignment", offset);
+               LOG_WARNING("offset 0x%" PRIx32 " breaks required 8-byte alignment", offset);
                return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
        }
        
        for (i = 0; i < bank->num_sectors; i++)
        {
-               u32 sec_start = bank->sectors[i].offset;
-               u32 sec_end = sec_start + bank->sectors[i].size;
+               uint32_t sec_start = bank->sectors[i].offset;
+               uint32_t sec_end = sec_start + bank->sectors[i].size;
                
                /* check if destination falls within the current sector */
                if ((check_address >= sec_start) && (check_address < sec_end))
@@ -575,10 +575,10 @@ static int str7x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 co
        
        if (bytes_remaining)
        {
-               u8 last_dword[8] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+               uint8_t last_dword[8] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
                int i = 0;
                                
-               while(bytes_remaining > 0)
+               while (bytes_remaining > 0)
                {
                        last_dword[i++] = *(buffer + bytes_written); 
                        bytes_remaining--;
@@ -644,10 +644,10 @@ static int str7x_handle_disable_jtag_command(struct command_context_s *cmd_ctx,
        target_t *target = NULL;
        str7x_flash_bank_t *str7x_info = NULL;
        
-       u32 flash_cmd;
-       u32 retval;
-       u16 ProtectionLevel = 0;
-       u16 ProtectionRegs;
+       uint32_t flash_cmd;
+       uint32_t retval;
+       uint16_t ProtectionLevel = 0;
+       uint16_t ProtectionRegs;
        
        if (argc < 1)
        {