i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

norflash: fix handling of boundaries

Browse Source 
This was slightly off since my introduction of hidden sectors^^^^^
blocks in the norflash driver.
This commit is contained in:
Ithamar R. Adema
2013-09-18 22:20:17 +02:00
parent bd3bcbe5d6
commit 31e17f9d7b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/disk/norflash/norflash.cpp
+3 -2
View File
@@ -63,6 +63,9 @@ nor_init_device(void *_info, void **_cookie)
if (info->id < 0) if (info->id < 0)
return info->id; return info->id;
info->mapped += HIDDEN_BLOCKS * info->blocksize;
*_cookie = info; *_cookie = info;
return B_OK; return B_OK;
} }
@@ -142,8 +145,6 @@ nor_read(void *_cookie, off_t position, void *data, size_t *numbytes)
nor_driver_info *info = (nor_driver_info*)_cookie; nor_driver_info *info = (nor_driver_info*)_cookie;
TRACE("read(%Ld,%lu)\n", position, *numbytes); TRACE("read(%Ld,%lu)\n", position, *numbytes);
position += HIDDEN_BLOCKS * info->blocksize;
if (position + *numbytes > info->totalsize) if (position + *numbytes > info->totalsize)
*numbytes = info->totalsize - (position + *numbytes); *numbytes = info->totalsize - (position + *numbytes);