summaryrefslogtreecommitdiffhomepage
path: root/dev
diff options
context:
space:
mode:
Diffstat (limited to 'dev')
-rw-r--r--dev/ZKAKit/FirmwareKit/EFI/EFI.h9
-rw-r--r--dev/ZKAKit/src/HardwareThreadScheduler.cc2
2 files changed, 7 insertions, 4 deletions
diff --git a/dev/ZKAKit/FirmwareKit/EFI/EFI.h b/dev/ZKAKit/FirmwareKit/EFI/EFI.h
index a6b74b53..befa4e87 100644
--- a/dev/ZKAKit/FirmwareKit/EFI/EFI.h
+++ b/dev/ZKAKit/FirmwareKit/EFI/EFI.h
@@ -8,7 +8,7 @@
#define FIRMWARE_KIT_EFI_H
/**
-@brief Implementation of EFI protocols.
+@brief Implementation of the main EFI protocols.
*/
#include <NewKit/Defines.h>
@@ -25,6 +25,8 @@ using namespace Kernel;
#define OUT
#define OPTIONAL
+#define EFI_FINAL final
+
// Forward decls
struct EfiTableHeader;
@@ -75,6 +77,7 @@ typedef UInt64(EFI_API* EfiLoadFile)(EfiLoadFileProtocol* Self,
VoidPtr Buffer);
typedef UInt64(EFI_API* EfiCopyMem)(VoidPtr DstBuf, VoidPtr SrcBuf, SizeT Length);
+
typedef UInt64(EFI_API* EfiSetMem)(VoidPtr DstBuf, Char Byte, SizeT Length);
typedef UInt64(EFI_API* EfiHandleProtocol)(EfiHandlePtr Handle, EfiGUID* Guid, VoidPtr* Device);
@@ -458,7 +461,7 @@ typedef UInt64(EFI_API* EfiGetMemoryMap)(UInt32* MapSize,
/**
* @brief GUID type, something you can also find in CFKit.
*/
-typedef struct EfiGUID final
+typedef struct EfiGUID EFI_FINAL
{
UInt32 Data1;
UInt16 Data2;
@@ -778,7 +781,7 @@ typedef struct EfiTime
} \
}
-struct EfiFileInfo final
+struct EfiFileInfo EFI_FINAL
{
/// @brief Structure size.
UInt64 Size;
diff --git a/dev/ZKAKit/src/HardwareThreadScheduler.cc b/dev/ZKAKit/src/HardwareThreadScheduler.cc
index 99b4a7ff..e93b2284 100644
--- a/dev/ZKAKit/src/HardwareThreadScheduler.cc
+++ b/dev/ZKAKit/src/HardwareThreadScheduler.cc
@@ -63,7 +63,7 @@ namespace Kernel
{
STATIC Int64 busy_timer = 0U;
- if (busy_timer > this->fPTime)
+ if (fBusy && busy_timer > this->fPTime)
{
busy_timer = 0U;
fBusy = No;