- Fixes '<<' whitespace

[openocd.git] / src / flash / str9x.c

diff --git a/src/flash/str9x.c b/src/flash/str9x.c
index 52e7839a28367154652c5fafc92f0aece0f0f2d4..2b92d0095c6e1db6a6f66889f86195d147332432 100644 (file)
--- a/src/flash/str9x.c
+++ b/src/flash/str9x.c
@@ -132,7 +132,7 @@ static int str9x_build_block_list(struct flash_bank_s *bank)
                offset += bank->sectors[i].size;
                bank->sectors[num_sectors].is_erased = -1;
                bank->sectors[num_sectors].is_protected = 1;
-               str9x_info->sector_bits[num_sectors++] = (1<<i);
+               str9x_info->sector_bits[num_sectors++] = (1 << i);
        }
 
        for (i = 0; i < b1_sectors; i++)
@@ -143,9 +143,9 @@ static int str9x_build_block_list(struct flash_bank_s *bank)
                bank->sectors[num_sectors].is_erased = -1;
                bank->sectors[num_sectors].is_protected = 1;
                if (str9x_info->variant)
-                       str9x_info->sector_bits[num_sectors++] = (1<<i);
+                       str9x_info->sector_bits[num_sectors++] = (1 << i);
                else
-                       str9x_info->sector_bits[num_sectors++] = (1<<(i+8));
+                       str9x_info->sector_bits[num_sectors++] = (1 << (i+8));
        }
 
        return ERROR_OK;
@@ -198,11 +198,11 @@ static int str9x_protect_check(struct flash_bank_s *bank)
                if (str9x_info->bank1)
                {
                        adr = bank1start + 0x18;
-                       if ((retval=target_write_u16(target, adr, 0x90))!=ERROR_OK)
+                       if ((retval=target_write_u16(target, adr, 0x90)) != ERROR_OK)
                        {
                                return retval;
                        }
-                       if ((retval=target_read_u16(target, adr, &hstatus))!=ERROR_OK)
+                       if ((retval=target_read_u16(target, adr, &hstatus)) != ERROR_OK)
                        {
                                return retval;
                        }
@@ -211,11 +211,11 @@ static int str9x_protect_check(struct flash_bank_s *bank)
                else
                {
                        adr = bank1start + 0x14;
-                       if ((retval=target_write_u16(target, adr, 0x90))!=ERROR_OK)
+                       if ((retval=target_write_u16(target, adr, 0x90)) != ERROR_OK)
                        {
                                return retval;
                        }
-                       if ((retval=target_read_u32(target, adr, &status))!=ERROR_OK)
+                       if ((retval=target_read_u32(target, adr, &status)) != ERROR_OK)
                        {
                                return retval;
                        }
@@ -224,11 +224,11 @@ static int str9x_protect_check(struct flash_bank_s *bank)
        else
        {
                adr = bank1start + 0x10;
-               if ((retval=target_write_u16(target, adr, 0x90))!=ERROR_OK)
+               if ((retval=target_write_u16(target, adr, 0x90)) != ERROR_OK)
                {
                        return retval;
                }
-               if ((retval=target_read_u16(target, adr, &hstatus))!=ERROR_OK)
+               if ((retval=target_read_u16(target, adr, &hstatus)) != ERROR_OK)
                {
                        return retval;
                }
@@ -236,7 +236,7 @@ static int str9x_protect_check(struct flash_bank_s *bank)
        }
 
        /* read array command */
-       if ((retval=target_write_u16(target, adr, 0xFF))!=ERROR_OK)
+       if ((retval=target_write_u16(target, adr, 0xFF)) != ERROR_OK)
        {
                return retval;
        }
@@ -284,28 +284,28 @@ static int str9x_erase(struct flash_bank_s *bank, int first, int last)
                adr = bank->base + bank->sectors[i].offset;
 
                /* erase sectors */
-               if ((retval=target_write_u16(target, adr, erase_cmd))!=ERROR_OK)
+               if ((retval=target_write_u16(target, adr, erase_cmd)) != ERROR_OK)
                {
                        return retval;
                }
-               if ((retval=target_write_u16(target, adr, 0xD0))!=ERROR_OK)
+               if ((retval=target_write_u16(target, adr, 0xD0)) != ERROR_OK)
                {
                        return retval;
                }
 
                /* get status */
-               if ((retval=target_write_u16(target, adr, 0x70))!=ERROR_OK)
+               if ((retval=target_write_u16(target, adr, 0x70)) != ERROR_OK)
                {
                        return retval;
                }
 
                int timeout;
                for (timeout=0; timeout<1000; timeout++) {
-                       if ((retval=target_read_u8(target, adr, &status))!=ERROR_OK)
+                       if ((retval=target_read_u8(target, adr, &status)) != ERROR_OK)
                        {
                                return retval;
                        }
-                       if( status & 0x80 )
+                       if ( status & 0x80 )
                                break;
                        alive_sleep(1);
                }
@@ -316,18 +316,18 @@ static int str9x_erase(struct flash_bank_s *bank, int first, int last)
                }
 
                /* clear status, also clear read array */
-               if ((retval=target_write_u16(target, adr, 0x50))!=ERROR_OK)
+               if ((retval=target_write_u16(target, adr, 0x50)) != ERROR_OK)
                {
                        return retval;
                }
 
                /* read array command */
-               if ((retval=target_write_u16(target, adr, 0xFF))!=ERROR_OK)
+               if ((retval=target_write_u16(target, adr, 0xFF)) != ERROR_OK)
                {
                        return retval;
                }
 
-               if( status & 0x22 )
+               if ( status & 0x22 )
                {
                        LOG_ERROR("error erasing flash bank, status: 0x%x", status);
                        return ERROR_FLASH_OPERATION_FAILED;
@@ -365,7 +365,7 @@ static int str9x_protect(struct flash_bank_s *bank,
                adr = bank->base + bank->sectors[i].offset;
 
                target_write_u16(target, adr, 0x60);
-               if( set )
+               if ( set )
                        target_write_u16(target, adr, 0x01);
                else
                        target_write_u16(target, adr, 0xD0);
@@ -514,7 +514,7 @@ static int str9x_write(struct flash_bank_s *bank,
 
        if (offset & 0x1)
        {
-               LOG_WARNING("offset 0x%x breaks required 2-byte alignment", offset);
+               LOG_WARNING("offset 0x%" PRIx32 " breaks required 2-byte alignment", offset);
                return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
        }
 
@@ -578,7 +578,7 @@ static int str9x_write(struct flash_bank_s *bank,
                for (timeout=0; timeout<1000; timeout++)
                {
                        target_read_u8(target, bank_adr, &status);
-                       if( status & 0x80 )
+                       if ( status & 0x80 )
                                break;
                        alive_sleep(1);
                }
@@ -607,7 +607,7 @@ static int str9x_write(struct flash_bank_s *bank,
                uint8_t last_halfword[2] = {0xff, 0xff};
                int i = 0;
 
-               while(bytes_remaining > 0)
+               while (bytes_remaining > 0)
                {
                        last_halfword[i++] = *(buffer + bytes_written);
                        bytes_remaining--;
@@ -627,7 +627,7 @@ static int str9x_write(struct flash_bank_s *bank,
                for (timeout=0; timeout<1000; timeout++)
                {
                        target_read_u8(target, bank_adr, &status);
-                       if( status & 0x80 )
+                       if ( status & 0x80 )
                                break;
                        alive_sleep(1);
                }