Merge pull request #7953 from davidsaada/david_is_valid_erase_fix

Cruz Monrreal · web-flow · commit 6b85ec7c5779 · 2018-09-27T10:20:56.000-05:00
Fix is_valid_erase function to use get_erase_size with address
diff --git a/features/storage/blockdevice/BlockDevice.h b/features/storage/blockdevice/BlockDevice.h
@@ -226,8 +226,8 @@ class BlockDevice
     bool is_valid_erase(bd_addr_t addr, bd_size_t size) const
     {
         return (
-            addr % get_erase_size() == 0 &&
-            size % get_erase_size() == 0 &&
+            addr % get_erase_size(addr) == 0 &&
+            (addr + size) % get_erase_size(addr + size - 1) == 0 &&
             addr + size <= this->size());
     }
 };

Original file line number	Diff line number	Diff line change
`@@ -226,8 +226,8 @@ class BlockDevice`
`226`	`226`	`bool is_valid_erase(bd_addr_t addr, bd_size_t size) const`
`227`	`227`	`{`
`228`	`228`	`return (`
`229`		`- addr % get_erase_size() == 0 &&`
`230`		`- size % get_erase_size() == 0 &&`
	`229`	`+ addr % get_erase_size(addr) == 0 &&`
	`230`	`+ (addr + size) % get_erase_size(addr + size - 1) == 0 &&`
`231`	`231`	`addr + size <= this->size());`
`232`	`232`	`}`
`233`	`233`	`};`