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

* Calmed down CID 1976; the problematic situation should not be able to occur,

Browse Source 
but I've changed it anyway to make the code clearer.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38206 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-08-17 18:22:17 +00:00
parent 77d9a1e9bc
commit 0f274fd5b2
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/graphics/vesa/vesa.cpp
+2 -3
View File
@@ -242,7 +242,7 @@ remap_frame_buffer(vesa_info& info, addr_t physicalBase, uint32 width,
uint32 height, int8 depth, uint32 bytesPerRow, bool initializing) uint32 height, int8 depth, uint32 bytesPerRow, bool initializing)
{ {
vesa_shared_info& sharedInfo = *info.shared_info; vesa_shared_info& sharedInfo = *info.shared_info;
addr_t frameBuffer; addr_t frameBuffer = info.frame_buffer;
if (!info.complete_frame_buffer_mapped) { if (!info.complete_frame_buffer_mapped) {
addr_t base = physicalBase; addr_t base = physicalBase;
@@ -282,8 +282,7 @@ remap_frame_buffer(vesa_info& info, addr_t physicalBase, uint32 width,
if (info.physical_frame_buffer_size != 0) if (info.physical_frame_buffer_size != 0)
info.complete_frame_buffer_mapped = true; info.complete_frame_buffer_mapped = true;
} }
} else }
frameBuffer = info.frame_buffer;
if (info.complete_frame_buffer_mapped) if (info.complete_frame_buffer_mapped)
frameBuffer += physicalBase - info.physical_frame_buffer; frameBuffer += physicalBase - info.physical_frame_buffer;