From 31e17f9d7b68cac80963bbc2995119cb094965ed Mon Sep 17 00:00:00 2001 From: "Ithamar R. Adema" Date: Wed, 18 Sep 2013 21:50:36 +0200 Subject: [PATCH] norflash: fix handling of boundaries This was slightly off since my introduction of hidden sectors^^^^^ blocks in the norflash driver. --- src/add-ons/kernel/drivers/disk/norflash/norflash.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/add-ons/kernel/drivers/disk/norflash/norflash.cpp b/src/add-ons/kernel/drivers/disk/norflash/norflash.cpp index 1fd7be7e40..27d371f69a 100644 --- a/src/add-ons/kernel/drivers/disk/norflash/norflash.cpp +++ b/src/add-ons/kernel/drivers/disk/norflash/norflash.cpp @@ -63,6 +63,9 @@ nor_init_device(void *_info, void **_cookie) if (info->id < 0) return info->id; + info->mapped += HIDDEN_BLOCKS * info->blocksize; + + *_cookie = info; 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; TRACE("read(%Ld,%lu)\n", position, *numbytes); - position += HIDDEN_BLOCKS * info->blocksize; - if (position + *numbytes > info->totalsize) *numbytes = info->totalsize - (position + *numbytes);