diff options
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/boot/BootKit/Qr.h | 4 | ||||
| -rw-r--r-- | dev/boot/src/BootFileReader.cc | 2 | ||||
| -rw-r--r-- | dev/boot/src/HEL/AMD64/BootEFI.cc | 2 | ||||
| -rw-r--r-- | dev/kernel/HALKit/AMD64/HalDebugOutput.cc | 8 | ||||
| -rw-r--r-- | dev/kernel/HALKit/AMD64/HalKernelMain.cc | 2 | ||||
| -rw-r--r-- | dev/kernel/HALKit/ARM64/HalKernelMain.cc | 2 | ||||
| -rw-r--r-- | dev/kernel/KernelKit/KernelTaskScheduler.h | 2 | ||||
| -rw-r--r-- | dev/kernel/src/UserProcessScheduler.cc | 6 | ||||
| -rw-r--r-- | dev/modules/APM/APM.h | 4 | ||||
| -rw-r--r-- | dev/modules/CoreGfx/CoreAccess.h | 8 | ||||
| -rw-r--r-- | dev/modules/CoreGfx/CoreGfx.h | 14 | ||||
| -rw-r--r-- | dev/modules/CoreGfx/MathGfx.h | 6 | ||||
| -rw-r--r-- | dev/modules/CoreGfx/TextGfx.h | 6 | ||||
| -rw-r--r-- | dev/modules/HPET/.gitkeep | 0 |
14 files changed, 34 insertions, 32 deletions
diff --git a/dev/boot/BootKit/Qr.h b/dev/boot/BootKit/Qr.h index 2dcfc5fe..f537aa5e 100644 --- a/dev/boot/BootKit/Qr.h +++ b/dev/boot/BootKit/Qr.h @@ -306,7 +306,7 @@ template <int V> bool Qr<V>::draw(int whereX, int whereY) noexcept { if (!this->status) return false; // it may be invalid. - fb_init(); + cg_init(); for (int y = 0; y < (this->side_size()); ++y) { for (int x = 0; x < (this->side_size()); ++x) { @@ -315,7 +315,7 @@ bool Qr<V>::draw(int whereX, int whereY) noexcept { } } - fb_clear(); + cg_clear(); return false; } diff --git a/dev/boot/src/BootFileReader.cc b/dev/boot/src/BootFileReader.cc index c95623b6..dca260bc 100644 --- a/dev/boot/src/BootFileReader.cc +++ b/dev/boot/src/BootFileReader.cc @@ -75,7 +75,7 @@ Boot::BootFileReader::BootFileReader(const CharacterTypeUTF16* path, EfiHandlePt mWriter.Write(L"BootZ: Fetch-Protocol: No-Such-Path: ").Write(mPath).Write(L"\r"); this->mErrorCode = kNotSupported; - fb_render_string("BootZ: PLEASE RECOVER YOUR NEKERNEL INSTALL.", 40, 10, RGB(0xFF, 0xFF, 0xFF)); + cg_render_string("BootZ: PLEASE RECOVER YOUR NEKERNEL INSTALL.", 40, 10, RGB(0xFF, 0xFF, 0xFF)); mRootFs->Close(mRootFs); diff --git a/dev/boot/src/HEL/AMD64/BootEFI.cc b/dev/boot/src/HEL/AMD64/BootEFI.cc index 5bcdff5a..1cefa70c 100644 --- a/dev/boot/src/HEL/AMD64/BootEFI.cc +++ b/dev/boot/src/HEL/AMD64/BootEFI.cc @@ -111,7 +111,7 @@ EFI_EXTERN_C EFI_API Int32 BootloaderMain(EfiHandlePtr image_handle, EfiSystemTa kHandoverHeader = handover_hdr; - FB::fb_clear_video(); + FB::cg_clear_video(); UInt32 cnt_enabled = 0; UInt32 cnt_disabled = 0; diff --git a/dev/kernel/HALKit/AMD64/HalDebugOutput.cc b/dev/kernel/HALKit/AMD64/HalDebugOutput.cc index 789c1067..aa3f284f 100644 --- a/dev/kernel/HALKit/AMD64/HalDebugOutput.cc +++ b/dev/kernel/HALKit/AMD64/HalDebugOutput.cc @@ -90,7 +90,7 @@ EXTERN_C void ke_utf_io_write(DeviceInterface<const Utf8Char*>* obj, const Utf8C tmp_str[0] = (bytes[index] > 127) ? '?' : bytes[index]; tmp_str[1] = 0; - fb_render_string(tmp_str, kY, kX, RGB(0xff, 0xff, 0xff)); + cg_render_string(tmp_str, kY, kX, RGB(0xff, 0xff, 0xff)); if (bytes[index] == '\r') { kY += kFontSizeY; @@ -106,7 +106,7 @@ EXTERN_C void ke_utf_io_write(DeviceInterface<const Utf8Char*>* obj, const Utf8C if (kY > kHandoverHeader->f_GOP.f_Height) { kY = kFontSizeY; - FBDrawInRegion(fb_get_clear_clr(), FB::FBAccessibilty::Height(), FB::FBAccessibilty::Width(), + FBDrawInRegion(cg_get_clear_clr(), FB::CGAccessibilty::Height(), FB::CGAccessibilty::Width(), 0, 0); } @@ -146,7 +146,7 @@ EXTERN_C void ke_io_write(DeviceInterface<const Char*>* obj, const Char* bytes) tmp_str[0] = bytes[index]; tmp_str[1] = 0; - fb_render_string(tmp_str, kY, kX, RGB(0xff, 0xff, 0xff)); + cg_render_string(tmp_str, kY, kX, RGB(0xff, 0xff, 0xff)); if (bytes[index] == '\r') { kY += kFontSizeY; @@ -162,7 +162,7 @@ EXTERN_C void ke_io_write(DeviceInterface<const Char*>* obj, const Char* bytes) if (kY > kHandoverHeader->f_GOP.f_Height) { kY = kFontSizeY; - FBDrawInRegion(fb_get_clear_clr(), FB::FBAccessibilty::Height(), FB::FBAccessibilty::Width(), + FBDrawInRegion(cg_get_clear_clr(), FB::CGAccessibilty::Height(), FB::CGAccessibilty::Width(), 0, 0); } diff --git a/dev/kernel/HALKit/AMD64/HalKernelMain.cc b/dev/kernel/HALKit/AMD64/HalKernelMain.cc index e67501cc..2339f56d 100644 --- a/dev/kernel/HALKit/AMD64/HalKernelMain.cc +++ b/dev/kernel/HALKit/AMD64/HalKernelMain.cc @@ -118,7 +118,7 @@ EXTERN_C Int32 hal_init_platform(Kernel::HEL::BootInfoHeader* handover_hdr) { kGDTArray[4].fFlags = 0; kGDTArray[4].fBaseHigh = 0; - FB::fb_clear_video(); + FB::cg_clear_video(); // Load memory descriptors. HAL::Register64 gdt_reg; diff --git a/dev/kernel/HALKit/ARM64/HalKernelMain.cc b/dev/kernel/HALKit/ARM64/HalKernelMain.cc index b711b833..ad516539 100644 --- a/dev/kernel/HALKit/ARM64/HalKernelMain.cc +++ b/dev/kernel/HALKit/ARM64/HalKernelMain.cc @@ -42,7 +42,7 @@ EXTERN_C void hal_init_platform(Kernel::HEL::BootInfoHeader* handover_hdr) { handover_hdr->f_HardwareTables.f_ImageHandle); #endif - FB::fb_clear_video(); + FB::cg_clear_video(); /************************************** */ /* INITIALIZE BIT MAP. */ diff --git a/dev/kernel/KernelKit/KernelTaskScheduler.h b/dev/kernel/KernelKit/KernelTaskScheduler.h index 2029ae7b..659362fe 100644 --- a/dev/kernel/KernelKit/KernelTaskScheduler.h +++ b/dev/kernel/KernelKit/KernelTaskScheduler.h @@ -29,7 +29,7 @@ class KERNEL_TASK final { UInt8* StackReserve{nullptr}; SizeT StackSize{kSchedMaxStackSz}; ProcessImage Image{}; - /// @brief a KID is a Kernel Identification Descriptor, it is used to find a task running within + /// @brief a KID is a Kernel ID, it is used to find a task running within /// the kernel. KID Kid{0}; }; diff --git a/dev/kernel/src/UserProcessScheduler.cc b/dev/kernel/src/UserProcessScheduler.cc index ac25c3d8..02d5c1d6 100644 --- a/dev/kernel/src/UserProcessScheduler.cc +++ b/dev/kernel/src/UserProcessScheduler.cc @@ -678,11 +678,13 @@ UserProcessScheduler::operator bool() { /// @brief this checks if no process is on the team. //////////////////////////////////////////////////////////// Bool UserProcessScheduler::operator!() { + SInt64 cnt = 0UL; + for (auto process_index = 0UL; process_index < mTeam.AsArray().Count(); ++process_index) { auto& process = mTeam.AsArray()[process_index]; - if (UserProcessHelper::CanBeScheduled(process)) return false; + if (UserProcessHelper::CanBeScheduled(process)) ++cnt; } - return true; + return cnt == 0L; } } // namespace Kernel diff --git a/dev/modules/APM/APM.h b/dev/modules/APM/APM.h index 29de5114..95c749e1 100644 --- a/dev/modules/APM/APM.h +++ b/dev/modules/APM/APM.h @@ -21,9 +21,9 @@ enum { kAPMPowerCommandReboot = 0x08,
};
-/// @brief Send a APM command into it's own IO space.
+/// @brief Send a APM command into it's controller. (Shutdown, Reboot, Sleep...)
/// @param base_dma the IO base port.
/// @param cmd the command.
-/// @return status code.
+/// @return status code of the APM command.
EXTERN_C Int32 apm_send_io_command(UInt16 cmd);
} // namespace Kernel
diff --git a/dev/modules/CoreGfx/CoreAccess.h b/dev/modules/CoreGfx/CoreAccess.h index f092b5a6..246b386a 100644 --- a/dev/modules/CoreGfx/CoreAccess.h +++ b/dev/modules/CoreGfx/CoreAccess.h @@ -17,12 +17,12 @@ namespace FB { using namespace Kernel; /// @brief common User interface class. -class FBAccessibilty final { - explicit FBAccessibilty() = default; - ~FBAccessibilty() = default; +class CGAccessibilty final { + explicit CGAccessibilty() = default; + ~CGAccessibilty() = default; public: - NE_COPY_DELETE(FBAccessibilty) + NE_COPY_DELETE(CGAccessibilty) static UInt64 Width() noexcept { return kHandoverHeader->f_GOP.f_Width; } diff --git a/dev/modules/CoreGfx/CoreGfx.h b/dev/modules/CoreGfx/CoreGfx.h index d5cfa5a3..0ab3bcbc 100644 --- a/dev/modules/CoreGfx/CoreGfx.h +++ b/dev/modules/CoreGfx/CoreGfx.h @@ -8,13 +8,13 @@ #include <NeKit/Defines.h> -#define fb_init() Kernel::UInt32 kCGCursor = 0 +#define cg_init() Kernel::UInt32 kCGCursor = 0 -#define fb_color(R, G, B) RGB(R, G, B) +#define cg_color(R, G, B) RGB(R, G, B) -#define fb_get_clear_clr() RGB(0, 0, 0x80) +#define cg_get_clear_clr() RGB(0, 0, 0x80) -#define fb_clear() kCGCursor = 0UL +#define cg_clear() kCGCursor = 0UL #ifdef __NE_AMD64__ /// @brief Performs Alpha drawing on the framebuffer. @@ -57,7 +57,7 @@ for (Kernel::UInt32 u = base_y; u < (height + base_y); ++u) { \ *(((volatile Kernel::UInt32*) (kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * i + 4 * u))) = \ - fb_get_clear_clr(); \ + cg_get_clear_clr(); \ } \ } @@ -111,8 +111,8 @@ #endif // ifndef CORE_GFX_ACCESSIBILITY_H namespace FB { -inline Void fb_clear_video() noexcept { - FBDrawInRegion(fb_get_clear_clr(), FB::FBAccessibilty::Height(), FB::FBAccessibilty::Width(), 0, +inline Void cg_clear_video() noexcept { + FBDrawInRegion(cg_get_clear_clr(), FB::CGAccessibilty::Height(), FB::CGAccessibilty::Width(), 0, 0); } } // namespace FB
\ No newline at end of file diff --git a/dev/modules/CoreGfx/MathGfx.h b/dev/modules/CoreGfx/MathGfx.h index 0b483fad..523f4b31 100644 --- a/dev/modules/CoreGfx/MathGfx.h +++ b/dev/modules/CoreGfx/MathGfx.h @@ -11,9 +11,9 @@ namespace UI { #ifdef NE_CORE_GFX_USE_DOUBLE -typedef double fb_real_t; +typedef double cg_real_t; #else -typedef float fb_real_t; +typedef float cg_real_t; #endif /// @brief Linear interpolation equation solver. @@ -21,7 +21,7 @@ typedef float fb_real_t; /// @param to to which value. /// @param stat /// @return Linear interop value. -inline fb_real_t fb_math_lerp(fb_real_t to, fb_real_t from, fb_real_t stat) { +inline cg_real_t cg_math_lerp(cg_real_t to, cg_real_t from, cg_real_t stat) { return (from) + (to - from) * stat; } } // namespace UI
\ No newline at end of file diff --git a/dev/modules/CoreGfx/TextGfx.h b/dev/modules/CoreGfx/TextGfx.h index 1bcc1397..359af6a8 100644 --- a/dev/modules/CoreGfx/TextGfx.h +++ b/dev/modules/CoreGfx/TextGfx.h @@ -145,7 +145,7 @@ inline const Kernel::UInt8 kFontBitmap[kFontNOFChars][kFontSizeX] = { };
-inline Kernel::Void fb_render_string_for_bitmap(const Kernel::UInt8* bitmap,
+inline Kernel::Void cg_render_string_for_bitmap(const Kernel::UInt8* bitmap,
const Kernel::SizeT x_sz, const Kernel::SizeT y_sz,
Kernel::Int32& x_dst, Kernel::Int32& y_dst,
Kernel::Int32& color) {
@@ -167,7 +167,7 @@ inline Kernel::Void fb_render_string_for_bitmap(const Kernel::UInt8* bitmap, }
}
-inline Kernel::Void fb_render_string(const Kernel::Char* text, Kernel::Int32 x_dst,
+inline Kernel::Void cg_render_string(const Kernel::Char* text, Kernel::Int32 x_dst,
Kernel::Int32 y_dst, Kernel::Int32 color) {
#ifndef __BOOTZ__
auto len = Kernel::rt_string_len(text);
@@ -176,7 +176,7 @@ inline Kernel::Void fb_render_string(const Kernel::Char* text, Kernel::Int32 x_d #endif
for (Kernel::SizeT i = 0; i < len; ++i) {
- fb_render_string_for_bitmap(&kFontBitmap[(Kernel::UInt8) text[i]][0], kFontSizeX, kFontSizeY,
+ cg_render_string_for_bitmap(&kFontBitmap[(Kernel::UInt8) text[i]][0], kFontSizeX, kFontSizeY,
x_dst, y_dst, color);
y_dst += kFontSizeY;
}
diff --git a/dev/modules/HPET/.gitkeep b/dev/modules/HPET/.gitkeep deleted file mode 100644 index e69de29b..00000000 --- a/dev/modules/HPET/.gitkeep +++ /dev/null |
