dos2unix fix.

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

diff --git a/src/flash/str7x.c b/src/flash/str7x.c
index 2b3e47fd15c8a8a9e3d71cce7a60d1c5dd849ea5..3574a897d47890d378ea10bfb49206510c0137ed 100644 (file)
--- a/src/flash/str7x.c
+++ b/src/flash/str7x.c
@@ -70,6 +70,7 @@ flash_driver_t str7x_flash =
        .protect = str7x_protect,
        .write = str7x_write,
        .probe = str7x_probe,
+       .auto_probe = str7x_probe,
        .erase_check = str7x_erase_check,
        .protect_check = str7x_protect_check,
        .info = str7x_info
@@ -313,11 +314,6 @@ int str7x_erase(struct flash_bank_s *bank, int first, int last)
        u32 retval;
        u32 b0_sectors = 0, b1_sectors = 0;
        
-       if (bank->target->state != TARGET_HALTED)
-       {
-               return ERROR_TARGET_NOT_HALTED;
-       }
-       
        for (i = first; i <= last; i++)
        {
                if (str7x_info->sector_bank[i] == 0)
@@ -572,11 +568,6 @@ int str7x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
        u32 check_address = offset;
        int i;
        
-       if (bank->target->state != TARGET_HALTED)
-       {
-               return ERROR_TARGET_NOT_HALTED;
-       }
-       
        if (offset & 0x7)
        {
                WARNING("offset 0x%x breaks required 8-byte alignment", offset);