- correctly mask out bits that aren't part of a copied buffer

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

diff --git a/src/flash/str9x.c b/src/flash/str9x.c
index 054f5d0a886c1cd1dcab406922be32abf45083fc..c07bc757f1814a131c00c66cad2cf36511c67593 100644 (file)
--- a/src/flash/str9x.c
+++ b/src/flash/str9x.c
@@ -107,7 +107,7 @@ int str9x_build_block_list(struct flash_bank_s *bank)
                        exit(-1);
        }
        
-       num_sectors = b0_sectors + 2;
+       num_sectors = b0_sectors + 4;
        
        bank->num_sectors = num_sectors;
        bank->sectors = malloc(sizeof(flash_sector_t) * num_sectors);
@@ -510,7 +510,7 @@ int str9x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
 
        while (words_remaining > 0)
        {
-               bank_adr = address & 0x03;
+               bank_adr = address & ~0x03;
                
                /* write data command */
                target_write_u16(target, bank_adr, 0x40);
@@ -552,7 +552,7 @@ int str9x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
                        bytes_written++;
                }
                
-               bank_adr = address & 0x03;
+               bank_adr = address & ~0x03;
                
                /* write data comamnd */
                target_write_u16(target, bank_adr, 0x40);