summaryrefslogtreecommitdiffhomepage
path: root/Private/HALKit
diff options
context:
space:
mode:
Diffstat (limited to 'Private/HALKit')
-rw-r--r--Private/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cpp32
-rw-r--r--Private/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp4
-rw-r--r--Private/HALKit/AMD64/HalKernelMain.cxx9
-rw-r--r--Private/HALKit/AMD64/Storage/ATA-PIO.cxx16
4 files changed, 26 insertions, 35 deletions
diff --git a/Private/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cpp b/Private/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cpp
index aa9c0e47..99a66532 100644
--- a/Private/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cpp
+++ b/Private/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cpp
@@ -9,86 +9,86 @@
#include <NewKit/String.hpp>
/// @brief Handle GPF fault.
-/// @param rsp
+/// @param rsp
EXTERN_C void idt_handle_gpf(NewOS::UIntPtr rsp) {
MUST_PASS(NewOS::ProcessScheduler::Shared().Leak().GetCurrent());
- NewOS::kcout << "NewOS: Stack Pointer: "
+ NewOS::kcout << "New OS: Stack Pointer: "
<< NewOS::StringBuilder::FromInt("rsp{%}", rsp);
NewOS::kcout
- << "NewOS: General Protection Fault, caused by "
+ << "New OS: General Protection Fault, caused by "
<< NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().GetName();
NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().Crash();
}
/// @brief Handle the scheduler interrupt, raised from the HPET timer.
-/// @param rsp
+/// @param rsp
EXTERN_C void idt_handle_scheduler(NewOS::UIntPtr rsp) {
NewOS::kcout << NewOS::StringBuilder::FromInt("rsp{%}", rsp);
NewOS::kcout
- << "NewOS: Will be scheduled back later "
+ << "New OS: Will be scheduled back later "
<< NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().GetName()
<< NewOS::end_line();
/// schedule another process.
if (!NewOS::ProcessHelper::StartScheduling()) {
- NewOS::kcout << "NewOS: Continue schedule this process...\r\n";
+ NewOS::kcout << "New OS: Continue schedule this process...\r\n";
}
}
/// @brief Handle page fault.
-/// @param rsp
+/// @param rsp
EXTERN_C void idt_handle_pf(NewOS::UIntPtr rsp) {
MUST_PASS(NewOS::ProcessScheduler::Shared().Leak().GetCurrent());
NewOS::kcout << NewOS::StringBuilder::FromInt("rsp{%}", rsp);
NewOS::kcout
- << "NewOS: Segmentation Fault, caused by "
+ << "New OS: Segmentation Fault, caused by "
<< NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().GetName();
NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().Crash();
}
/// @brief Handle math fault.
-/// @param rsp
+/// @param rsp
EXTERN_C void idt_handle_math(NewOS::UIntPtr rsp) {
MUST_PASS(NewOS::ProcessScheduler::Shared().Leak().GetCurrent());
NewOS::kcout << NewOS::StringBuilder::FromInt("rsp{%}", rsp);
NewOS::kcout
- << "NewOS: Math error, caused by "
+ << "New OS: Math error, caused by "
<< NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().GetName();
NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().Crash();
}
/// @brief Handle any generic fault.
-/// @param rsp
+/// @param rsp
EXTERN_C void idt_handle_generic(NewOS::UIntPtr rsp) {
MUST_PASS(NewOS::ProcessScheduler::Shared().Leak().GetCurrent());
NewOS::kcout << NewOS::StringBuilder::FromInt("sp{%}", rsp);
NewOS::kcout
- << "NewOS: Execution error, caused by "
+ << "New OS: Execution error, caused by "
<< NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().GetName();
NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().Crash();
}
/// @brief Handle #UD fault.
-/// @param rsp
+/// @param rsp
EXTERN_C void idt_handle_ud(NewOS::UIntPtr rsp) {
MUST_PASS(NewOS::ProcessScheduler::Shared().Leak().GetCurrent());
- NewOS::kcout << "NewOS: Stack Pointer: "
+ NewOS::kcout << "New OS: Stack Pointer: "
<< NewOS::StringBuilder::FromInt("rsp{%}", rsp);
NewOS::kcout
- << "NewOS: Invalid interrupt, caused by "
+ << "New OS: Invalid interrupt, caused by "
<< NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().GetName();
NewOS::ProcessScheduler::Shared().Leak().GetCurrent().Leak().Crash();
-} \ No newline at end of file
+}
diff --git a/Private/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp b/Private/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp
index 98d64215..0761114d 100644
--- a/Private/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp
+++ b/Private/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp
@@ -92,14 +92,14 @@ STATIC MadtType* kApicInfoBlock = nullptr;
///////////////////////////////////////////////////////////////////////////////////////
void hal_system_get_cores(voidPtr rsdPtr) {
- kcout << "NewOS: Constructing ACPIFactoryInterface...\r\n";
+ kcout << "New OS: Constructing ACPIFactoryInterface...\r\n";
auto acpi = ACPIFactoryInterface(rsdPtr);
kApicMadt = acpi.Find(kApicSignature).Leak().Leak();
MUST_PASS(kApicMadt); // MADT must exist.
- kcout << "NewOS: Successfuly fetched the MADT!\r\n";
+ kcout << "New OS: Successfuly fetched the MADT!\r\n";
kApicInfoBlock = (MadtType*)kApicMadt;
}
diff --git a/Private/HALKit/AMD64/HalKernelMain.cxx b/Private/HALKit/AMD64/HalKernelMain.cxx
index 7d8c516d..13d040b5 100644
--- a/Private/HALKit/AMD64/HalKernelMain.cxx
+++ b/Private/HALKit/AMD64/HalKernelMain.cxx
@@ -74,15 +74,6 @@ EXTERN_C void hal_init_platform(
/// END POST
- ToolboxInitRsrc();
-
- ToolboxDrawRsrc(
- MahroussLogic, MAHROUSSLOGIC_HEIGHT, MAHROUSSLOGIC_WIDTH,
- ((kHandoverHeader->f_GOP.f_Width - MAHROUSSLOGIC_WIDTH) / 2),
- ((kHandoverHeader->f_GOP.f_Height - MAHROUSSLOGIC_HEIGHT) / 2));
-
- ToolboxClearRsrc();
-
AppMain();
NewOS::ke_stop(RUNTIME_CHECK_BOOTSTRAP);
diff --git a/Private/HALKit/AMD64/Storage/ATA-PIO.cxx b/Private/HALKit/AMD64/Storage/ATA-PIO.cxx
index ebced11c..3cbba6f7 100644
--- a/Private/HALKit/AMD64/Storage/ATA-PIO.cxx
+++ b/Private/HALKit/AMD64/Storage/ATA-PIO.cxx
@@ -72,7 +72,7 @@ ATAInit_Retry:
auto statRdy = In8(IO + ATA_REG_STATUS);
if (statRdy & ATA_SR_ERR) {
- kcout << "NewOS: ATA: Select error, not an IDE based hard-drive.\r\n";
+ kcout << "New OS: ATA: Select error, not an IDE based hard-drive.\r\n";
return false;
}
@@ -107,21 +107,21 @@ ATAInit_Retry:
/* differentiate ATA, ATAPI, SATA and SATAPI */
if (cl == 0x14 && ch == 0xEB) {
- kcout << "NewOS: PATAPI drive detected.\r\n";
+ kcout << "New OS: PATAPI drive detected.\r\n";
kATADeviceType = kATADevicePATA_PI;
}
if (cl == 0x69 && ch == 0x96) {
- kcout << "NewOS: SATAPI drive detected.\r\n";
+ kcout << "New OS: SATAPI drive detected.\r\n";
kATADeviceType = kATADeviceSATA_PI;
}
if (cl == 0x0 && ch == 0x0) {
- kcout << "NewOS: PATA drive detected.\r\n";
+ kcout << "New OS: PATA drive detected.\r\n";
kATADeviceType = kATADevicePATA;
}
if (cl == 0x3c && ch == 0xc3) {
- kcout << "NewOS: SATA drive detected.\r\n";
+ kcout << "New OS: SATA drive detected.\r\n";
kATADeviceType = kATADeviceSATA;
}
@@ -148,7 +148,7 @@ Void drv_std_read(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf,
for (SizeT IndexOff = 0; IndexOff < Size; ++IndexOff) {
WideChar chr = In16(IO + ATA_REG_DATA);
-
+
Buf[IndexOff] = chr;
}
}
@@ -171,11 +171,11 @@ Void drv_std_write(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf,
for (SizeT IndexOff = 0; IndexOff < Size; ++IndexOff) {
Out16(IO + ATA_REG_DATA, Buf[IndexOff]);
-
+
}
}
/// @check is ATA detected?
Boolean drv_std_detected(Void) { return kATADetected; }
-#endif /* ifdef __ATA_PIO__ */ \ No newline at end of file
+#endif /* ifdef __ATA_PIO__ */