cc3200: Correct buffer offset in serial flash diskio module.

danicampora · danicampora · commit 5d8164167ee9 · 2015-11-29T18:34:51.000+01:00
diff --git a/cc3200/fatfs/src/drivers/sflash_diskio.c b/cc3200/fatfs/src/drivers/sflash_diskio.c
@@ -96,7 +96,7 @@ DRESULT sflash_disk_status(void) {
     if (!sflash_init_done) {
         return STA_NOINIT;
     }
-    return 0;
+    return RES_OK;
 }
 
 DRESULT sflash_disk_read(BYTE *buff, DWORD sector, UINT count) {
@@ -126,7 +126,7 @@ DRESULT sflash_disk_read(BYTE *buff, DWORD sector, UINT count) {
         }
         // Copy the requested sector from the block cache
         memcpy (buff, &sflash_block_cache[(secindex * SFLASH_SECTOR_SIZE)], SFLASH_SECTOR_SIZE);
-        buff += SFLASH_BLOCK_SIZE;
+        buff += SFLASH_SECTOR_SIZE;
     }
     return RES_OK;
 }
@@ -161,7 +161,7 @@ DRESULT sflash_disk_write(const BYTE *buff, DWORD sector, UINT count) {
         }
         // Copy the input sector to the block cache
         memcpy (&sflash_block_cache[(secindex * SFLASH_SECTOR_SIZE)], buff, SFLASH_SECTOR_SIZE);
-        buff += SFLASH_BLOCK_SIZE;
+        buff += SFLASH_SECTOR_SIZE;
         sflash_cache_is_dirty = true;
     } while (++index < count);
 

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ DRESULT sflash_disk_status(void) {`
`96`	`96`	`if (!sflash_init_done) {`
`97`	`97`	`return STA_NOINIT;`
`98`	`98`	`}`
`99`		`- return 0;`
	`99`	`+ return RES_OK;`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`DRESULT sflash_disk_read(BYTE *buff, DWORD sector, UINT count) {`
`@@ -126,7 +126,7 @@ DRESULT sflash_disk_read(BYTE *buff, DWORD sector, UINT count) {`
`126`	`126`	`}`
`127`	`127`	`// Copy the requested sector from the block cache`
`128`	`128`	`memcpy (buff, &sflash_block_cache[(secindex * SFLASH_SECTOR_SIZE)], SFLASH_SECTOR_SIZE);`
`129`		`- buff += SFLASH_BLOCK_SIZE;`
	`129`	`+ buff += SFLASH_SECTOR_SIZE;`
`130`	`130`	`}`
`131`	`131`	`return RES_OK;`
`132`	`132`	`}`
`@@ -161,7 +161,7 @@ DRESULT sflash_disk_write(const BYTE *buff, DWORD sector, UINT count) {`
`161`	`161`	`}`
`162`	`162`	`// Copy the input sector to the block cache`
`163`	`163`	`memcpy (&sflash_block_cache[(secindex * SFLASH_SECTOR_SIZE)], buff, SFLASH_SECTOR_SIZE);`
`164`		`- buff += SFLASH_BLOCK_SIZE;`
	`164`	`+ buff += SFLASH_SECTOR_SIZE;`
`165`	`165`	`sflash_cache_is_dirty = true;`
`166`	`166`	`} while (++index < count);`
`167`	`167`