Merge pull request #5375 from kegilbert/chainingbd-address-iter-fix

theotherjimmy · web-flow · commit 27533ff16e9e · 2017-10-30T10:09:51.000-05:00
ChainingBlockDevice: changing blocks address fix
diff --git a/features/filesystem/bd/ChainingBlockDevice.cpp b/features/filesystem/bd/ChainingBlockDevice.cpp
@@ -109,7 +109,7 @@ int ChainingBlockDevice::read(void *b, bd_addr_t addr, bd_size_t size)
             size -= read;
         }
 
-        addr -= size;
+        addr -= bdsize;
     }
 
     return 0;
@@ -140,7 +140,7 @@ int ChainingBlockDevice::program(const void *b, bd_addr_t addr, bd_size_t size)
             size -= program;
         }
 
-        addr -= size;
+        addr -= bdsize;
     }
 
     return 0;
@@ -169,7 +169,7 @@ int ChainingBlockDevice::erase(bd_addr_t addr, bd_size_t size)
             size -= erase;
         }
 
-        addr -= size;
+        addr -= bdsize;
     }
 
     return 0;

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ int ChainingBlockDevice::read(void *b, bd_addr_t addr, bd_size_t size)`
`109`	`109`	`size -= read;`
`110`	`110`	`}`
`111`	`111`
`112`		`- addr -= size;`
	`112`	`+ addr -= bdsize;`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`return 0;`
`@@ -140,7 +140,7 @@ int ChainingBlockDevice::program(const void *b, bd_addr_t addr, bd_size_t size)`
`140`	`140`	`size -= program;`
`141`	`141`	`}`
`142`	`142`
`143`		`- addr -= size;`
	`143`	`+ addr -= bdsize;`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`return 0;`
`@@ -169,7 +169,7 @@ int ChainingBlockDevice::erase(bd_addr_t addr, bd_size_t size)`
`169`	`169`	`size -= erase;`
`170`	`170`	`}`
`171`	`171`
`172`		`- addr -= size;`
	`172`	`+ addr -= bdsize;`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`return 0;`