diff options
| -rw-r--r-- | Icons/kernel-logo.ico | bin | 108478 -> 250942 bytes | |||
| -rw-r--r-- | Kernel/KernelKit/PCI/Dma.inl | 2 | ||||
| -rw-r--r-- | Kernel/KernelKit/PCI/IO-Impl-AMD64.inl | 6 | ||||
| -rw-r--r-- | Kernel/KernelKit/ThreadLocalStorage.inl | 12 | ||||
| -rw-r--r-- | Kernel/KernelRsrc.rsrc | 6 | ||||
| -rw-r--r-- | Kernel/NetworkKit/NetworkDevice.inl | 3 | ||||
| -rw-r--r-- | newoskrnl.files | 4 |
7 files changed, 21 insertions, 12 deletions
diff --git a/Icons/kernel-logo.ico b/Icons/kernel-logo.ico Binary files differindex 00724f48..fa00bb03 100644 --- a/Icons/kernel-logo.ico +++ b/Icons/kernel-logo.ico diff --git a/Kernel/KernelKit/PCI/Dma.inl b/Kernel/KernelKit/PCI/Dma.inl index 198b2609..1eca8081 100644 --- a/Kernel/KernelKit/PCI/Dma.inl +++ b/Kernel/KernelKit/PCI/Dma.inl @@ -4,7 +4,7 @@ ------------------------------------------- */ -namespace NewOS +namespace Kernel { template <class T> T* DMAWrapper::operator->() diff --git a/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl b/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl index 59dfd4c2..08d33945 100644 --- a/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl +++ b/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl @@ -12,7 +12,7 @@ ------------------------------------------- */ -namespace NewOS +namespace Kernel { template <SizeT Sz> template <typename T> @@ -20,12 +20,14 @@ namespace NewOS { switch (sizeof(T)) { +#ifdef __NEWOS_AMD64__ case 4: return HAL::In32(fPorts[index].Leak()); case 2: return HAL::In16(fPorts[index].Leak()); case 1: return HAL::In8(fPorts[index].Leak()); +#endif default: return 0xFFFF; } @@ -37,7 +39,7 @@ namespace NewOS { switch (sizeof(T)) { -#ifdef __x86_64__ +#ifdef __NEWOS_AMD64__ case 4: HAL::Out32(fPorts[index].Leak(), value); case 2: diff --git a/Kernel/KernelKit/ThreadLocalStorage.inl b/Kernel/KernelKit/ThreadLocalStorage.inl index 6dbff3a1..c6e61059 100644 --- a/Kernel/KernelKit/ThreadLocalStorage.inl +++ b/Kernel/KernelKit/ThreadLocalStorage.inl @@ -6,14 +6,14 @@ //! @brief Allocates a pointer from the process's tls. -#ifndef __PROCESS_MANAGER__ +#ifndef _INC_PROCESS_SCHEDULER_HXX_ #include <KernelKit/ProcessScheduler.hxx> #endif template <typename T> inline T* tls_new_ptr(void) { - using namespace NewOS; + using namespace Kernel; MUST_PASS(ProcessScheduler::The().Leak().TheCurrent()); @@ -30,7 +30,7 @@ inline bool tls_delete_ptr(T* ptr) if (!ptr) return false; - using namespace NewOS; + using namespace Kernel; MUST_PASS(ProcessScheduler::The().Leak().TheCurrent()); @@ -48,9 +48,11 @@ T* tls_new_class(Args&&... args) { T* ptr = tls_new_ptr<T>(); + using namespace Kernel; + if (ptr) { - *ptr = T(NewOS::forward(args)...); + *ptr = T(forward(args)...); return ptr; } @@ -66,4 +68,4 @@ inline bool tls_delete_class(T* ptr) { ptr->~T(); return tls_delete_ptr(ptr); -}
\ No newline at end of file +} diff --git a/Kernel/KernelRsrc.rsrc b/Kernel/KernelRsrc.rsrc index 39b3070a..c16b4ba0 100644 --- a/Kernel/KernelRsrc.rsrc +++ b/Kernel/KernelRsrc.rsrc @@ -1,4 +1,4 @@ -1 ICON "../Icons/bonjour-logo.ico" +1 ICON "../Icons/kernel-logo.ico" #include "CompilerKit/Version.hxx" @@ -11,9 +11,9 @@ BEGIN BLOCK "080904E4" BEGIN VALUE "CompanyName", "Zeta Electronics Corporation" - VALUE "FileDescription", "Zeta OS kernel." + VALUE "FileDescription", "NewOS Kernel." VALUE "FileVersion", KERNEL_VERSION - VALUE "InternalName", "NeXUS" + VALUE "InternalName", "HCore" VALUE "LegalCopyright", "Zeta Electronics Corporation" VALUE "OriginalFilename", "newoskrnl.exe" VALUE "ProductName", "NewOSKrnl" diff --git a/Kernel/NetworkKit/NetworkDevice.inl b/Kernel/NetworkKit/NetworkDevice.inl index 3182c9f3..df1b9c81 100644 --- a/Kernel/NetworkKit/NetworkDevice.inl +++ b/Kernel/NetworkKit/NetworkDevice.inl @@ -8,7 +8,7 @@ Dtor and ctors. */ -namespace NewOS +namespace Kernel { NetworkDevice::NetworkDevice(void (*out)(NetworkDeviceCommand), void (*in)(NetworkDeviceCommand), @@ -25,6 +25,7 @@ namespace NewOS MUST_PASS(fCleanup); kcout << "newoskrnl: NetworkDevice cleanup.\r"; + if (fCleanup) fCleanup(); } diff --git a/newoskrnl.files b/newoskrnl.files index 193f3279..623f0383 100644 --- a/newoskrnl.files +++ b/newoskrnl.files @@ -16,6 +16,10 @@ Boot/BootKit/Vendor/Support.hxx Boot/BootKit/compile_flags.txt
Boot/NetBoot/Module.cxx
Boot/NetBoot/NetBoot.hxx
+Kernel/KernelKit/ThreadLocalStorage.inl
+Kernel/KernelKit/PCI/Dma.inl
+Kernel/KernelKit/PCI/IO-Impl-AMD64.inl
+Kernel/NetworkKit/NetworkDevice.inl
Boot/ReadMe.md
Boot/Sources/HEL/AMD64/BootAHCI.cxx
Boot/Sources/HEL/AMD64/BootATA.cxx
|