Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nvme_disk: Use addr_t for pointer arithmetic.

Browse Source 
No functional change (intended).
This commit is contained in:
Augustin Cavalier 2020-03-22 20:52:01 -04:00
parent 515ec47340
commit 9c878a9a89
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp
View File

@ -471,7 +471,7 @@ nvme_disk_read(void* cookie, off_t pos, void* buffer, size_t* length)
return status; return status;
} }
void* offsetBuffer = ((int8*)bounceBuffer) + (pos - rounded_pos); void* offsetBuffer = (void*)((addr_t)bounceBuffer + (pos - rounded_pos));
if (IS_USER_ADDRESS(buffer)) if (IS_USER_ADDRESS(buffer))
status = user_memcpy(buffer, offsetBuffer, *length); status = user_memcpy(buffer, offsetBuffer, *length);
else else
@ -536,7 +536,7 @@ nvme_disk_write(void* cookie, off_t pos, const void* buffer, size_t* length)
} }
// Now we can copy in the actual data to be written. // Now we can copy in the actual data to be written.
void* offsetBuffer = ((int8*)bounceBuffer) + (pos - rounded_pos); void* offsetBuffer = (void*)((addr_t)bounceBuffer + (pos - rounded_pos));
if (IS_USER_ADDRESS(buffer)) if (IS_USER_ADDRESS(buffer))
status = user_memcpy(offsetBuffer, buffer, *length); status = user_memcpy(offsetBuffer, buffer, *length);
else else