Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-01 15:07:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Double fail: Fix a math bug, calculate the actual offset in the mapping and return it, and don't forget to return the total length read too.

Browse source 
svn path=/trunk/; revision=34661
This commit is contained in:
ReactOS Portable Systems Group 2008-07-22 06:40:00 +00:00
parent 04dfc992a1
commit 22a37283cc
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
reactos/drivers/storage/class/ramdisk/ramdisk.c
View file

@ -276,6 +276,7 @@ RamdiskMapPages(IN PRAMDISK_DRIVE_EXTENSION DeviceExtension,
{ {
PHYSICAL_ADDRESS PhysicalAddress; PHYSICAL_ADDRESS PhysicalAddress;
PVOID MappedBase; PVOID MappedBase;
ULONG PageOffset;
SIZE_T ActualLength; SIZE_T ActualLength;
LARGE_INTEGER ActualOffset; LARGE_INTEGER ActualOffset;
LARGE_INTEGER ActualPages; LARGE_INTEGER ActualPages;
@ -295,13 +296,13 @@ RamdiskMapPages(IN PRAMDISK_DRIVE_EXTENSION DeviceExtension,
// //
// Convert to pages // Convert to pages
// //
ActualOffset.QuadPart = BYTES_TO_PAGES(ActualOffset.QuadPart); ActualPages.QuadPart = BYTES_TO_PAGES(ActualOffset.QuadPart);
DPRINT1("Offset in pages is: %d\n", ActualOffset); DPRINT1("Offset in pages is: %d\n", ActualOffset);
// //
// Now add the base page // Now add the base page
// //
ActualPages.QuadPart = DeviceExtension->BasePage + ActualOffset.QuadPart; ActualPages.QuadPart = DeviceExtension->BasePage + ActualPages.QuadPart;
DPRINT1("Ramdisk mapped at page: %d, actual page is: %I64d\n", DPRINT1("Ramdisk mapped at page: %d, actual page is: %I64d\n",
DeviceExtension->BasePage, ActualPages); DeviceExtension->BasePage, ActualPages);
@ -323,10 +324,22 @@ RamdiskMapPages(IN PRAMDISK_DRIVE_EXTENSION DeviceExtension,
ActualLength <<= PAGE_SHIFT; ActualLength <<= PAGE_SHIFT;
DPRINT1("Length in bytes: %d\n", ActualLength); DPRINT1("Length in bytes: %d\n", ActualLength);
//
// Get the offset within the page
//
PageOffset = BYTE_OFFSET(ActualOffset.QuadPart);
DPRINT1("Page offset: %lx\n", PageOffset);
// //
// Map the I/O Space from the loader // Map the I/O Space from the loader
// //
MappedBase = MmMapIoSpace(PhysicalAddress, ActualLength, MmCached); MappedBase = MmMapIoSpace(PhysicalAddress, ActualLength, MmCached);
//
// Return actual offset within the page as well as the length
//
if (MappedBase) MappedBase = (PVOID)((ULONG_PTR)MappedBase + PageOffset);
*OutputLength = Length;
DPRINT1("Mapped at: %p\n", MappedBase); DPRINT1("Mapped at: %p\n", MappedBase);
return MappedBase; return MappedBase;
} }