Remove whitespace that occurs before ')'.
[fw/openocd] / src / flash / cfi.c
index f6ddead30c6c47ca2a0c9e3758b5667a9324fa4e..8ff219059c4c9d225b5b43c680c89919142f92c7 100644 (file)
@@ -114,7 +114,7 @@ static __inline__ uint32_t flash_address(flash_bank_t *bank, int sector, uint32_
 {
        cfi_flash_bank_t *cfi_info = bank->driver_priv;
 
-       if (cfi_info->x16_as_x8) offset*=2;
+       if (cfi_info->x16_as_x8) offset *= 2;
 
        /* while the sector list isn't built, only accesses to sector 0 work */
        if (sector == 0)
@@ -212,9 +212,9 @@ static uint16_t cfi_query_u16(flash_bank_t *bank, int sector, uint32_t offset)
        if (cfi_info->x16_as_x8)
        {
                uint8_t i;
-               for (i=0;i<2;i++)
-                       target_read_memory(target, flash_address(bank, sector, offset+i), bank->bus_width, 1,
-                               &data[i*bank->bus_width] );
+               for (i = 0;i < 2;i++)
+                       target_read_memory(target, flash_address(bank, sector, offset + i), bank->bus_width, 1,
+                               &data[i*bank->bus_width]);
        }
        else
                target_read_memory(target, flash_address(bank, sector, offset), bank->bus_width, 2, data);
@@ -234,9 +234,9 @@ static uint32_t cfi_query_u32(flash_bank_t *bank, int sector, uint32_t offset)
        if (cfi_info->x16_as_x8)
        {
                uint8_t i;
-               for (i=0;i<4;i++)
-                       target_read_memory(target, flash_address(bank, sector, offset+i), bank->bus_width, 1,
-                               &data[i*bank->bus_width] );
+               for (i = 0;i < 4;i++)
+                       target_read_memory(target, flash_address(bank, sector, offset + i), bank->bus_width, 1,
+                               &data[i*bank->bus_width]);
        }
        else
                target_read_memory(target, flash_address(bank, sector, offset), bank->bus_width, 4, data);
@@ -1011,10 +1011,10 @@ static void cfi_add_byte(struct flash_bank_s *bank, uint8_t *word, uint8_t byte)
 static void cfi_fix_code_endian(target_t *target, uint8_t *dest, const uint32_t *src, uint32_t count)
 {
        uint32_t i;
-       for (i=0; i< count; i++)
+       for (i = 0; i< count; i++)
        {
                target_buffer_set_u32(target, dest, *src);
-               dest+=4;
+               dest += 4;
                src++;
        }
 }
@@ -1154,7 +1154,7 @@ static int cfi_intel_write_block(struct flash_bank_s *bank, uint8_t *buffer, uin
        /* flash write code */
        if (!cfi_info->write_algorithm)
        {
-               if ( target_code_size > sizeof(target_code) )
+               if (target_code_size > sizeof(target_code))
                {
                        LOG_WARNING("Internal error - target code buffer to small. Increase CFI_MAX_INTEL_CODESIZE and recompile.");
                        return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
@@ -1206,7 +1206,7 @@ static int cfi_intel_write_block(struct flash_bank_s *bank, uint8_t *buffer, uin
        busy_pattern_val  = cfi_command_val(bank, 0x80);
        error_pattern_val = cfi_command_val(bank, 0x7e);
 
-       LOG_INFO("Using target buffer at 0x%08" PRIx32 " and of size 0x%04" PRIx32, source->address, buffer_size );
+       LOG_INFO("Using target buffer at 0x%08" PRIx32 " and of size 0x%04" PRIx32, source->address, buffer_size);
 
        /* Programming main loop */
        while (count > 0)
@@ -1227,7 +1227,7 @@ static int cfi_intel_write_block(struct flash_bank_s *bank, uint8_t *buffer, uin
                buf_set_u32(reg_params[5].value, 0, 32, busy_pattern_val);
                buf_set_u32(reg_params[6].value, 0, 32, error_pattern_val);
 
-               LOG_INFO("Write 0x%04" PRIx32 " bytes to flash at 0x%08" PRIx32 , thisrun_count, address );
+               LOG_INFO("Write 0x%04" PRIx32 " bytes to flash at 0x%08" PRIx32 , thisrun_count, address);
 
                /* Execute algorithm, assume breakpoint for last instruction */
                retval = target_run_algorithm(target, 0, NULL, 7, reg_params,
@@ -1452,7 +1452,7 @@ static int cfi_spansion_write_block(struct flash_bank_s *bank, uint8_t *buffer,
                cfi_fix_code_endian(target, target_code, src, target_code_size / 4);
 
                /* allocate working area */
-               retval=target_alloc_working_area(target, target_code_size,
+               retval = target_alloc_working_area(target, target_code_size,
                                &cfi_info->write_algorithm);
                if (retval != ERROR_OK)
                {
@@ -1883,7 +1883,7 @@ int cfi_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint3
        write_p = address & ~(bank->bus_width - 1);
        if ((align = address - write_p) != 0)
        {
-               LOG_INFO("Fixup %d unaligned head bytes", align );
+               LOG_INFO("Fixup %d unaligned head bytes", align);
 
                for (i = 0; i < bank->bus_width; i++)
                        current_word[i] = 0;
@@ -1987,7 +1987,7 @@ int cfi_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint3
                                                buffer += buffersize;
                                                write_p += buffersize;
                                                count -= buffersize;
-                                               fallback=0;
+                                               fallback = 0;
                                        }
                                }
                                /* try the slow way? */
@@ -2029,7 +2029,7 @@ int cfi_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint3
        /* handle unaligned tail bytes */
        if (count > 0)
        {
-               LOG_INFO("Fixup %" PRId32 " unaligned tail bytes", count );
+               LOG_INFO("Fixup %" PRId32 " unaligned tail bytes", count);
 
                copy_p = write_p;
                for (i = 0; i < bank->bus_width; i++)
@@ -2266,7 +2266,7 @@ static int cfi_probe(struct flash_bank_s *bank)
                        (1 << cfi_info->block_erase_timeout_max) * (1 << cfi_info->block_erase_timeout_typ),
                        (1 << cfi_info->chip_erase_timeout_max) * (1 << cfi_info->chip_erase_timeout_typ));
 
-               cfi_info->dev_size = 1<<cfi_query_u8(bank, 0, 0x27);
+               cfi_info->dev_size = 1 << cfi_query_u8(bank, 0, 0x27);
                cfi_info->interface_desc = cfi_query_u16(bank, 0, 0x28);
                cfi_info->max_buf_write_size = cfi_query_u16(bank, 0, 0x2a);
                cfi_info->num_erase_regions = cfi_query_u8(bank, 0, 0x2c);