diff options
Diffstat (limited to 'dev/Kernel')
| -rw-r--r-- | dev/Kernel/HALKit/ARM64/Storage/HalMFlash.cc (renamed from dev/Kernel/HALKit/ARM64/Storage/HalFlashMemory.cc) | 11 | ||||
| -rw-r--r-- | dev/Kernel/NewKit/Defines.h | 2 | ||||
| -rw-r--r-- | dev/Kernel/NewKit/Macros.h | 8 | ||||
| -rw-r--r-- | dev/Kernel/src/FS/NeFS.cc | 2 | ||||
| -rw-r--r-- | dev/Kernel/src/Json.cc | 2 | ||||
| -rw-r--r-- | dev/Kernel/src/KernelPanic.cc | 2 |
6 files changed, 14 insertions, 13 deletions
diff --git a/dev/Kernel/HALKit/ARM64/Storage/HalFlashMemory.cc b/dev/Kernel/HALKit/ARM64/Storage/HalMFlash.cc index d5a9ecf4..bc892e26 100644 --- a/dev/Kernel/HALKit/ARM64/Storage/HalFlashMemory.cc +++ b/dev/Kernel/HALKit/ARM64/Storage/HalMFlash.cc @@ -4,13 +4,14 @@ ------------------------------------------- */ +#ifdef ZKA_USE_MBCI_FLASH + #include <NewKit/Defines.h> #include <ArchKit/ArchKit.h> +#include <Mod/MFlash/MFlash.h> -/// @file Flash.cc -/// @brief Flash memory builtin. - -#ifdef ZKA_USE_MBCI_FLASH +/// @file HalMFlash.cc +/// @brief MBCI Flash builtin. #define kMaxFlash (4U) @@ -20,7 +21,7 @@ namespace Kernel constexpr auto kFlashBridgeMagic = "FLSH"; constexpr auto kFlashBridgeRevision = 1; - STATIC const Boolean kFlashEnabled = No; + STATIC CONST Boolean kFlashEnabled = No; STATIC SizeT kFlashSize[kMaxFlash] = {}; STATIC SizeT kFlashSectorSz[kMaxFlash] = {}; diff --git a/dev/Kernel/NewKit/Defines.h b/dev/Kernel/NewKit/Defines.h index 109be603..760fc100 100644 --- a/dev/Kernel/NewKit/Defines.h +++ b/dev/Kernel/NewKit/Defines.h @@ -75,7 +75,7 @@ namespace Kernel using Lba = UInt64; - using EfiChar16Type = char16_t; + using Char16 = char16_t; enum class Endian : UInt8 { diff --git a/dev/Kernel/NewKit/Macros.h b/dev/Kernel/NewKit/Macros.h index 15f7fe26..d2bc9ce7 100644 --- a/dev/Kernel/NewKit/Macros.h +++ b/dev/Kernel/NewKit/Macros.h @@ -142,8 +142,8 @@ #define BOOL Kernel::Boolean -#ifdef INIT_OBJECT -#undef INIT_OBJECT -#endif // ifdef INIT_OBJECT +#ifdef RTL_INIT_OBJECT +#undef RTL_INIT_OBJECT +#endif // ifdef RTL_INIT_OBJECT -#define INIT_OBJECT(OBJ, TYPE, ...) TYPE OBJ = TYPE(__VA_ARGS__) +#define RTL_INIT_OBJECT(OBJ, TYPE, ...) TYPE OBJ = TYPE(__VA_ARGS__) diff --git a/dev/Kernel/src/FS/NeFS.cc b/dev/Kernel/src/FS/NeFS.cc index 5484efc7..ecba58cb 100644 --- a/dev/Kernel/src/FS/NeFS.cc +++ b/dev/Kernel/src/FS/NeFS.cc @@ -11,7 +11,7 @@ #include <Mod/AHCI/AHCI.h> #include <Mod/ATA/ATA.h> -#include <Mod/Flash/Flash.h> +#include <Mod/MFlash/MFlash.h> #include <KernelKit/LPC.h> #include <NewKit/Crc32.h> #include <NewKit/KernelPanic.h> diff --git a/dev/Kernel/src/Json.cc b/dev/Kernel/src/Json.cc index f9fef7eb..c19d9149 100644 --- a/dev/Kernel/src/Json.cc +++ b/dev/Kernel/src/Json.cc @@ -7,4 +7,4 @@ #include <NewKit/Json.h> /// @brief Undefined object, is null in length. -INIT_OBJECT(Kernel::JSON::kNull, Kernel::JSON); +RTL_INIT_OBJECT(Kernel::JSON::kNull, Kernel::JSON); diff --git a/dev/Kernel/src/KernelPanic.cc b/dev/Kernel/src/KernelPanic.cc index f26925c5..9d1dda99 100644 --- a/dev/Kernel/src/KernelPanic.cc +++ b/dev/Kernel/src/KernelPanic.cc @@ -39,7 +39,7 @@ namespace Kernel start_y += 10; - fb_fini(); + fb_clear(); // show text according to error id. |