diff options
Diffstat (limited to 'dev/kernel')
| -rw-r--r-- | dev/kernel/HALKit/AMD64/HalKernelMain.cc | 1 | ||||
| -rw-r--r-- | dev/kernel/src/Gfx/FBDeviceInterface.cc | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/dev/kernel/HALKit/AMD64/HalKernelMain.cc b/dev/kernel/HALKit/AMD64/HalKernelMain.cc index 7f3d4137..ce8c1245 100644 --- a/dev/kernel/HALKit/AMD64/HalKernelMain.cc +++ b/dev/kernel/HALKit/AMD64/HalKernelMain.cc @@ -14,7 +14,6 @@ #include <CFKit/Property.h> #include <modules/CoreGfx/TextGfx.h> #include <KernelKit/Timer.h> -#include <modules/CoreGfx/CoreWindow.h> #include <FirmwareKit/EFI/API.h> #include <FirmwareKit/EFI/EFI.h> diff --git a/dev/kernel/src/Gfx/FBDeviceInterface.cc b/dev/kernel/src/Gfx/FBDeviceInterface.cc index c2eb2ca7..b3b52934 100644 --- a/dev/kernel/src/Gfx/FBDeviceInterface.cc +++ b/dev/kernel/src/Gfx/FBDeviceInterface.cc @@ -36,7 +36,7 @@ FBDeviceInterface& FBDeviceInterface::operator<<(FBDevicePacket* pckt) pckt->fY > kHandoverHeader->f_GOP.f_Height) return *this; - FBDrawInRegion(pckt->fColor, pckt->fHeight, pckt->fWidth, pckt->fY, pckt->fX); + this->fOut(this, pckt); return *this; } @@ -53,10 +53,7 @@ FBDeviceInterface& FBDeviceInterface::operator>>(FBDevicePacket* pckt) pckt->fY > kHandoverHeader->f_GOP.f_Height) return *this; - pckt->fColor = *(((Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + - 4 * kHandoverHeader->f_GOP.f_PixelPerLine * - pckt->fX + - 4 * pckt->fY))); + this->fIn(this, pckt); return *this; } |