diff options
179 files changed, 915 insertions, 916 deletions
diff --git a/Boot/BootKit/BootKit.hxx b/Boot/BootKit/BootKit.hxx index a253f137..309755df 100644 --- a/Boot/BootKit/BootKit.hxx +++ b/Boot/BootKit/BootKit.hxx @@ -39,7 +39,7 @@ class BFileReader; class BFileRunner; class BVersionString; -using namespace NewOS; +using namespace Kernel; typedef Char* PEFImagePtr; typedef Char* PEImagePtr; @@ -76,17 +76,17 @@ public: BTextWriter(const BTextWriter&) = default; }; -NewOS::SizeT BCopyMem(CharacterTypeUTF16* dest, CharacterTypeUTF16* src, const NewOS::SizeT len); +Kernel::SizeT BCopyMem(CharacterTypeUTF16* dest, CharacterTypeUTF16* src, const Kernel::SizeT len); -NewOS::SizeT BSetMem(CharacterTypeUTF8* src, const CharacterTypeUTF8 byte, const NewOS::SizeT len); +Kernel::SizeT BSetMem(CharacterTypeUTF8* src, const CharacterTypeUTF8 byte, const Kernel::SizeT len); /// String length functions. /// @brief get string length. -NewOS::SizeT BStrLen(const CharacterTypeUTF16* ptr); +Kernel::SizeT BStrLen(const CharacterTypeUTF16* ptr); /// @brief set memory with custom value. -NewOS::SizeT BSetMem(CharacterTypeUTF16* src, const CharacterTypeUTF16 byte, const NewOS::SizeT len); +Kernel::SizeT BSetMem(CharacterTypeUTF16* src, const CharacterTypeUTF16 byte, const Kernel::SizeT len); /** * @brief BootKit File Reader class diff --git a/Boot/BootKit/Device.hxx b/Boot/BootKit/Device.hxx index ca427dc7..234ab6bd 100644 --- a/Boot/BootKit/Device.hxx +++ b/Boot/BootKit/Device.hxx @@ -8,7 +8,7 @@ #include <Modules/ATA/ATA.hxx> -using namespace NewOS; +using namespace Kernel; /// @brief Device type. class Device diff --git a/Boot/BootKit/HW/ATA.hxx b/Boot/BootKit/HW/ATA.hxx index e789a48f..569c2a86 100644 --- a/Boot/BootKit/HW/ATA.hxx +++ b/Boot/BootKit/HW/ATA.hxx @@ -9,7 +9,7 @@ #include <Modules/ATA/ATA.hxx> #include <BootKit/Device.hxx> -using namespace NewOS; +using namespace Kernel; class BootDeviceATA final : public Device { diff --git a/Boot/BootKit/HW/SATA.hxx b/Boot/BootKit/HW/SATA.hxx index f41879cc..bf6c7e82 100644 --- a/Boot/BootKit/HW/SATA.hxx +++ b/Boot/BootKit/HW/SATA.hxx @@ -19,9 +19,9 @@ public: struct SATATrait final { - NewOS::SizeT mBase{1024}; - NewOS::Boolean mErr{false}; - NewOS::Boolean mDetected{false}; + Kernel::SizeT mBase{1024}; + Kernel::Boolean mErr{false}; + Kernel::Boolean mDetected{false}; operator bool() { @@ -34,8 +34,8 @@ public: return this->Leak().mDetected; } - BootDeviceSATA& Read(NewOS::WideChar* Buf, const NewOS::SizeT& SecCount); - BootDeviceSATA& Write(NewOS::WideChar* Buf, const NewOS::SizeT& SecCount); + BootDeviceSATA& Read(Kernel::WideChar* Buf, const Kernel::SizeT& SecCount); + BootDeviceSATA& Write(Kernel::WideChar* Buf, const Kernel::SizeT& SecCount); SATATrait& Leak(); diff --git a/Boot/BootKit/Vendor/Qr.hxx b/Boot/BootKit/Vendor/Qr.hxx index 1cfc214e..bb560878 100644 --- a/Boot/BootKit/Vendor/Qr.hxx +++ b/Boot/BootKit/Vendor/Qr.hxx @@ -965,9 +965,9 @@ namespace qr }; } // namespace qr -namespace NewOS::Qr +namespace Kernel::Qr { using namespace qr; -} // namespace NewOS::Qr +} // namespace Kernel::Qr #endif diff --git a/Boot/NetBoot/NetBoot.hxx b/Boot/NetBoot/NetBoot.hxx index e3119c5f..24176c4a 100644 --- a/Boot/NetBoot/NetBoot.hxx +++ b/Boot/NetBoot/NetBoot.hxx @@ -20,7 +20,7 @@ typedef struct NetBootInternetHeader CharacterTypeUTF8 NB4; /// magic char 4 'B' CharacterTypeUTF8 PatchName[255]; /// example: ColdChoco - NewOS::Int32 PatchLength; /// the patch length. + Kernel::Int32 PatchLength; /// the patch length. CharacterTypeUTF8 PatchTarget[255]; /// the target file. - NewOS::Boolean ImpliesROM; /// does it implies EEPROM patching? + Kernel::Boolean ImpliesROM; /// does it implies EEPROM patching? } NetBootInternetHeader; diff --git a/Boot/Sources/HEL/AMD64/BootPlatform.cxx b/Boot/Sources/HEL/AMD64/BootPlatform.cxx index 66fe2f8d..e700a8de 100644 --- a/Boot/Sources/HEL/AMD64/BootPlatform.cxx +++ b/Boot/Sources/HEL/AMD64/BootPlatform.cxx @@ -96,7 +96,7 @@ EXTERN_C UInt32 In32(UInt16 port) void rt_hlt() { - NewOS::HAL::rt_halt(); + Kernel::HAL::rt_halt(); } #endif // 0 diff --git a/Boot/Sources/HEL/AMD64/BootString.cxx b/Boot/Sources/HEL/AMD64/BootString.cxx index 384cef33..f811130f 100644 --- a/Boot/Sources/HEL/AMD64/BootString.cxx +++ b/Boot/Sources/HEL/AMD64/BootString.cxx @@ -19,7 +19,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////////////// -NewOS::SizeT BCopyMem(CharacterTypeUTF16* dest, CharacterTypeUTF16* src, const NewOS::SizeT len) +Kernel::SizeT BCopyMem(CharacterTypeUTF16* dest, CharacterTypeUTF16* src, const Kernel::SizeT len) { if (!dest || !src) return 0; @@ -33,12 +33,12 @@ NewOS::SizeT BCopyMem(CharacterTypeUTF16* dest, CharacterTypeUTF16* src, const N return index; } -NewOS::SizeT BStrLen(const CharacterTypeUTF16* ptr) +Kernel::SizeT BStrLen(const CharacterTypeUTF16* ptr) { if (!ptr) return 0; - NewOS::SizeT cnt = 0; + Kernel::SizeT cnt = 0; while (*ptr != (CharacterTypeUTF16)0) { @@ -49,12 +49,12 @@ NewOS::SizeT BStrLen(const CharacterTypeUTF16* ptr) return cnt; } -NewOS::SizeT BSetMem(CharacterTypeUTF16* src, const CharacterTypeUTF16 byte, const NewOS::SizeT len) +Kernel::SizeT BSetMem(CharacterTypeUTF16* src, const CharacterTypeUTF16 byte, const Kernel::SizeT len) { if (!src) return 0; - NewOS::SizeT cnt = 0UL; + Kernel::SizeT cnt = 0UL; while (*src != 0) { @@ -70,12 +70,12 @@ NewOS::SizeT BSetMem(CharacterTypeUTF16* src, const CharacterTypeUTF16 byte, con return cnt; } -NewOS::SizeT BSetMem(CharacterTypeUTF8* src, const CharacterTypeUTF8 byte, const NewOS::SizeT len) +Kernel::SizeT BSetMem(CharacterTypeUTF8* src, const CharacterTypeUTF8 byte, const Kernel::SizeT len) { if (!src) return 0; - NewOS::SizeT cnt = 0UL; + Kernel::SizeT cnt = 0UL; while (*src != 0) { @@ -42,7 +42,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = "NewOS" +PROJECT_NAME = "Kernel" # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version diff --git a/Kernel/ArchKit/ArchKit.hpp b/Kernel/ArchKit/ArchKit.hpp index 639a3f04..622d7219 100644 --- a/Kernel/ArchKit/ArchKit.hpp +++ b/Kernel/ArchKit/ArchKit.hpp @@ -22,7 +22,7 @@ #error !!! unknown architecture !!! #endif -namespace NewOS +namespace Kernel { constexpr static inline SSizeT rt_hash_seed(const char* seed, int mul) { @@ -77,28 +77,28 @@ namespace NewOS kcout << "\r"; } -} // namespace NewOS +} // namespace Kernel #define kKernelMaxSystemCalls (256) -typedef NewOS::Void (*rt_syscall_proc)(NewOS::VoidPtr); +typedef Kernel::Void (*rt_syscall_proc)(Kernel::VoidPtr); struct RTSyscallInfoHdr final { - NewOS::Int64 fHash; - NewOS::Bool fHooked; + Kernel::Int64 fHash; + Kernel::Bool fHooked; rt_syscall_proc fProc; }; -inline NewOS::Array<RTSyscallInfoHdr, +inline Kernel::Array<RTSyscallInfoHdr, kKernelMaxSystemCalls> kSyscalls; -inline NewOS::Array<RTSyscallInfoHdr, +inline Kernel::Array<RTSyscallInfoHdr, kKernelMaxSystemCalls> kKerncalls; -EXTERN_C NewOS::HAL::StackFramePtr rt_get_current_context(); -EXTERN_C NewOS::Void rt_do_context_switch(NewOS::HAL::StackFramePtr stackFrame); +EXTERN_C Kernel::HAL::StackFramePtr rt_get_current_context(); +EXTERN_C Kernel::Void rt_do_context_switch(Kernel::HAL::StackFramePtr stackFrame); #include <FirmwareKit/Handover.hxx> diff --git a/Kernel/CFKit/GUIDWizard.hpp b/Kernel/CFKit/GUIDWizard.hpp index 34c38e8d..6fd747e9 100644 --- a/Kernel/CFKit/GUIDWizard.hpp +++ b/Kernel/CFKit/GUIDWizard.hpp @@ -15,8 +15,8 @@ #include <NewKit/Stream.hpp> #include <NewKit/String.hpp> -namespace NewOS::XRN::Version1 +namespace Kernel::XRN::Version1 { Ref<GUIDSequence*> make_sequence(const ArrayList<UShort>& seq); - ErrorOr<Ref<NewOS::StringView>> try_guid_to_string(Ref<GUIDSequence*>& guid); -} // namespace NewOS::XRN::Version1 + ErrorOr<Ref<Kernel::StringView>> try_guid_to_string(Ref<GUIDSequence*>& guid); +} // namespace Kernel::XRN::Version1 diff --git a/Kernel/CFKit/GUIDWrapper.hpp b/Kernel/CFKit/GUIDWrapper.hpp index d25895b8..f8f08591 100644 --- a/Kernel/CFKit/GUIDWrapper.hpp +++ b/Kernel/CFKit/GUIDWrapper.hpp @@ -15,7 +15,7 @@ #define kXRNNil "@{........-....-M...-N...-............}" // eXtensible Resource Information -namespace NewOS::XRN +namespace Kernel::XRN { union GUIDSequence { alignas(8) UShort u8[16]; @@ -55,4 +55,4 @@ namespace NewOS::XRN private: GUIDSequence fUUID; }; -} // namespace NewOS::XRN +} // namespace Kernel::XRN diff --git a/Kernel/CFKit/Property.hpp b/Kernel/CFKit/Property.hpp index 5c5aeb8f..f75e7f95 100644 --- a/Kernel/CFKit/Property.hpp +++ b/Kernel/CFKit/Property.hpp @@ -12,7 +12,7 @@ #include <NewKit/Function.hpp> #include <NewKit/String.hpp> -namespace NewOS +namespace Kernel { /// @brief handle to anything (number, ptr, string...) using PropertyId = UIntPtr; @@ -39,6 +39,6 @@ namespace NewOS template <SizeT N> using PropertyArray = Array<Property, N>; -} // namespace NewOS +} // namespace Kernel #endif // !__INC_PLIST_HPP__ diff --git a/Kernel/CFKit/URL.hpp b/Kernel/CFKit/URL.hpp index daf6a356..049e1194 100644 --- a/Kernel/CFKit/URL.hpp +++ b/Kernel/CFKit/URL.hpp @@ -10,7 +10,7 @@ #include <NewKit/Defines.hpp> #include <NewKit/String.hpp> -namespace NewOS +namespace Kernel { class URL final { @@ -28,6 +28,6 @@ namespace NewOS ErrorOr<StringView> url_extract_location(const char* url); ErrorOr<StringView> url_extract_protocol(const char* url); -} // namespace NewOS +} // namespace Kernel #endif /* ifndef _INC_URL_HPP_ */ diff --git a/Kernel/CRT/__mpcc_exception.hxx b/Kernel/CRT/__mpcc_exception.hxx index 4e525353..846a1cde 100644 --- a/Kernel/CRT/__mpcc_exception.hxx +++ b/Kernel/CRT/__mpcc_exception.hxx @@ -32,14 +32,14 @@ namespace std inline void __throw_domain_error(const char* error) { - NewOS::kcout << "MPCC C++: Domain error: " << error << "\r"; + Kernel::kcout << "MPCC C++: Domain error: " << error << "\r"; __throw_general(); CANT_REACH(); // prevent from continuing. } inline void __throw_bad_array_new_length(void) { - NewOS::kcout << "MPCC C++: Bad array length.\r"; + Kernel::kcout << "MPCC C++: Bad array length.\r"; __throw_general(); CANT_REACH(); // prevent from continuing. } diff --git a/Kernel/CRT/__mpcc_malloc.hxx b/Kernel/CRT/__mpcc_malloc.hxx index 3d736f2a..31fb631d 100644 --- a/Kernel/CRT/__mpcc_malloc.hxx +++ b/Kernel/CRT/__mpcc_malloc.hxx @@ -13,15 +13,15 @@ namespace stdx /// @brief allocate a new class. /// @tparam KindClass the class type to allocate. template <typename KindClass, typename... Args> - inline NewOS::VoidPtr allocate(Args&&... args) + inline Kernel::VoidPtr allocate(Args&&... args) { - return new KindClass(NewOS::forward(args)...); + return new KindClass(Kernel::forward(args)...); } /// @brief free a class. /// @tparam KindClass the class type to allocate. template <typename KindClass> - inline NewOS::Void release(KindClass ptr) + inline Kernel::Void release(KindClass ptr) { if (!ptr) return; diff --git a/Kernel/FSKit/IndexableProperty.hxx b/Kernel/FSKit/IndexableProperty.hxx index 9e9ccf22..d1001415 100644 --- a/Kernel/FSKit/IndexableProperty.hxx +++ b/Kernel/FSKit/IndexableProperty.hxx @@ -13,7 +13,7 @@ #define kIndexerNodeNameLength 255 #define kIndexerClaimed 0xCF -namespace NewOS +namespace Kernel { namespace Indexer { @@ -56,4 +56,4 @@ namespace NewOS /// @return none. Void fs_index_file(const Char* filename, SizeT filenameLen, IndexableProperty& indexer); } // namespace Indexer -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/FSKit/NewFS.hxx b/Kernel/FSKit/NewFS.hxx index 4c81dc85..bcef3797 100644 --- a/Kernel/FSKit/NewFS.hxx +++ b/Kernel/FSKit/NewFS.hxx @@ -77,7 +77,7 @@ default. #define kNewFSEOF (-1) #define kNewFSBitWidth (sizeof(NewCharType)) -#define kNewFSLbaType (NewOS::Lba) +#define kNewFSLbaType (Kernel::Lba) /// Start After the PM headers, pad 1024 bytes. #define kNewFSStartLba (1024) @@ -98,7 +98,7 @@ default. #define kNewFSForkNameLen (200U) -typedef NewOS::Char NewCharType; +typedef Kernel::Char NewCharType; enum { @@ -118,23 +118,23 @@ struct PACKED NewCatalog final NewCharType Mime[kNewFSMimeNameLen]; /// Catalog status flag. - NewOS::UInt16 Flags; + Kernel::UInt16 Flags; /// Custom catalog flags. - NewOS::UInt16 FileFlags; + Kernel::UInt16 FileFlags; /// Catalog kind. - NewOS::Int32 Kind; + Kernel::Int32 Kind; /// Size of the data fork. - NewOS::Lba DataForkSize; + Kernel::Lba DataForkSize; /// Size of all resource forks. - NewOS::Lba ResourceForkSize; + Kernel::Lba ResourceForkSize; - NewOS::Lba DataFork; - NewOS::Lba ResourceFork; + Kernel::Lba DataFork; + Kernel::Lba ResourceFork; - NewOS::Lba NextSibling; - NewOS::Lba PrevSibling; + Kernel::Lba NextSibling; + Kernel::Lba PrevSibling; }; /// @brief Fork type, contains a data page. @@ -144,20 +144,20 @@ struct PACKED NewCatalog final struct PACKED NewFork final { NewCharType ForkName[kNewFSForkNameLen]; - NewOS::Char CatalogName[kNewFSNodeNameLen]; + Kernel::Char CatalogName[kNewFSNodeNameLen]; - NewOS::Int32 Flags; - NewOS::Int32 Kind; + Kernel::Int32 Flags; + Kernel::Int32 Kind; - NewOS::Int64 ResourceId; - NewOS::Int32 ResourceKind; - NewOS::Int32 ResourceFlags; + Kernel::Int64 ResourceId; + Kernel::Int32 ResourceKind; + Kernel::Int32 ResourceFlags; - NewOS::Lba DataOffset; // 8 Where to look for this data? - NewOS::SizeT DataSize; /// Data size according using sector count. + Kernel::Lba DataOffset; // 8 Where to look for this data? + Kernel::SizeT DataSize; /// Data size according using sector count. - NewOS::Lba NextSibling; - NewOS::Lba PreviousSibling; + Kernel::Lba NextSibling; + Kernel::Lba PreviousSibling; }; /// @brief Partition block type @@ -166,26 +166,26 @@ struct PACKED NewPartitionBlock final NewCharType Ident[kNewFSIdentLen]; NewCharType PartitionName[kPartLen]; - NewOS::Int32 Flags; - NewOS::Int32 Kind; + Kernel::Int32 Flags; + Kernel::Int32 Kind; - NewOS::Lba StartCatalog; - NewOS::SizeT CatalogCount; + Kernel::Lba StartCatalog; + Kernel::SizeT CatalogCount; - NewOS::SizeT DiskSize; + Kernel::SizeT DiskSize; - NewOS::SizeT FreeCatalog; - NewOS::SizeT FreeSectors; + Kernel::SizeT FreeCatalog; + Kernel::SizeT FreeSectors; - NewOS::SizeT SectorCount; - NewOS::SizeT SectorSize; + Kernel::SizeT SectorCount; + Kernel::SizeT SectorSize; - NewOS::UInt64 Version; + Kernel::UInt64 Version; - NewOS::Char Pad[kNewFSPadLen]; + Kernel::Char Pad[kNewFSPadLen]; }; -namespace NewOS +namespace Kernel { enum @@ -292,22 +292,22 @@ namespace NewOS { Boolean fs_init_newfs(Void) noexcept; } // namespace Detail -} // namespace NewOS +} // namespace Kernel /// @brief Write to newfs disk. /// @param Mnt mounted interface. /// @param DrvTrait drive info /// @param DrvIndex drive index. /// @return -NewOS::Int32 fs_newfs_write(NewOS::MountpointInterface* Mnt, - NewOS::DriveTrait& DrvTrait, - NewOS::Int32 DrvIndex); +Kernel::Int32 fs_newfs_write(Kernel::MountpointInterface* Mnt, + Kernel::DriveTrait& DrvTrait, + Kernel::Int32 DrvIndex); /// @brief Read from newfs disk. /// @param Mnt mounted interface. /// @param DrvTrait drive info /// @param DrvIndex drive index. /// @return -NewOS::Int32 fs_newfs_read(NewOS::MountpointInterface* Mnt, - NewOS::DriveTrait& DrvTrait, - NewOS::Int32 DrvIndex); +Kernel::Int32 fs_newfs_read(Kernel::MountpointInterface* Mnt, + Kernel::DriveTrait& DrvTrait, + Kernel::Int32 DrvIndex); diff --git a/Kernel/FirmwareKit/EFI/EFI.hxx b/Kernel/FirmwareKit/EFI/EFI.hxx index ae3bd042..922044d4 100644 --- a/Kernel/FirmwareKit/EFI/EFI.hxx +++ b/Kernel/FirmwareKit/EFI/EFI.hxx @@ -8,7 +8,7 @@ #define __EFI__ /** -@brief NewOS Implementation of EFI. +@brief Kernel Implementation of EFI. @note This API is in WiP, so it's not 'pretty', just deal with it. We'll be improving that later. @author Amlal El Mahrouss @@ -16,7 +16,7 @@ improving that later. #include <NewKit/Defines.hpp> -using namespace NewOS; +using namespace Kernel; /* we always use stdcall in EFI, the pascal way of calling functions. */ diff --git a/Kernel/FirmwareKit/EPM.hxx b/Kernel/FirmwareKit/EPM.hxx index 3b2335cf..9669e324 100644 --- a/Kernel/FirmwareKit/EPM.hxx +++ b/Kernel/FirmwareKit/EPM.hxx @@ -22,10 +22,10 @@ /// @brief EPM GUID structure. typedef struct BlockGUID { - NewOS::UInt32 Data1; - NewOS::UInt16 Data2; - NewOS::UInt16 Data3; - NewOS::UInt8 Data4[8]; + Kernel::UInt32 Data1; + Kernel::UInt16 Data2; + Kernel::UInt16 Data3; + Kernel::UInt8 Data4[8]; } BlockGUID; /** @@ -34,17 +34,17 @@ typedef struct BlockGUID */ struct PACKED BootBlock { - NewOS::Char Magic[kEPMMagicLength]; - NewOS::Char Name[kEPMNameLength]; + Kernel::Char Magic[kEPMMagicLength]; + Kernel::Char Name[kEPMNameLength]; BlockGUID Uuid; - NewOS::Int32 Version; - NewOS::Int64 NumBlocks; - NewOS::Int64 SectorSz; - NewOS::Int64 LbaStart; - NewOS::Int16 Kind; - NewOS::Int32 FsVersion; - NewOS::Char Fs[kEPMFilesystemLength]; /* NewFS, ffs2... */ - NewOS::Char Reserved[409]; // to fill a full sector. + Kernel::Int32 Version; + Kernel::Int64 NumBlocks; + Kernel::Int64 SectorSz; + Kernel::Int64 LbaStart; + Kernel::Int16 Kind; + Kernel::Int32 FsVersion; + Kernel::Char Fs[kEPMFilesystemLength]; /* NewFS, ffs2... */ + Kernel::Char Reserved[409]; // to fill a full sector. }; /* @brief AMD64 magic for EPM */ diff --git a/Kernel/FirmwareKit/Handover.hxx b/Kernel/FirmwareKit/Handover.hxx index 19602fc3..02e5fb21 100644 --- a/Kernel/FirmwareKit/Handover.hxx +++ b/Kernel/FirmwareKit/Handover.hxx @@ -26,7 +26,7 @@ #define kHandoverStructSz sizeof(HEL::HandoverHeader) -namespace NewOS::HEL +namespace Kernel::HEL { /** @brief the kind of executable we're loading. @@ -100,11 +100,11 @@ it tells us more about it and IS format independent. }; /// @brief Bootloader main type. - typedef void (*BootMainKind)(NewOS::HEL::HandoverInformationHeader* handoverInfo); + typedef void (*BootMainKind)(Kernel::HEL::HandoverInformationHeader* handoverInfo); /// @brief Alias of bootloader main type. typedef void (*HandoverProc)(HandoverInformationHeader* handoverInfo); -} // namespace NewOS::HEL +} // namespace Kernel::HEL /// @brief Bootloader global header. -inline NewOS::HEL::HandoverInformationHeader* kHandoverHeader = nullptr; +inline Kernel::HEL::HandoverInformationHeader* kHandoverHeader = nullptr; diff --git a/Kernel/HALKit/64x0/HalVirtualMemory.cxx b/Kernel/HALKit/64x0/HalVirtualMemory.cxx index bb4357f4..f62f888f 100644 --- a/Kernel/HALKit/64x0/HalVirtualMemory.cxx +++ b/Kernel/HALKit/64x0/HalVirtualMemory.cxx @@ -7,7 +7,7 @@ #include <HALKit/POWER/Processor.hpp> #include <KernelKit/DebugOutput.hpp> -using namespace NewOS; +using namespace Kernel; /// @brief Flush system TLB, looks like the POWER version, as it acts the same, no specific instruction for that. /// @note The 88K MMU should be present as well. diff --git a/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cxx b/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cxx index 7a54edfa..ca6a7417 100644 --- a/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cxx +++ b/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cxx @@ -10,7 +10,7 @@ #include <ArchKit/ArchKit.hpp> #include <KernelKit/KernelHeap.hpp> -namespace NewOS +namespace Kernel { /// Custom to the virtual machine, you'll need to parse the MADT instead. @@ -138,4 +138,4 @@ namespace NewOS return chr == 0; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cpp b/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cpp index 657ab622..f41ee55e 100644 --- a/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cpp +++ b/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cpp @@ -10,84 +10,84 @@ /// @brief Handle GPF fault. /// @param rsp -EXTERN_C void idt_handle_gpf(NewOS::UIntPtr rsp) +EXTERN_C void idt_handle_gpf(Kernel::UIntPtr rsp) { - NewOS::kcout + Kernel::kcout << "newoskrnl: General Protection Fault, caused by " - << NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().GetName(); + << Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().GetName(); - NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().Crash(); + Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().Crash(); } /// @brief Handle page fault. /// @param rsp -EXTERN_C void idt_handle_pf(NewOS::UIntPtr rsp) +EXTERN_C void idt_handle_pf(Kernel::UIntPtr rsp) { - NewOS::kcout + Kernel::kcout << "newoskrnl: Segmentation Fault, caused by " - << NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().GetName(); + << Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().GetName(); - NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().Crash(); + Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().Crash(); } /// @brief Handle math fault. /// @param rsp -EXTERN_C void idt_handle_math(NewOS::UIntPtr rsp) +EXTERN_C void idt_handle_math(Kernel::UIntPtr rsp) { - NewOS::kcout + Kernel::kcout << "newoskrnl: Math error, caused by " - << NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().GetName(); + << Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().GetName(); - NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().Crash(); + Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().Crash(); } /// @brief Handle any generic fault. /// @param rsp -EXTERN_C void idt_handle_generic(NewOS::UIntPtr rsp) +EXTERN_C void idt_handle_generic(Kernel::UIntPtr rsp) { - NewOS::kcout + Kernel::kcout << "newoskrnl: Execution error, caused by " - << NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().GetName(); + << Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().GetName(); - NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().Crash(); + Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().Crash(); } /// @brief Handle #UD fault. /// @param rsp -EXTERN_C void idt_handle_ud(NewOS::UIntPtr rsp) +EXTERN_C void idt_handle_ud(Kernel::UIntPtr rsp) { - NewOS::kcout + Kernel::kcout << "newoskrnl: Invalid interrupt, caused by " - << NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().GetName(); + << Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().GetName(); - NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().Crash(); + Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().Crash(); } /// @brief Enter syscall from assembly. /// @param stack the stack pushed from assembly routine. /// @return nothing. -EXTERN_C NewOS::Void hal_system_call_enter(NewOS::UIntPtr rcx, NewOS::UIntPtr rdx) +EXTERN_C Kernel::Void hal_system_call_enter(Kernel::UIntPtr rcx, Kernel::UIntPtr rdx) { if (rcx <= (kSyscalls.Count() - 1)) { - NewOS::kcout << "newoskrnl: syscall: enter.\r"; + Kernel::kcout << "newoskrnl: syscall: enter.\r"; if (kSyscalls[rcx].Leak().Leak()->fHooked) - (kSyscalls[rcx].Leak().Leak()->fProc)((NewOS::VoidPtr)rdx); + (kSyscalls[rcx].Leak().Leak()->fProc)((Kernel::VoidPtr)rdx); - NewOS::kcout << "newoskrnl: syscall: exit.\r"; + Kernel::kcout << "newoskrnl: syscall: exit.\r"; } } /// @brief Enter kernel call from assembly (DDK only). /// @param stack the stack pushed from assembly routine. /// @return nothing. -EXTERN_C NewOS::Void hal_kernel_call_enter(NewOS::UIntPtr rcx, NewOS::UIntPtr rdx, NewOS::UIntPtr r8, NewOS::UIntPtr r9) +EXTERN_C Kernel::Void hal_kernel_call_enter(Kernel::UIntPtr rcx, Kernel::UIntPtr rdx, Kernel::UIntPtr r8, Kernel::UIntPtr r9) { if (rcx != 0) { - NewOS::kcout << "newoskrnl: kerncall: enter.\r"; + Kernel::kcout << "newoskrnl: kerncall: enter.\r"; - NewOS::kcout << "newoskrnl: kerncall: exit.\r"; + Kernel::kcout << "newoskrnl: kerncall: exit.\r"; } } diff --git a/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp b/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp index dfa02b11..94fe68ad 100644 --- a/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp +++ b/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp @@ -28,7 +28,7 @@ EXTERN_C void _hal_enable_smp(void); /////////////////////////////////////////////////////////////////////////////////////// -namespace NewOS::HAL +namespace Kernel::HAL { constexpr Int32 kThreadAPIC = 0; constexpr Int32 kThreadLAPIC = 1; @@ -142,8 +142,8 @@ namespace NewOS::HAL /// @return Void hal_send_start_ipi(UInt32 apicId, UInt8 vector, UInt32 targetAddress) { - NewOS::ke_dma_write(targetAddress, kAPIC_ICR_High, apicId << 24); - NewOS::ke_dma_write(targetAddress, kAPIC_ICR_Low, kAPIC_SIPI_Vector | vector); + Kernel::ke_dma_write(targetAddress, kAPIC_ICR_High, apicId << 24); + Kernel::ke_dma_write(targetAddress, kAPIC_ICR_Low, kAPIC_SIPI_Vector | vector); } EXTERN_C Void _hal_spin_core(Void); @@ -155,8 +155,8 @@ namespace NewOS::HAL /// @return Void hal_send_end_ipi(UInt32 apicId, UInt8 vector, UInt32 targetAddress) { - NewOS::ke_dma_write(targetAddress, kAPIC_ICR_High, apicId << 24); - NewOS::ke_dma_write(targetAddress, kAPIC_ICR_Low, kAPIC_EIPI_Vector | vector); + Kernel::ke_dma_write(targetAddress, kAPIC_ICR_High, apicId << 24); + Kernel::ke_dma_write(targetAddress, kAPIC_ICR_Low, kAPIC_EIPI_Vector | vector); } STATIC HAL::StackFramePtr cFramePtr = nullptr; @@ -232,18 +232,18 @@ namespace NewOS::HAL /// Start local APIC now. /////////////////////////////////////////////////////////////////////////// - auto flagsSet = NewOS::ke_dma_read(cBaseAddressAPIC, 0xF0); // SVR register. + auto flagsSet = Kernel::ke_dma_read(cBaseAddressAPIC, 0xF0); // SVR register. // enable APIC. flagsSet |= 0x100; - NewOS::ke_dma_write(cBaseAddressAPIC, 0xF0, flagsSet); + Kernel::ke_dma_write(cBaseAddressAPIC, 0xF0, flagsSet); /// Set sprurious interrupt vector. - NewOS::ke_dma_write(cBaseAddressAPIC, 0xF0, 0x100 | 0xFF); + Kernel::ke_dma_write(cBaseAddressAPIC, 0xF0, 0x100 | 0xFF); // highest task priority. for our realtime kernel. - NewOS::ke_dma_write(cBaseAddressAPIC, 0x21, 0); + Kernel::ke_dma_write(cBaseAddressAPIC, 0x21, 0); cProgramInitialized = new Boolean(true); @@ -257,6 +257,6 @@ namespace NewOS::HAL ke_stop(RUNTIME_CHECK_FAILED); } } -} // namespace NewOS::HAL +} // namespace Kernel::HAL /////////////////////////////////////////////////////////////////////////////////////// diff --git a/Kernel/HALKit/AMD64/HalDebugOutput.cxx b/Kernel/HALKit/AMD64/HalDebugOutput.cxx index 25c1546e..3dd70dc6 100644 --- a/Kernel/HALKit/AMD64/HalDebugOutput.cxx +++ b/Kernel/HALKit/AMD64/HalDebugOutput.cxx @@ -9,7 +9,7 @@ #include <KernelKit/Framebuffer.hpp> #include <NewKit/Utils.hpp> -namespace NewOS +namespace Kernel { enum CommStatus { @@ -137,9 +137,9 @@ namespace NewOS static TerminalDevice* out = nullptr; if (!out) - out = new TerminalDevice(NewOS::ke_io_write, NewOS::ke_io_read); + out = new TerminalDevice(Kernel::ke_io_write, Kernel::ke_io_read); return *out; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/HALKit/AMD64/HalDebugPort.cxx b/Kernel/HALKit/AMD64/HalDebugPort.cxx index 2644e247..a29a8129 100644 --- a/Kernel/HALKit/AMD64/HalDebugPort.cxx +++ b/Kernel/HALKit/AMD64/HalDebugPort.cxx @@ -12,7 +12,7 @@ // after that we have start of additional data. -namespace NewOS +namespace Kernel { void rt_debug_listen(DebuggerPortHeader* theHook) noexcept { @@ -37,4 +37,4 @@ namespace NewOS theHook->fBoundCnt++; } } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/HALKit/AMD64/HalDescriptorLoader.cpp b/Kernel/HALKit/AMD64/HalDescriptorLoader.cpp index 48f57cc0..964b402a 100644 --- a/Kernel/HALKit/AMD64/HalDescriptorLoader.cpp +++ b/Kernel/HALKit/AMD64/HalDescriptorLoader.cpp @@ -6,14 +6,14 @@ #include <ArchKit/ArchKit.hpp> -namespace NewOS::HAL +namespace Kernel::HAL { namespace Detail { STATIC RegisterGDT kRegGdt; STATIC HAL::Register64 kRegIdt; - STATIC ::NewOS::Detail::AMD64::InterruptDescriptorAMD64 + STATIC ::Kernel::Detail::AMD64::InterruptDescriptorAMD64 kInterruptVectorTable[kKernelIdtSize]; STATIC Void RemapPIC(Void) noexcept @@ -51,7 +51,7 @@ namespace NewOS::HAL Void IDTLoader::Load(Register64& idt) { - volatile ::NewOS::UIntPtr** baseIdt = (volatile ::NewOS::UIntPtr**)idt.Base; + volatile ::Kernel::UIntPtr** baseIdt = (volatile ::Kernel::UIntPtr**)idt.Base; MUST_PASS(baseIdt); @@ -72,7 +72,7 @@ namespace NewOS::HAL } Detail::kRegIdt.Base = reinterpret_cast<UIntPtr>(Detail::kInterruptVectorTable); - Detail::kRegIdt.Limit = sizeof(::NewOS::Detail::AMD64::InterruptDescriptorAMD64) * + Detail::kRegIdt.Limit = sizeof(::Kernel::Detail::AMD64::InterruptDescriptorAMD64) * (kKernelIdtSize - 1); hal_load_idt(Detail::kRegIdt); @@ -87,4 +87,4 @@ namespace NewOS::HAL { IDTLoader::Load(idt.Leak()); } -} // namespace NewOS::HAL +} // namespace Kernel::HAL diff --git a/Kernel/HALKit/AMD64/HalHart.cpp b/Kernel/HALKit/AMD64/HalHart.cpp index 4718d4ab..2a12ec50 100644 --- a/Kernel/HALKit/AMD64/HalHart.cpp +++ b/Kernel/HALKit/AMD64/HalHart.cpp @@ -8,7 +8,7 @@ // bugs = 0 -namespace NewOS +namespace Kernel { /// @brief wakes up thread. /// wakes up thread from hang. @@ -30,4 +30,4 @@ namespace NewOS /* nohing, code is spinning */ } } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/HALKit/AMD64/HalInstallTIB.asm b/Kernel/HALKit/AMD64/HalInstallTIB.asm index 9111c835..aad5d6d0 100644 --- a/Kernel/HALKit/AMD64/HalInstallTIB.asm +++ b/Kernel/HALKit/AMD64/HalInstallTIB.asm @@ -1,7 +1,7 @@ ;; /* ;; * ======================================================== ;; * -;; * NewOS +;; * Kernel ;; * Copyright Zeta Electronics Corporation, all rights reserved. ;; * ;; * ======================================================== diff --git a/Kernel/HALKit/AMD64/HalKernelMain.cxx b/Kernel/HALKit/AMD64/HalKernelMain.cxx index d8c60e25..628314b5 100644 --- a/Kernel/HALKit/AMD64/HalKernelMain.cxx +++ b/Kernel/HALKit/AMD64/HalKernelMain.cxx @@ -20,19 +20,19 @@ #include <NetworkKit/IPCEP.hxx> #define KERNEL_INIT(X) X; \ - NewOS::ke_stop(RUNTIME_CHECK_BOOTSTRAP); + Kernel::ke_stop(RUNTIME_CHECK_BOOTSTRAP); /// @brief This symbol is the kernel main symbol. EXTERN_C void KeMain(); -EXTERN_C NewOS::VoidPtr kInterruptVectorTable[]; +EXTERN_C Kernel::VoidPtr kInterruptVectorTable[]; struct PACKED HeapAllocInfo final { - NewOS::VoidPtr fThe; - NewOS::Size fTheSz; + Kernel::VoidPtr fThe; + Kernel::Size fTheSz; }; struct PACKED ProcessBlockInfo final @@ -45,19 +45,19 @@ struct PACKED ProcessExitInfo final { STATIC constexpr auto cReasonLen = 512; - NewOS::Int64 fCode; - NewOS::Char fReason[cReasonLen]; + Kernel::Int64 fCode; + Kernel::Char fReason[cReasonLen]; }; -namespace NewOS::HAL +namespace Kernel::HAL { /// @brief Gets the system cores using the MADT. /// @param rsdPtr The 'RSD PTR' data structure. - extern void hal_system_get_cores(NewOS::voidPtr rsdPtr); -} // namespace NewOS::HAL + extern void hal_system_get_cores(Kernel::voidPtr rsdPtr); +} // namespace Kernel::HAL /* GDT. */ -STATIC NewOS::HAL::Detail::NewOSGDT cGdt = { +STATIC Kernel::HAL::Detail::NewOSGDT cGdt = { {0, 0, 0, 0x00, 0x00, 0}, // null entry {0, 0, 0, 0x9a, 0xaf, 0}, // kernel code {0, 0, 0, 0x92, 0xaf, 0}, // kernel data @@ -67,7 +67,7 @@ STATIC NewOS::HAL::Detail::NewOSGDT cGdt = { }; EXTERN_C void hal_init_platform( - NewOS::HEL::HandoverInformationHeader* HandoverHeader) + Kernel::HEL::HandoverInformationHeader* HandoverHeader) { /* Setup globals. */ @@ -80,28 +80,28 @@ EXTERN_C void hal_init_platform( } kKernelVirtualSize = HandoverHeader->f_VirtualSize; - kKernelVirtualStart = reinterpret_cast<NewOS::VoidPtr>( - reinterpret_cast<NewOS::UIntPtr>(HandoverHeader->f_VirtualStart) + cHeapStartOffset); + kKernelVirtualStart = reinterpret_cast<Kernel::VoidPtr>( + reinterpret_cast<Kernel::UIntPtr>(HandoverHeader->f_VirtualStart) + cHeapStartOffset); kKernelPhysicalStart = HandoverHeader->f_PhysicalStart; // Load memory descriptors. - NewOS::HAL::RegisterGDT gdtBase; + Kernel::HAL::RegisterGDT gdtBase; - gdtBase.Base = reinterpret_cast<NewOS::UIntPtr>(&cGdt); - gdtBase.Limit = sizeof(NewOS::HAL::Detail::NewOSGDT) - 1; + gdtBase.Base = reinterpret_cast<Kernel::UIntPtr>(&cGdt); + gdtBase.Limit = sizeof(Kernel::HAL::Detail::NewOSGDT) - 1; - CONST NewOS::HAL::GDTLoader cGDT; + CONST Kernel::HAL::GDTLoader cGDT; cGDT.Load(gdtBase); // Load IDT now. - NewOS::HAL::Register64 idtBase; - idtBase.Base = (NewOS::UIntPtr)kInterruptVectorTable; + Kernel::HAL::Register64 idtBase; + idtBase.Base = (Kernel::UIntPtr)kInterruptVectorTable; idtBase.Limit = 0; - CONST NewOS::HAL::IDTLoader cIDT; + CONST Kernel::HAL::IDTLoader cIDT; cIDT.Load(idtBase); // Register the basic SCI functions. @@ -126,40 +126,40 @@ EXTERN_C void hal_init_platform( constexpr auto cLPCCloseMsg = 0x27; constexpr auto cLPCSanitizeMsg = 0x28; - kSyscalls[cSerialAlertInterrupt].Leak().Leak()->fProc = [](NewOS::VoidPtr rdx) -> void { + kSyscalls[cSerialAlertInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void { const char* msg = (const char*)rdx; - NewOS::kcout << "Native Log: " << msg << "\r"; + Kernel::kcout << "Native Log: " << msg << "\r"; }; - kSyscalls[cTlsInterrupt].Leak().Leak()->fProc = [](NewOS::VoidPtr rdx) -> void { + kSyscalls[cTlsInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void { tls_check_syscall_impl(rdx); }; - kSyscalls[cLPCSanitizeMsg].Leak().Leak()->fProc = [](NewOS::VoidPtr rdx) -> void { - NewOS::ipc_sanitize_packet(reinterpret_cast<NewOS::IPCEPMessageHeader*>(rdx)); + kSyscalls[cLPCSanitizeMsg].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void { + Kernel::ipc_sanitize_packet(reinterpret_cast<Kernel::IPCEPMessageHeader*>(rdx)); }; - kSyscalls[cNewInterrupt].Leak().Leak()->fProc = [](NewOS::VoidPtr rdx) -> void { + kSyscalls[cNewInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void { // get HAC struct. HeapAllocInfo* rdxInf = reinterpret_cast<HeapAllocInfo*>(rdx); if (!rdxInf) return; // assign the fThe field with the pointer. - rdxInf->fThe = NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().New(rdxInf->fTheSz); + rdxInf->fThe = Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().New(rdxInf->fTheSz); }; - kSyscalls[cDeleteInterrupt].Leak().Leak()->fProc = [](NewOS::VoidPtr rdx) -> void { + kSyscalls[cDeleteInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void { // get HAC struct. HeapAllocInfo* rdxInf = reinterpret_cast<HeapAllocInfo*>(rdx); if (!rdxInf) return; // delete ptr with sz in mind. - NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().Delete(rdxInf->fThe, rdxInf->fTheSz); + Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().Delete(rdxInf->fThe, rdxInf->fTheSz); }; - kSyscalls[cTlsInstallInterrupt].Leak().Leak()->fProc = [](NewOS::VoidPtr rdx) -> void { + kSyscalls[cTlsInstallInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void { ProcessBlockInfo* rdxPb = reinterpret_cast<ProcessBlockInfo*>(rdx); if (!rdxPb) return; @@ -168,30 +168,30 @@ EXTERN_C void hal_init_platform( rt_install_tib(rdxPb->fTIB, rdxPb->fPIB); }; - kSyscalls[cExitInterrupt].Leak().Leak()->fProc = [](NewOS::VoidPtr rdx) -> void { + kSyscalls[cExitInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void { ProcessExitInfo* rdxEi = reinterpret_cast<ProcessExitInfo*>(rdx); if (!rdxEi) return; - NewOS::kcout << "newoskrnl: " << rdxEi->fReason << "\r"; - NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().Exit(rdxEi->fCode); + Kernel::kcout << "newoskrnl: " << rdxEi->fReason << "\r"; + Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().Exit(rdxEi->fCode); }; - kSyscalls[cLastExitInterrupt].Leak().Leak()->fProc = [](NewOS::VoidPtr rdx) -> void { + kSyscalls[cLastExitInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void { ProcessExitInfo* rdxEi = reinterpret_cast<ProcessExitInfo*>(rdx); if (!rdxEi) return; - rdxEi->fCode = NewOS::rt_get_exit_code(); + rdxEi->fCode = Kernel::rt_get_exit_code(); }; - kSyscalls[cRebootInterrupt].Leak().Leak()->fProc = [](NewOS::VoidPtr rdx) -> void { - NewOS::ACPIFactoryInterface acpi(kHandoverHeader->f_HardwareTables.f_RsdPtr); + kSyscalls[cRebootInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void { + Kernel::ACPIFactoryInterface acpi(kHandoverHeader->f_HardwareTables.f_RsdPtr); acpi.Reboot(); }; - kSyscalls[cShutdownInterrupt].Leak().Leak()->fProc = [](NewOS::VoidPtr rdx) -> void { - NewOS::ACPIFactoryInterface acpi(kHandoverHeader->f_HardwareTables.f_RsdPtr); + kSyscalls[cShutdownInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void { + Kernel::ACPIFactoryInterface acpi(kHandoverHeader->f_HardwareTables.f_RsdPtr); acpi.Shutdown(); }; @@ -206,7 +206,7 @@ EXTERN_C void hal_init_platform( kSyscalls[cRebootInterrupt].Leak().Leak()->fHooked = true; kSyscalls[cLPCSanitizeMsg].Leak().Leak()->fHooked = true; - NewOS::HAL::hal_system_get_cores(kHandoverHeader->f_HardwareTables.f_RsdPtr); + Kernel::HAL::hal_system_get_cores(kHandoverHeader->f_HardwareTables.f_RsdPtr); KERNEL_INIT(KeMain()); } diff --git a/Kernel/HALKit/AMD64/HalKernelMouse.cxx b/Kernel/HALKit/AMD64/HalKernelMouse.cxx index 71644d46..9cad6d35 100644 --- a/Kernel/HALKit/AMD64/HalKernelMouse.cxx +++ b/Kernel/HALKit/AMD64/HalKernelMouse.cxx @@ -11,17 +11,17 @@ #include <NewKit/Defines.hpp> /// @note forward decl. -EXTERN_C NewOS::Boolean _hal_draw_mouse(); -EXTERN_C NewOS::Void _hal_init_mouse(); - -STATIC NewOS::Int32 kPrevX = 10; -STATIC NewOS::Int32 kPrevY = 10; -STATIC NewOS::Int32 kX = 10; -STATIC NewOS::Int32 kY = 10; -STATIC NewOS::Int32 kMouseCycle = 0; -STATIC NewOS::PS2MouseInterface kMousePS2; -STATIC NewOS::Char kMousePacket[4] = {}; -STATIC NewOS::Boolean kMousePacketReady = false; +EXTERN_C Kernel::Boolean _hal_draw_mouse(); +EXTERN_C Kernel::Void _hal_init_mouse(); + +STATIC Kernel::Int32 kPrevX = 10; +STATIC Kernel::Int32 kPrevY = 10; +STATIC Kernel::Int32 kX = 10; +STATIC Kernel::Int32 kY = 10; +STATIC Kernel::Int32 kMouseCycle = 0; +STATIC Kernel::PS2MouseInterface kMousePS2; +STATIC Kernel::Char kMousePacket[4] = {}; +STATIC Kernel::Boolean kMousePacketReady = false; STATIC GXInit(); @@ -33,11 +33,11 @@ STATIC GXInit(); #define kPS2XOverflow 0b01000000 #define kPS2YOverflow 0b10000000 -using namespace NewOS; +using namespace Kernel; Void hal_handle_mouse() { - NewOS::UInt8 data = HAL::In8(0x60); + Kernel::UInt8 data = HAL::In8(0x60); switch (kMouseCycle) { @@ -66,8 +66,8 @@ Void hal_handle_mouse() // Notify PIC controller that we're done with it's interrupt. - NewOS::HAL::Out8(0x20, 0x20); - NewOS::HAL::Out8(0xA0, 0x20); + Kernel::HAL::Out8(0x20, 0x20); + Kernel::HAL::Out8(0xA0, 0x20); } /// @brief Interrupt handler for the mouse. diff --git a/Kernel/HALKit/AMD64/HalNewBoot.asm b/Kernel/HALKit/AMD64/HalNewBoot.asm index 3de6f38c..5f0342a3 100644 --- a/Kernel/HALKit/AMD64/HalNewBoot.asm +++ b/Kernel/HALKit/AMD64/HalNewBoot.asm @@ -1,7 +1,7 @@ ;; /* ;; * ======================================================== ;; * -;; * NewOS +;; * Kernel ;; * Copyright Zeta Electronics Corporation, all rights reserved. ;; * ;; * ======================================================== diff --git a/Kernel/HALKit/AMD64/HalPageAlloc.hpp b/Kernel/HALKit/AMD64/HalPageAlloc.hpp index bda7d902..55193686 100644 --- a/Kernel/HALKit/AMD64/HalPageAlloc.hpp +++ b/Kernel/HALKit/AMD64/HalPageAlloc.hpp @@ -27,14 +27,14 @@ #endif // !kPTESize EXTERN_C void hal_flush_tlb(); -EXTERN_C void hal_write_cr3(NewOS::UIntPtr pde); -EXTERN_C void hal_write_cr0(NewOS::UIntPtr bit); +EXTERN_C void hal_write_cr3(Kernel::UIntPtr pde); +EXTERN_C void hal_write_cr0(Kernel::UIntPtr bit); -EXTERN_C NewOS::UIntPtr hal_read_cr0(); // @brief CPU control register. -EXTERN_C NewOS::UIntPtr hal_read_cr2(); // @brief Fault address. -EXTERN_C NewOS::UIntPtr hal_read_cr3(); // @brief Page table. +EXTERN_C Kernel::UIntPtr hal_read_cr0(); // @brief CPU control register. +EXTERN_C Kernel::UIntPtr hal_read_cr2(); // @brief Fault address. +EXTERN_C Kernel::UIntPtr hal_read_cr3(); // @brief Page table. -namespace NewOS::HAL +namespace Kernel::HAL { struct PACKED PageTable64 final { @@ -44,9 +44,9 @@ namespace NewOS::HAL bool Wt : 1; bool Cache : 1; bool Accessed : 1; - NewOS::Int32 Reserved : 6; - NewOS::UInt64 PhysicalAddress : 36; - NewOS::Int32 Reserved1 : 15; + Kernel::Int32 Reserved : 6; + Kernel::UInt64 PhysicalAddress : 36; + Kernel::Int32 Reserved1 : 15; bool ExecDisable : 1; }; @@ -79,10 +79,10 @@ namespace NewOS::HAL }; VoidPtr hal_alloc_page(Boolean rw, Boolean user, SizeT size); -} // namespace NewOS::HAL +} // namespace Kernel::HAL -namespace NewOS +namespace Kernel { typedef HAL::PageTable64 PTE; typedef HAL::PageDirectory64 PDE; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/HALKit/AMD64/HalProcessor.cpp b/Kernel/HALKit/AMD64/HalProcessor.cpp index 0aa69dae..01f3879a 100644 --- a/Kernel/HALKit/AMD64/HalProcessor.cpp +++ b/Kernel/HALKit/AMD64/HalProcessor.cpp @@ -11,7 +11,7 @@ * @brief This file is about processor specific functions (in/out/cli/std...) */ -namespace NewOS::HAL +namespace Kernel::HAL { void Out8(UInt16 port, UInt8 value) { @@ -94,4 +94,4 @@ namespace NewOS::HAL { asm volatile("std"); } -} // namespace NewOS::HAL +} // namespace Kernel::HAL diff --git a/Kernel/HALKit/AMD64/HalSMPCore.cxx b/Kernel/HALKit/AMD64/HalSMPCore.cxx index 34061b09..4cb87542 100644 --- a/Kernel/HALKit/AMD64/HalSMPCore.cxx +++ b/Kernel/HALKit/AMD64/HalSMPCore.cxx @@ -6,7 +6,7 @@ #include <KernelKit/ProcessScheduler.hxx> -using namespace NewOS; +using namespace Kernel; Void ProcessHeader::SetEntrypoint(UIntPtr& imageStart) noexcept { if (imageStart == 0) @@ -16,7 +16,7 @@ Void ProcessHeader::SetEntrypoint(UIntPtr& imageStart) noexcept this->StackFrame->Rsp = this->StackFrame->Rbp; } -namespace NewOS +namespace Kernel { bool rt_check_stack(HAL::StackFramePtr stackPtr) { @@ -27,4 +27,4 @@ namespace NewOS return true; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/HALKit/AMD64/HalSMPCoreManager.asm b/Kernel/HALKit/AMD64/HalSMPCoreManager.asm index 320120a4..7b0926bb 100644 --- a/Kernel/HALKit/AMD64/HalSMPCoreManager.asm +++ b/Kernel/HALKit/AMD64/HalSMPCoreManager.asm @@ -1,7 +1,7 @@ ;; /* ;; * ======================================================== ;; * -;; * NewOS +;; * Kernel ;; * Copyright Zeta Electronics Corporation, all rights reserved. ;; * ;; * ======================================================== diff --git a/Kernel/HALKit/AMD64/Hypervisor.hpp b/Kernel/HALKit/AMD64/Hypervisor.hpp index 05e127c2..1ab69ef4 100644 --- a/Kernel/HALKit/AMD64/Hypervisor.hpp +++ b/Kernel/HALKit/AMD64/Hypervisor.hpp @@ -8,7 +8,7 @@ #include <NewKit/Defines.hpp> -namespace NewOS +namespace Kernel { MAKE_STRING_ENUM(HYPERVISOR) ENUM_STRING(Qemu, "TCGTCGTCGTCG"); @@ -23,4 +23,4 @@ namespace NewOS ENUM_STRING(Qnx, " QNXQVMBSQG "); END_STRING_ENUM() -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/HALKit/AMD64/PCI/Database.cxx b/Kernel/HALKit/AMD64/PCI/Database.cxx index 631ed79f..65ec307e 100644 --- a/Kernel/HALKit/AMD64/PCI/Database.cxx +++ b/Kernel/HALKit/AMD64/PCI/Database.cxx @@ -6,6 +6,6 @@ #include <KernelKit/PCI/Database.hpp> -namespace NewOS +namespace Kernel { } diff --git a/Kernel/HALKit/AMD64/PCI/Device.cxx b/Kernel/HALKit/AMD64/PCI/Device.cxx index 9e18581d..c1fdc401 100644 --- a/Kernel/HALKit/AMD64/PCI/Device.cxx +++ b/Kernel/HALKit/AMD64/PCI/Device.cxx @@ -7,29 +7,29 @@ #include <ArchKit/ArchKit.hpp> #include <KernelKit/PCI/Device.hpp> -NewOS::UInt NewOSPCIReadRaw(NewOS::UInt bar, NewOS::UShort bus, NewOS::UShort dev, NewOS::UShort fun) +Kernel::UInt NewOSPCIReadRaw(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun) { - NewOS::UInt target = 0x80000000 | ((NewOS::UInt)bus << 16) | - ((NewOS::UInt)dev << 11) | ((NewOS::UInt)fun << 8) | + Kernel::UInt target = 0x80000000 | ((Kernel::UInt)bus << 16) | + ((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) | (bar & 0xFC); - NewOS::HAL::Out32((NewOS::UShort)NewOS::PCI::PciConfigKind::ConfigAddress, + Kernel::HAL::Out32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigAddress, target); - return NewOS::HAL::In32((NewOS::UShort)NewOS::PCI::PciConfigKind::ConfigData); + return Kernel::HAL::In32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigData); } -void NewOSPCISetCfgTarget(NewOS::UInt bar, NewOS::UShort bus, NewOS::UShort dev, NewOS::UShort fun) +void NewOSPCISetCfgTarget(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun) { - NewOS::UInt target = 0x80000000 | ((NewOS::UInt)bus << 16) | - ((NewOS::UInt)dev << 11) | ((NewOS::UInt)fun << 8) | + Kernel::UInt target = 0x80000000 | ((Kernel::UInt)bus << 16) | + ((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) | (bar & ~3); - NewOS::HAL::Out32((NewOS::UShort)NewOS::PCI::PciConfigKind::ConfigAddress, + Kernel::HAL::Out32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigAddress, target); } -namespace NewOS::PCI +namespace Kernel::PCI { Device::Device(UShort bus, UShort device, UShort func, UShort bar) : fBus(bus), fDevice(device), fFunction(func), fBar(bar) @@ -127,4 +127,4 @@ namespace NewOS::PCI { return VendorId() != (UShort)PciConfigKind::Invalid; } -} // namespace NewOS::PCI +} // namespace Kernel::PCI diff --git a/Kernel/HALKit/AMD64/PCI/Dma.cxx b/Kernel/HALKit/AMD64/PCI/Dma.cxx index e58ea175..3e6319e3 100644 --- a/Kernel/HALKit/AMD64/PCI/Dma.cxx +++ b/Kernel/HALKit/AMD64/PCI/Dma.cxx @@ -6,7 +6,7 @@ #include <KernelKit/PCI/Dma.hpp> -namespace NewOS +namespace Kernel { DMAWrapper::operator bool() { @@ -79,4 +79,4 @@ namespace NewOS fAddress = Ptr; return *this; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/HALKit/AMD64/PCI/Express.cxx b/Kernel/HALKit/AMD64/PCI/Express.cxx index daa3f0ba..2b88f312 100644 --- a/Kernel/HALKit/AMD64/PCI/Express.cxx +++ b/Kernel/HALKit/AMD64/PCI/Express.cxx @@ -6,6 +6,6 @@ #include <KernelKit/PCI/Express.hpp> -namespace NewOS +namespace Kernel { } diff --git a/Kernel/HALKit/AMD64/PCI/Iterator.cxx b/Kernel/HALKit/AMD64/PCI/Iterator.cxx index d3167b46..0f766111 100644 --- a/Kernel/HALKit/AMD64/PCI/Iterator.cxx +++ b/Kernel/HALKit/AMD64/PCI/Iterator.cxx @@ -10,7 +10,7 @@ if (DEV.Leak().Leak()) \ return *DEV.Leak().Leak(); -namespace NewOS::PCI +namespace Kernel::PCI { Iterator::Iterator(const Types::PciDeviceKind& type) { @@ -41,4 +41,4 @@ namespace NewOS::PCI PCI_ITERATOR_FIND_AND_UNWRAP(fDevices[sz], sz); return {}; } -} // namespace NewOS::PCI +} // namespace Kernel::PCI diff --git a/Kernel/HALKit/AMD64/Processor.hpp b/Kernel/HALKit/AMD64/Processor.hpp index d39a7984..756c5770 100644 --- a/Kernel/HALKit/AMD64/Processor.hpp +++ b/Kernel/HALKit/AMD64/Processor.hpp @@ -34,7 +34,7 @@ #define kGdtCodeSelector (0x08) #define cHeapStartOffset (0x10000000) -namespace NewOS +namespace Kernel { namespace Detail::AMD64 { @@ -50,9 +50,9 @@ namespace NewOS UInt32 Zero; // reserved }; } // namespace Detail::AMD64 -} // namespace NewOS +} // namespace Kernel -namespace NewOS::HAL +namespace Kernel::HAL { /// @brief Virtual memory flags. enum @@ -259,21 +259,21 @@ namespace NewOS::HAL NewOSGDTRecord UserData; }; } // namespace Detail -} // namespace NewOS::HAL +} // namespace Kernel::HAL -EXTERN_C void idt_handle_generic(NewOS::UIntPtr rsp); -EXTERN_C void idt_handle_gpf(NewOS::UIntPtr rsp); -EXTERN_C void idt_handle_math(NewOS::UIntPtr rsp); -EXTERN_C void idt_handle_pf(NewOS::UIntPtr rsp); +EXTERN_C void idt_handle_generic(Kernel::UIntPtr rsp); +EXTERN_C void idt_handle_gpf(Kernel::UIntPtr rsp); +EXTERN_C void idt_handle_math(Kernel::UIntPtr rsp); +EXTERN_C void idt_handle_pf(Kernel::UIntPtr rsp); -EXTERN_C void hal_load_idt(NewOS::HAL::Register64 ptr); -EXTERN_C void hal_load_gdt(NewOS::HAL::RegisterGDT ptr); +EXTERN_C void hal_load_idt(Kernel::HAL::Register64 ptr); +EXTERN_C void hal_load_gdt(Kernel::HAL::RegisterGDT ptr); /// @brief Maximum size of the IDT. #define kKernelIdtSize 0x100 #define kKernelInterruptId 0x32 -inline NewOS::VoidPtr kKernelVirtualStart = (NewOS::VoidPtr)cHeapStartOffset; -inline NewOS::UIntPtr kKernelVirtualSize = 0UL; +inline Kernel::VoidPtr kKernelVirtualStart = (Kernel::VoidPtr)cHeapStartOffset; +inline Kernel::UIntPtr kKernelVirtualSize = 0UL; -inline NewOS::VoidPtr kKernelPhysicalStart = nullptr; +inline Kernel::VoidPtr kKernelPhysicalStart = nullptr; diff --git a/Kernel/HALKit/AMD64/Storage/AHCI.cxx b/Kernel/HALKit/AMD64/Storage/AHCI.cxx index 8555b3de..51153417 100644 --- a/Kernel/HALKit/AMD64/Storage/AHCI.cxx +++ b/Kernel/HALKit/AMD64/Storage/AHCI.cxx @@ -25,14 +25,14 @@ enum kSATASubClass = 0x06 }; -static NewOS::PCI::Device kAhciDevice; +static Kernel::PCI::Device kAhciDevice; /// @brief Initializes an AHCI disk. /// @param PortsImplemented the amount of port that have been detected. /// @return -NewOS::Boolean drv_std_init(NewOS::UInt16& PortsImplemented) +Kernel::Boolean drv_std_init(Kernel::UInt16& PortsImplemented) { - using namespace NewOS; + using namespace Kernel; PCI::Iterator iterator(Types::PciDeviceKind::MassStorageController); for (SizeT devIndex = 0; devIndex < NEWOS_BUS_COUNT; ++devIndex) @@ -52,16 +52,16 @@ NewOS::Boolean drv_std_init(NewOS::UInt16& PortsImplemented) return false; } -NewOS::Boolean drv_std_detected(NewOS::Void) +Kernel::Boolean drv_std_detected(Kernel::Void) { return kAhciDevice.DeviceId() != 0xFFFF; } -NewOS::Void drv_std_read(NewOS::UInt64 Lba, NewOS::Char* Buf, NewOS::SizeT SectorSz, NewOS::SizeT Size) +Kernel::Void drv_std_read(Kernel::UInt64 Lba, Kernel::Char* Buf, Kernel::SizeT SectorSz, Kernel::SizeT Size) { } -NewOS::Void drv_std_write(NewOS::UInt64 Lba, NewOS::Char* Buf, NewOS::SizeT SectorSz, NewOS::SizeT Size) +Kernel::Void drv_std_write(Kernel::UInt64 Lba, Kernel::Char* Buf, Kernel::SizeT SectorSz, Kernel::SizeT Size) { } #endif // __AHCI__ diff --git a/Kernel/HALKit/AMD64/Storage/ATA-DMA.cxx b/Kernel/HALKit/AMD64/Storage/ATA-DMA.cxx index b6dacf21..33e6bc31 100644 --- a/Kernel/HALKit/AMD64/Storage/ATA-DMA.cxx +++ b/Kernel/HALKit/AMD64/Storage/ATA-DMA.cxx @@ -20,7 +20,7 @@ #include <Modules/ATA/ATA.hxx> #include <ArchKit/ArchKit.hpp> -using namespace NewOS; +using namespace Kernel; EXTERN_C Int32 kPRDTTransferStatus; STATIC PRDT kPRDT; diff --git a/Kernel/HALKit/AMD64/Storage/ATA-PIO.cxx b/Kernel/HALKit/AMD64/Storage/ATA-PIO.cxx index 7853d497..1a8e78c3 100644 --- a/Kernel/HALKit/AMD64/Storage/ATA-PIO.cxx +++ b/Kernel/HALKit/AMD64/Storage/ATA-PIO.cxx @@ -20,8 +20,8 @@ #ifdef __ATA_PIO__ -using namespace NewOS; -using namespace NewOS::HAL; +using namespace Kernel; +using namespace Kernel::HAL; /// bugs: 0 @@ -178,13 +178,13 @@ Boolean drv_std_detected(Void) /*** @brief Getter, gets the number of sectors inside the drive. */ -NewOS::SizeT drv_std_get_sector_count() +Kernel::SizeT drv_std_get_sector_count() { return (kATAData[61] << 16) | kATAData[60]; } /// @brief Get the drive size. -NewOS::SizeT drv_std_get_drv_size() +Kernel::SizeT drv_std_get_drv_size() { return drv_std_get_sector_count() * kATASectorSize; } diff --git a/Kernel/HALKit/ARM64/HalPageAlloc.hpp b/Kernel/HALKit/ARM64/HalPageAlloc.hpp index fbdbfea8..8286b5cd 100644 --- a/Kernel/HALKit/ARM64/HalPageAlloc.hpp +++ b/Kernel/HALKit/ARM64/HalPageAlloc.hpp @@ -56,7 +56,7 @@ M, N \ } -namespace NewOS::HAL +namespace Kernel::HAL { struct PACKED LongDescLevel3 final { @@ -97,12 +97,12 @@ namespace NewOS::HAL }; VoidPtr hal_alloc_page(Boolean rw, Boolean user, SizeT size); -} // namespace NewOS::HAL +} // namespace Kernel::HAL -namespace NewOS +namespace Kernel { typedef HAL::LongDescLevel3 PTE; typedef HAL::PageDirectory64 PDE; -} // namespace NewOS +} // namespace Kernel EXTERN_C void hal_flush_tlb(); diff --git a/Kernel/HALKit/ARM64/Processor.hxx b/Kernel/HALKit/ARM64/Processor.hxx index d9a86270..631ecdf0 100644 --- a/Kernel/HALKit/ARM64/Processor.hxx +++ b/Kernel/HALKit/ARM64/Processor.hxx @@ -25,7 +25,7 @@ #error !!! please provide that macro. !!! #endif -namespace NewOS::HAL +namespace Kernel::HAL { struct PACKED Register64 final { @@ -45,11 +45,11 @@ namespace NewOS::HAL }; typedef StackFrame* StackFramePtr; -} // namespace NewOS::HAL +} // namespace Kernel::HAL -inline NewOS::VoidPtr kKernelVirtualStart = (NewOS::VoidPtr)cHeapStartOffset; -inline NewOS::UIntPtr kKernelVirtualSize = 0UL; +inline Kernel::VoidPtr kKernelVirtualStart = (Kernel::VoidPtr)cHeapStartOffset; +inline Kernel::UIntPtr kKernelVirtualSize = 0UL; -inline NewOS::VoidPtr kKernelPhysicalStart = nullptr; +inline Kernel::VoidPtr kKernelPhysicalStart = nullptr; #include <HALKit/ARM64/HalPageAlloc.hpp> diff --git a/Kernel/HALKit/ARM64/Storage/HalFlash.cxx b/Kernel/HALKit/ARM64/Storage/HalFlash.cxx index 4466963e..20c2836d 100644 --- a/Kernel/HALKit/ARM64/Storage/HalFlash.cxx +++ b/Kernel/HALKit/ARM64/Storage/HalFlash.cxx @@ -14,7 +14,7 @@ #define cMaxFlash (4U) -namespace NewOS +namespace Kernel { /// /:\\BRIDGE\\FLSH\\1 constexpr auto cFlashBridgeMagic = "FLSH"; @@ -61,6 +61,6 @@ namespace NewOS { kcout << "newoskrnl: disabled hardware.\r"; } -} // namespace NewOS +} // namespace Kernel #endif // if __FLASH_MEM__ (Bridge) diff --git a/Kernel/HALKit/AXP/CoreSyscallHandlerDEC.cpp b/Kernel/HALKit/AXP/CoreSyscallHandlerDEC.cpp index f308b0b5..4469eee9 100644 --- a/Kernel/HALKit/AXP/CoreSyscallHandlerDEC.cpp +++ b/Kernel/HALKit/AXP/CoreSyscallHandlerDEC.cpp @@ -10,15 +10,15 @@ /// @brief Internal call for syscall, to work with C++. /// @param stack /// @return nothing. -EXTERN_C void rt_syscall_handle(NewOS::HAL::StackFrame* stack) +EXTERN_C void rt_syscall_handle(Kernel::HAL::StackFrame* stack) { if (stack->Rcx <= (kSyscalls.Count() - 1)) { - NewOS::kcout << "newoskrnl: syscall: enter.\r"; + Kernel::kcout << "newoskrnl: syscall: enter.\r"; if (kSyscalls[stack->Rcx].Leak().Leak().fHooked) (kSyscalls[stack->Rcx].Leak().Leak().fProc)(stack); - NewOS::kcout << "newoskrnl: syscall: exit.\r"; + Kernel::kcout << "newoskrnl: syscall: exit.\r"; } } diff --git a/Kernel/HALKit/POWER/HalHardware.cxx b/Kernel/HALKit/POWER/HalHardware.cxx index 8dd0205c..15407eb3 100644 --- a/Kernel/HALKit/POWER/HalHardware.cxx +++ b/Kernel/HALKit/POWER/HalHardware.cxx @@ -7,7 +7,7 @@ #include <HALKit/POWER/Processor.hpp> #include <KernelKit/DebugOutput.hpp> -namespace NewOS +namespace Kernel { namespace HAL { @@ -16,4 +16,4 @@ namespace NewOS return 0; } } // namespace HAL -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/HALKit/POWER/HalHart.cxx b/Kernel/HALKit/POWER/HalHart.cxx index 16a26a3a..614828cb 100644 --- a/Kernel/HALKit/POWER/HalHart.cxx +++ b/Kernel/HALKit/POWER/HalHart.cxx @@ -8,7 +8,7 @@ #include <KernelKit/DebugOutput.hpp> #include <HALKit/POWER/Hart.hxx> -using namespace NewOS; +using namespace Kernel; /// @brief wakes up thread. /// wakes up thread from hang. diff --git a/Kernel/HALKit/POWER/HalSerialPort.cxx b/Kernel/HALKit/POWER/HalSerialPort.cxx index 86388b4c..abddd291 100644 --- a/Kernel/HALKit/POWER/HalSerialPort.cxx +++ b/Kernel/HALKit/POWER/HalSerialPort.cxx @@ -7,7 +7,7 @@ #include <HALKit/POWER/Processor.hpp> #include <KernelKit/DebugOutput.hpp> -using namespace NewOS; +using namespace Kernel; /// @brief Writes to COM1. /// @param bytes diff --git a/Kernel/HALKit/POWER/HalThread.cxx b/Kernel/HALKit/POWER/HalThread.cxx index 83f03373..18d84d4f 100644 --- a/Kernel/HALKit/POWER/HalThread.cxx +++ b/Kernel/HALKit/POWER/HalThread.cxx @@ -7,7 +7,7 @@ #include <HALKit/POWER/Processor.hpp> #include <KernelKit/DebugOutput.hpp> -EXTERN_C NewOS::HAL::StackFramePtr rt_get_current_context() +EXTERN_C Kernel::HAL::StackFramePtr rt_get_current_context() { return nullptr; } diff --git a/Kernel/HALKit/POWER/HalVirtualMemory.cxx b/Kernel/HALKit/POWER/HalVirtualMemory.cxx index a49ba63f..eb04a43d 100644 --- a/Kernel/HALKit/POWER/HalVirtualMemory.cxx +++ b/Kernel/HALKit/POWER/HalVirtualMemory.cxx @@ -12,7 +12,7 @@ /// @note refer to our SoC documentation. -using namespace NewOS; +using namespace Kernel; /// @brief Write directly to the specific TLB. /// @param mas0 diff --git a/Kernel/HALKit/POWER/Hart.hxx b/Kernel/HALKit/POWER/Hart.hxx index ab74be4a..8f466098 100644 --- a/Kernel/HALKit/POWER/Hart.hxx +++ b/Kernel/HALKit/POWER/Hart.hxx @@ -16,14 +16,14 @@ #include <NewKit/Defines.hpp> /// @brief hardware thread indentification type. -typedef NewOS::Int32 PPCHartType; +typedef Kernel::Int32 PPCHartType; /// @brief Hardware thread information structure. typedef struct HalHardwareThread { - NewOS::UIntPtr fStartAddress; - NewOS::UInt8 fPrivleged : 1; - NewOS::UInt32 fPageFlags; + Kernel::UIntPtr fStartAddress; + Kernel::UInt8 fPrivleged : 1; + Kernel::UInt32 fPageFlags; PPCHartType fIdentNumber; } HalHardwareThread; @@ -31,4 +31,4 @@ typedef struct HalHardwareThread /// @param hart the hart /// @param epc the pc. /// @return -EXTERN_C NewOS::Void hal_set_pc_to_hart(HalHardwareThread* hart, NewOS::VoidPtr epc); +EXTERN_C Kernel::Void hal_set_pc_to_hart(HalHardwareThread* hart, Kernel::VoidPtr epc); diff --git a/Kernel/HALKit/POWER/Processor.hpp b/Kernel/HALKit/POWER/Processor.hpp index af00b7af..5ff7eef3 100644 --- a/Kernel/HALKit/POWER/Processor.hpp +++ b/Kernel/HALKit/POWER/Processor.hpp @@ -13,7 +13,7 @@ #define kHalPPCAlignment __attribute__((aligned(4))) -namespace NewOS::HAL +namespace Kernel::HAL { typedef UIntPtr Reg; @@ -46,10 +46,10 @@ namespace NewOS::HAL { asm volatile("mr 0, 0"); // no oop } -} // namespace NewOS::HAL +} // namespace Kernel::HAL -EXTERN_C void int_handle_math(NewOS::UIntPtr sp); -EXTERN_C void int_handle_pf(NewOS::UIntPtr sp); +EXTERN_C void int_handle_math(Kernel::UIntPtr sp); +EXTERN_C void int_handle_pf(Kernel::UIntPtr sp); /// @brief Flush system TLB. EXTERN_C void hal_flush_tlb(); diff --git a/Kernel/HALKit/RISCV/Hart.hxx b/Kernel/HALKit/RISCV/Hart.hxx index 38160322..92cc286e 100644 --- a/Kernel/HALKit/RISCV/Hart.hxx +++ b/Kernel/HALKit/RISCV/Hart.hxx @@ -15,10 +15,10 @@ #include <NewKit/Defines.hpp> -typedef NewOS::Int32 Rv64HartType; +typedef Kernel::Int32 Rv64HartType; /// @brief Set PC to specific hart. /// @param hart the hart /// @param epc the pc. /// @return -EXTERN_C NewOS::Void hal_set_pc_to_hart(Rv64HartType hart, NewOS::VoidPtr epc); +EXTERN_C Kernel::Void hal_set_pc_to_hart(Rv64HartType hart, Kernel::VoidPtr epc); diff --git a/Kernel/KernelKit/CodeManager.hpp b/Kernel/KernelKit/CodeManager.hpp index a42aea67..97a07ce9 100644 --- a/Kernel/KernelKit/CodeManager.hpp +++ b/Kernel/KernelKit/CodeManager.hpp @@ -20,7 +20,7 @@ #define kUPPNameLen 64 -namespace NewOS +namespace Kernel { /// @brief Main process entrypoint. typedef void (*MainKind)(void); @@ -30,4 +30,4 @@ namespace NewOS /// @param main the start of the process. /// @return if the process was started or not. bool execute_from_image(MainKind main, const char* processName); -} // namespace NewOS
\ No newline at end of file +} // namespace Kernel
\ No newline at end of file diff --git a/Kernel/KernelKit/DebugOutput.hpp b/Kernel/KernelKit/DebugOutput.hpp index a3c01341..0d52b861 100644 --- a/Kernel/KernelKit/DebugOutput.hpp +++ b/Kernel/KernelKit/DebugOutput.hpp @@ -25,7 +25,7 @@ #define kDebugTeam 43 #define kDebugEOP 49 -namespace NewOS +namespace Kernel { class TerminalDevice; @@ -198,7 +198,7 @@ namespace NewOS Int16 fPort[kDebugMaxPorts]; Int16 fBoundCnt; }; -} // namespace NewOS +} // namespace Kernel #ifdef kcout #undef kcout diff --git a/Kernel/KernelKit/DeviceManager.hpp b/Kernel/KernelKit/DeviceManager.hpp index 11217fc6..219977f4 100644 --- a/Kernel/KernelKit/DeviceManager.hpp +++ b/Kernel/KernelKit/DeviceManager.hpp @@ -14,7 +14,7 @@ #pragma once -/* NewOS device interface manager. */ +/* Kernel device interface manager. */ /* @file KernelKit/DeviceManager.hpp */ /* @brief Device abstraction and I/O buffer. */ @@ -24,7 +24,7 @@ // Last Rev // Wed, Apr 3, 2024 9:09:41 AM -namespace NewOS +namespace Kernel { template <typename T> class DeviceInterface; @@ -126,4 +126,4 @@ namespace NewOS kDeviceTypeMedia, kDeviceTypeCount, }; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/KernelKit/DriveManager.hxx b/Kernel/KernelKit/DriveManager.hxx index 47ecba67..21d7e1b0 100644 --- a/Kernel/KernelKit/DriveManager.hxx +++ b/Kernel/KernelKit/DriveManager.hxx @@ -20,7 +20,7 @@ #define kDriveInvalidID (-1) #define kDriveNameLen (32) -namespace NewOS +namespace Kernel { enum { @@ -144,6 +144,6 @@ namespace NewOS /// @brief Fetches the main drive. /// @return the new drive as a trait. DriveTrait io_construct_main_drive(void) noexcept; -} // namespace NewOS +} // namespace Kernel #endif /* ifndef __INC_DRIVE_MANAGER_HXX__ */ diff --git a/Kernel/KernelKit/FileManager.hpp b/Kernel/KernelKit/FileManager.hpp index 8bbbaaaa..55d87fea 100644 --- a/Kernel/KernelKit/FileManager.hpp +++ b/Kernel/KernelKit/FileManager.hpp @@ -38,7 +38,7 @@ /** @brief invalid position. (n-pos) */ #define kNPos (SizeT)(-1); -namespace NewOS +namespace Kernel { enum { @@ -314,6 +314,6 @@ namespace NewOS { delete fFile; } -} // namespace NewOS +} // namespace Kernel -#define node_cast(PTR) reinterpret_cast<NewOS::NodePtr>(PTR) +#define node_cast(PTR) reinterpret_cast<Kernel::NodePtr>(PTR) diff --git a/Kernel/KernelKit/Framebuffer.hpp b/Kernel/KernelKit/Framebuffer.hpp index ebe983c8..6cafb767 100644 --- a/Kernel/KernelKit/Framebuffer.hpp +++ b/Kernel/KernelKit/Framebuffer.hpp @@ -13,7 +13,7 @@ #include <NewKit/Defines.hpp> #include <NewKit/Ref.hpp> -namespace NewOS +namespace Kernel { enum class FramebufferColorKind : UChar { @@ -86,6 +86,6 @@ namespace NewOS extern const UInt32 kRgbBlue; extern const UInt32 kRgbBlack; extern const UInt32 kRgbWhite; -} // namespace NewOS +} // namespace Kernel #endif /* ifndef __INC_FB_HPP__ */ diff --git a/Kernel/KernelKit/HError.hpp b/Kernel/KernelKit/HError.hpp index 4a2bfa0b..caee5718 100644 --- a/Kernel/KernelKit/HError.hpp +++ b/Kernel/KernelKit/HError.hpp @@ -11,11 +11,11 @@ /// @file HError.hpp /// @brief Local Process Codes. -#define ErrLocalIsOk() (NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().GetLocalCode() == NewOS::kErrorSuccess) -#define ErrLocalFailed() (NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().GetLocalCode() != NewOS::kErrorSuccess) -#define ErrLocal() NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().GetLocalCode() +#define ErrLocalIsOk() (Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().GetLocalCode() == Kernel::kErrorSuccess) +#define ErrLocalFailed() (Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().GetLocalCode() != Kernel::kErrorSuccess) +#define ErrLocal() Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().GetLocalCode() -namespace NewOS +namespace Kernel { typedef Int32 HError; @@ -52,5 +52,5 @@ namespace NewOS Void err_bug_check_raise(void) noexcept; Boolean err_bug_check(void) noexcept; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/KernelKit/KernelHeap.hpp b/Kernel/KernelKit/KernelHeap.hpp index 6be94a63..0d2f2188 100644 --- a/Kernel/KernelKit/KernelHeap.hpp +++ b/Kernel/KernelKit/KernelHeap.hpp @@ -12,9 +12,8 @@ #include <NewKit/Defines.hpp> -namespace NewOS +namespace Kernel { - /// @brief Declare pointer as free. /// @param heapPtr the pointer. /// @return @@ -41,4 +40,4 @@ namespace NewOS /// @param heapPtr /// @return Int32 ke_make_ke_page(VoidPtr heapPtr); -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/KernelKit/LoaderInterface.hpp b/Kernel/KernelKit/LoaderInterface.hpp index 9bce429c..dce934e6 100644 --- a/Kernel/KernelKit/LoaderInterface.hpp +++ b/Kernel/KernelKit/LoaderInterface.hpp @@ -11,7 +11,7 @@ #include <NewKit/Defines.hpp> #include <NewKit/ErrorOr.hpp> -namespace NewOS +namespace Kernel { /// @brief This interface is used to make loader contracts (MSCOFF, PEF). /// @author @Amlal-El-Mahrouss @@ -30,4 +30,4 @@ namespace NewOS virtual _Output ErrorOr<VoidPtr> FindStart() = 0; virtual _Output VoidPtr FindSymbol(_Input const char* name, _Input Int32 kind) = 0; }; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/KernelKit/LockDelegate.hpp b/Kernel/KernelKit/LockDelegate.hpp index 0bf8104e..a4c9380a 100644 --- a/Kernel/KernelKit/LockDelegate.hpp +++ b/Kernel/KernelKit/LockDelegate.hpp @@ -12,7 +12,7 @@ #define kLockDone (200U) /* job is done */ #define kLockTimedOut (100U) /* job has timed out */ -namespace NewOS +namespace Kernel { /// @brief Lock condition pointer. typedef Boolean* LockPtr; @@ -61,4 +61,4 @@ namespace NewOS private: Atom<UInt> fLockStatus; }; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/KernelKit/MSDOS.hpp b/Kernel/KernelKit/MSDOS.hpp index 36da42ad..12d67488 100644 --- a/Kernel/KernelKit/MSDOS.hpp +++ b/Kernel/KernelKit/MSDOS.hpp @@ -3,7 +3,7 @@ Copyright Zeta Electronics Corporation File: MSDOS.hpp - Purpose: MS-DOS header for NewOS. + Purpose: MS-DOS header for Kernel. Revision History: @@ -23,12 +23,12 @@ #define kMagMz0 'M' #define kMagMz1 'Z' -typedef NewOS::UInt32 DosWord; -typedef NewOS::Long DosLong; +typedef Kernel::UInt32 DosWord; +typedef Kernel::Long DosLong; typedef struct _DosHeader { - NewOS::UInt8 eMagic[2]; + Kernel::UInt8 eMagic[2]; DosWord eMagLen; DosWord ePagesCount; DosWord eCrlc; @@ -49,7 +49,7 @@ typedef struct _DosHeader DosLong eLfanew; } DosHeader, *DosHeaderPtr; -namespace NewOS +namespace Kernel { /// @brief Find the PE header inside the the blob. inline auto rt_find_exec_header(DosHeaderPtr ptrDos) -> VoidPtr @@ -63,6 +63,6 @@ namespace NewOS return (VoidPtr)(&ptrDos->eLfanew + 1); } -} // namespace NewOS +} // namespace Kernel #endif /* ifndef __MSDOS_EXEC__ */ diff --git a/Kernel/KernelKit/PCI/Database.hpp b/Kernel/KernelKit/PCI/Database.hpp index 9cd04610..a689306a 100644 --- a/Kernel/KernelKit/PCI/Database.hpp +++ b/Kernel/KernelKit/PCI/Database.hpp @@ -8,7 +8,7 @@ #include <KernelKit/PCI/Device.hpp> #include <NewKit/Defines.hpp> -namespace NewOS +namespace Kernel { namespace Types { @@ -35,4 +35,4 @@ namespace NewOS Invalid = Unassgined, }; } // namespace Types -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/KernelKit/PCI/Device.hpp b/Kernel/KernelKit/PCI/Device.hpp index 313adca9..8b5388c1 100644 --- a/Kernel/KernelKit/PCI/Device.hpp +++ b/Kernel/KernelKit/PCI/Device.hpp @@ -7,7 +7,7 @@ #include <NewKit/Defines.hpp> -namespace NewOS::PCI +namespace Kernel::PCI { enum class PciConfigKind : UShort { @@ -73,7 +73,7 @@ namespace NewOS::PCI UShort fFunction; UShort fBar; }; -} // namespace NewOS::PCI +} // namespace Kernel::PCI -EXTERN_C void NewOSPCISetCfgTarget(NewOS::UInt bar); -EXTERN_C NewOS::UInt NewOSPCIReadRaw(NewOS::UInt bar); +EXTERN_C void NewOSPCISetCfgTarget(Kernel::UInt bar); +EXTERN_C Kernel::UInt NewOSPCIReadRaw(Kernel::UInt bar); diff --git a/Kernel/KernelKit/PCI/Dma.hpp b/Kernel/KernelKit/PCI/Dma.hpp index 25e90d79..48db7587 100644 --- a/Kernel/KernelKit/PCI/Dma.hpp +++ b/Kernel/KernelKit/PCI/Dma.hpp @@ -12,7 +12,7 @@ #include <NewKit/OwnPtr.hpp> #include <NewKit/Ref.hpp> -namespace NewOS +namespace Kernel { enum class DmaKind { @@ -76,6 +76,6 @@ namespace NewOS public: static OwnPtr<IOBuf<Char*>> Construct(OwnPtr<DMAWrapper>& dma); }; -} // namespace NewOS +} // namespace Kernel #include <KernelKit/PCI/Dma.inl> diff --git a/Kernel/KernelKit/PCI/IO.hpp b/Kernel/KernelKit/PCI/IO.hpp index cd44764c..262361ed 100644 --- a/Kernel/KernelKit/PCI/IO.hpp +++ b/Kernel/KernelKit/PCI/IO.hpp @@ -11,7 +11,7 @@ #include <NewKit/Defines.hpp> #include <NewKit/Ref.hpp> -namespace NewOS +namespace Kernel { template <SizeT Sz> class IOArray final @@ -50,7 +50,7 @@ namespace NewOS }; using IOArray16 = IOArray<16>; -} // namespace NewOS +} // namespace Kernel #ifdef __x86_64__ #include <KernelKit/PCI/IO-Impl-AMD64.inl> diff --git a/Kernel/KernelKit/PCI/Iterator.hpp b/Kernel/KernelKit/PCI/Iterator.hpp index 278711a7..2274df31 100644 --- a/Kernel/KernelKit/PCI/Iterator.hpp +++ b/Kernel/KernelKit/PCI/Iterator.hpp @@ -11,7 +11,7 @@ #define NEWOS_DEVICE_COUNT (33) #define NEWOS_FUNCTION_COUNT (8) -namespace NewOS::PCI +namespace Kernel::PCI { class Iterator final { @@ -33,6 +33,6 @@ namespace NewOS::PCI private: Array<PCI::Device, NEWOS_BUS_COUNT> fDevices; }; -} // namespace NewOS::PCI +} // namespace Kernel::PCI #endif // __PCI_ITERATOR_HPP__ diff --git a/Kernel/KernelKit/PCI/PCI.hpp b/Kernel/KernelKit/PCI/PCI.hpp index c0c035b9..a7101a33 100644 --- a/Kernel/KernelKit/PCI/PCI.hpp +++ b/Kernel/KernelKit/PCI/PCI.hpp @@ -14,7 +14,7 @@ #define PCI_FUNC_COUNT (8) #define PCI_BUS_COUNT (255) -namespace NewOS::PCI +namespace Kernel::PCI { // model struct DeviceHeader @@ -55,4 +55,4 @@ namespace NewOS::PCI Detail::BAR BAR4; Detail::BAR BAR5; }; -} // namespace NewOS::PCI +} // namespace Kernel::PCI diff --git a/Kernel/KernelKit/PE.hxx b/Kernel/KernelKit/PE.hxx index 02f24595..30b71cc9 100644 --- a/Kernel/KernelKit/PE.hxx +++ b/Kernel/KernelKit/PE.hxx @@ -3,7 +3,7 @@ Copyright Zeta Electronics Corporation File: PE.hxx - Purpose: Portable Executable for NewOS. + Purpose: Portable Executable for Kernel. Revision History: @@ -20,14 +20,14 @@ typedef struct ExecHeader final { - NewOS::UInt32 mMagic; // PE\0\0 or 0x00004550 - NewOS::UInt16 mMachine; - NewOS::UInt16 mNumberOfSections; - NewOS::UInt32 mTimeDateStamp; - NewOS::UInt32 mPointerToSymbolTable; - NewOS::UInt32 mNumberOfSymbols; - NewOS::UInt16 mSizeOfOptionalHeader; - NewOS::UInt16 mCharacteristics; + Kernel::UInt32 mMagic; // PE\0\0 or 0x00004550 + Kernel::UInt16 mMachine; + Kernel::UInt16 mNumberOfSections; + Kernel::UInt32 mTimeDateStamp; + Kernel::UInt32 mPointerToSymbolTable; + Kernel::UInt32 mNumberOfSymbols; + Kernel::UInt16 mSizeOfOptionalHeader; + Kernel::UInt16 mCharacteristics; } ALIGN(8) ExecHeader, *ExecHeaderPtr; #define kMagPE32 0x010b @@ -38,49 +38,49 @@ typedef struct ExecHeader final typedef struct ExecOptionalHeader final { - NewOS::UInt16 mMagic; // 0x010b - PE32, 0x020b - PE32+ (64 bit) - NewOS::UChar mMajorLinkerVersion; - NewOS::UChar mMinorLinkerVersion; - NewOS::UIntPtr mSizeOfCode; - NewOS::UIntPtr mSizeOfInitializedData; - NewOS::UIntPtr mSizeOfUninitializedData; - NewOS::UInt32 mAddressOfEntryPoint; - NewOS::UInt32 mBaseOfCode; - NewOS::UIntPtr mImageBase; - NewOS::UInt32 mSectionAlignment; - NewOS::UInt32 mFileAlignment; - NewOS::UInt16 mMajorOperatingSystemVersion; - NewOS::UInt16 mMinorOperatingSystemVersion; - NewOS::UInt16 mMajorImageVersion; - NewOS::UInt16 mMinorImageVersion; - NewOS::UInt16 mMajorSubsystemVersion; - NewOS::UInt16 mMinorSubsystemVersion; - NewOS::UInt32 mWin32VersionValue; - NewOS::UIntPtr mSizeOfImage; - NewOS::UIntPtr mSizeOfHeaders; - NewOS::UInt32 mCheckSum; - NewOS::UInt16 mSubsystem; - NewOS::UInt16 mDllCharacteristics; - NewOS::UIntPtr mSizeOfStackReserve; - NewOS::UIntPtr mSizeOfStackCommit; - NewOS::UIntPtr mSizeOfHeapReserve; - NewOS::UIntPtr mSizeOfHeapCommit; - NewOS::UInt32 mLoaderFlags; - NewOS::UInt32 mNumberOfRvaAndSizes; + Kernel::UInt16 mMagic; // 0x010b - PE32, 0x020b - PE32+ (64 bit) + Kernel::UChar mMajorLinkerVersion; + Kernel::UChar mMinorLinkerVersion; + Kernel::UIntPtr mSizeOfCode; + Kernel::UIntPtr mSizeOfInitializedData; + Kernel::UIntPtr mSizeOfUninitializedData; + Kernel::UInt32 mAddressOfEntryPoint; + Kernel::UInt32 mBaseOfCode; + Kernel::UIntPtr mImageBase; + Kernel::UInt32 mSectionAlignment; + Kernel::UInt32 mFileAlignment; + Kernel::UInt16 mMajorOperatingSystemVersion; + Kernel::UInt16 mMinorOperatingSystemVersion; + Kernel::UInt16 mMajorImageVersion; + Kernel::UInt16 mMinorImageVersion; + Kernel::UInt16 mMajorSubsystemVersion; + Kernel::UInt16 mMinorSubsystemVersion; + Kernel::UInt32 mWin32VersionValue; + Kernel::UIntPtr mSizeOfImage; + Kernel::UIntPtr mSizeOfHeaders; + Kernel::UInt32 mCheckSum; + Kernel::UInt16 mSubsystem; + Kernel::UInt16 mDllCharacteristics; + Kernel::UIntPtr mSizeOfStackReserve; + Kernel::UIntPtr mSizeOfStackCommit; + Kernel::UIntPtr mSizeOfHeapReserve; + Kernel::UIntPtr mSizeOfHeapCommit; + Kernel::UInt32 mLoaderFlags; + Kernel::UInt32 mNumberOfRvaAndSizes; } ExecOptionalHeader, *ExecOptionalHeaderPtr; typedef struct ExecSectionHeader final { - CONST NewOS::UChar mName[8]; - NewOS::UInt32 mVirtualSize; - NewOS::UInt32 mVirtualAddress; - NewOS::UInt32 mSizeOfRawData; - NewOS::UInt32 mPointerToRawData; - NewOS::UInt32 mPointerToRelocations; - NewOS::UInt32 mPointerToLinenumbers; - NewOS::UInt16 mNumberOfRelocations; - NewOS::UInt16 mNumberOfLinenumbers; - NewOS::UInt32 mCharacteristics; + CONST Kernel::UChar mName[8]; + Kernel::UInt32 mVirtualSize; + Kernel::UInt32 mVirtualAddress; + Kernel::UInt32 mSizeOfRawData; + Kernel::UInt32 mPointerToRawData; + Kernel::UInt32 mPointerToRelocations; + Kernel::UInt32 mPointerToLinenumbers; + Kernel::UInt16 mNumberOfRelocations; + Kernel::UInt16 mNumberOfLinenumbers; + Kernel::UInt32 mCharacteristics; } ExecSectionHeader, *ExecSectionHeaderPtr; enum kExecDataDirParams @@ -93,29 +93,29 @@ enum kExecDataDirParams typedef struct ExecExportDirectory { - NewOS::UInt32 mCharacteristics; - NewOS::UInt32 mTimeDateStamp; - NewOS::UInt16 mMajorVersion; - NewOS::UInt16 mMinorVersion; - NewOS::UInt32 mName; - NewOS::UInt32 mBase; - NewOS::UInt32 mNumberOfFunctions; - NewOS::UInt32 mNumberOfNames; - NewOS::UInt32 mAddressOfFunctions; // export table rva - NewOS::UInt32 mAddressOfNames; - NewOS::UInt32 mAddressOfNameOrdinal; // ordinal table rva + Kernel::UInt32 mCharacteristics; + Kernel::UInt32 mTimeDateStamp; + Kernel::UInt16 mMajorVersion; + Kernel::UInt16 mMinorVersion; + Kernel::UInt32 mName; + Kernel::UInt32 mBase; + Kernel::UInt32 mNumberOfFunctions; + Kernel::UInt32 mNumberOfNames; + Kernel::UInt32 mAddressOfFunctions; // export table rva + Kernel::UInt32 mAddressOfNames; + Kernel::UInt32 mAddressOfNameOrdinal; // ordinal table rva } ExecExportDirectory, *ExecExportDirectoryPtr; typedef struct ExecImportDirectory { union { - NewOS::UInt32 mCharacteristics; - NewOS::UInt32 mOriginalFirstThunk; + Kernel::UInt32 mCharacteristics; + Kernel::UInt32 mOriginalFirstThunk; }; - NewOS::UInt32 mTimeDateStamp; - NewOS::UInt32 mForwarderChain; - NewOS::UInt32 mNameRva; - NewOS::UInt32 mThunkTableRva; + Kernel::UInt32 mTimeDateStamp; + Kernel::UInt32 mForwarderChain; + Kernel::UInt32 mNameRva; + Kernel::UInt32 mThunkTableRva; } ExecImportDirectory, *ExecImportDirectoryPtr; #define kPeStart "__hcore_subsys_start" diff --git a/Kernel/KernelKit/PEF.hpp b/Kernel/KernelKit/PEF.hpp index 005c7673..f27d8dd5 100644 --- a/Kernel/KernelKit/PEF.hpp +++ b/Kernel/KernelKit/PEF.hpp @@ -3,7 +3,7 @@ Copyright Zeta Electronics Corporation File: PEF.hpp - Purpose: Preferred Executable Format for NewOS. + Purpose: Preferred Executable Format for Kernel. Revision History: @@ -26,7 +26,7 @@ #define kPefVersion 1 #define kPefNameLen 255 -namespace NewOS +namespace Kernel { enum { @@ -93,7 +93,7 @@ namespace NewOS kPefZero = 0xE, kPefLinkerID = 0x1, }; -} // namespace NewOS +} // namespace Kernel #define kPefExt ".exec" #define kPefDylibExt ".lib" @@ -101,7 +101,7 @@ namespace NewOS #define kPefObjectExt ".obj" #define kPefDebugExt ".dbg" -// NewOS System Binary Interface. +// Kernel System Binary Interface. #define kPefAbi (0x5046) #define kPefStart "__ImageStart" diff --git a/Kernel/KernelKit/PEFCodeManager.hxx b/Kernel/KernelKit/PEFCodeManager.hxx index 1faecb5e..8bb5a7cd 100644 --- a/Kernel/KernelKit/PEFCodeManager.hxx +++ b/Kernel/KernelKit/PEFCodeManager.hxx @@ -14,7 +14,7 @@ #define kPefApplicationMime "application/x-newos-exec" -namespace NewOS +namespace Kernel { /// /// \name PEFLoader @@ -57,6 +57,6 @@ namespace NewOS { bool execute_from_image(PEFLoader& exec, const Int32& procKind) noexcept; } // namespace Utils -} // namespace NewOS +} // namespace Kernel #endif // ifndef _INC_CODE_MANAGER_PEF_HXX_ diff --git a/Kernel/KernelKit/PEFSharedObject.hxx b/Kernel/KernelKit/PEFSharedObject.hxx index dbe9cda8..993e316d 100644 --- a/Kernel/KernelKit/PEFSharedObject.hxx +++ b/Kernel/KernelKit/PEFSharedObject.hxx @@ -1,7 +1,7 @@ /* * ======================================================== * - * NewOS + * Kernel * Copyright Zeta Electronics Corporation, all rights reserved. * * ======================================================== @@ -15,7 +15,7 @@ #include <KernelKit/PEFCodeManager.hxx> #include <NewKit/Defines.hpp> -namespace NewOS +namespace Kernel { /// @brief Pure implementation, missing method/function handler. extern "C" void __mh_purecall(void); @@ -107,6 +107,6 @@ namespace NewOS }; typedef SharedObject* SharedObjectPtr; -} // namespace NewOS +} // namespace Kernel #endif /* ifndef __KERNELKIT_SHARED_OBJECT_HXX__ */ diff --git a/Kernel/KernelKit/PermissionSelector.hxx b/Kernel/KernelKit/PermissionSelector.hxx index 1d972154..7c01bcd4 100644 --- a/Kernel/KernelKit/PermissionSelector.hxx +++ b/Kernel/KernelKit/PermissionSelector.hxx @@ -20,7 +20,7 @@ // hash 'user@host:password' -> base64 encoded data // use this data to then fetch specific data. -namespace NewOS +namespace Kernel { enum class RingKind { @@ -52,6 +52,6 @@ namespace NewOS private: RingKind fRing; }; -} // namespace NewOS +} // namespace Kernel #endif /* ifndef _INC_PERMISSION_SEL_HXX_ */ diff --git a/Kernel/KernelKit/ProcessScheduler.hxx b/Kernel/KernelKit/ProcessScheduler.hxx index b8ac2aae..7d8518bb 100644 --- a/Kernel/KernelKit/ProcessScheduler.hxx +++ b/Kernel/KernelKit/ProcessScheduler.hxx @@ -24,7 +24,7 @@ //////////////////////////////////////////////////// -namespace NewOS +namespace Kernel { class ProcessHeader; class ProcessTeam; @@ -282,7 +282,7 @@ namespace NewOS }; const Int32& rt_get_exit_code() noexcept; -} // namespace NewOS +} // namespace Kernel #include <KernelKit/ThreadLocalStorage.hxx> diff --git a/Kernel/KernelKit/SMPManager.hpp b/Kernel/KernelKit/SMPManager.hpp index 324358dc..31e67bb7 100644 --- a/Kernel/KernelKit/SMPManager.hpp +++ b/Kernel/KernelKit/SMPManager.hpp @@ -16,7 +16,7 @@ #define kMaxHarts 8 -namespace NewOS +namespace Kernel { using ThreadID = UInt32; @@ -122,6 +122,6 @@ namespace NewOS /// @brief makes thread sleep. /// hooks and hangs thread to prevent code from executing. Void rt_hang_thread(HAL::StackFramePtr stack); -} // namespace NewOS +} // namespace Kernel #endif // !__INC_SMP_MANAGER_HPP__ diff --git a/Kernel/KernelKit/Semaphore.hpp b/Kernel/KernelKit/Semaphore.hpp index 83d711ed..5dd7b407 100644 --- a/Kernel/KernelKit/Semaphore.hpp +++ b/Kernel/KernelKit/Semaphore.hpp @@ -10,7 +10,7 @@ #include <KernelKit/Timer.hpp> #include <CompilerKit/CompilerKit.hxx> -namespace NewOS +namespace Kernel { class ProcessHeader; @@ -40,4 +40,4 @@ namespace NewOS private: ProcessHeaderRef fLockingProcess{nullptr}; }; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/KernelKit/ThreadLocalStorage.hxx b/Kernel/KernelKit/ThreadLocalStorage.hxx index 75d29ced..fb3eec9b 100644 --- a/Kernel/KernelKit/ThreadLocalStorage.hxx +++ b/Kernel/KernelKit/ThreadLocalStorage.hxx @@ -21,17 +21,17 @@ /// Located in GS on AMD64, other architectures have their own stuff. (64x0, 32x0, ARM64) struct PACKED ThreadInformationBlock final { - NewOS::Char Cookie[kTLSCookieLen]; - NewOS::UIntPtr StartCode; // Start Address - NewOS::UIntPtr StartData; // Allocation Heap - NewOS::UIntPtr StartStack; // Stack Pointer. - NewOS::Int32 ThreadID; // Thread execution ID. + Kernel::Char Cookie[kTLSCookieLen]; + Kernel::UIntPtr StartCode; // Start Address + Kernel::UIntPtr StartData; // Allocation Heap + Kernel::UIntPtr StartStack; // Stack Pointer. + Kernel::Int32 ThreadID; // Thread execution ID. }; typedef struct ThreadInformationBlock ProcessInformationBlock; ///! @brief Cookie Sanity check. -NewOS::Boolean tls_check_tib(ThreadInformationBlock* Ptr); +Kernel::Boolean tls_check_tib(ThreadInformationBlock* Ptr); ///! @brief new ptr syscall. template <typename T> @@ -48,7 +48,7 @@ T* tls_new_class(Args&&... args); EXTERN_C void rt_install_tib(ThreadInformationBlock* TIB, ThreadInformationBlock* PIB); /// @brief TLS check (syscall) -EXTERN_C NewOS::Void tls_check_syscall_impl(NewOS::VoidPtr TIB) noexcept; +EXTERN_C Kernel::Void tls_check_syscall_impl(Kernel::VoidPtr TIB) noexcept; #include <KernelKit/ThreadLocalStorage.inl> diff --git a/Kernel/KernelKit/Timer.hpp b/Kernel/KernelKit/Timer.hpp index acfb9be5..59364554 100644 --- a/Kernel/KernelKit/Timer.hpp +++ b/Kernel/KernelKit/Timer.hpp @@ -10,7 +10,7 @@ #include <CompilerKit/CompilerKit.hxx> #include <KernelKit/HError.hpp> -namespace NewOS +namespace Kernel { class HardwareTimer; class HardwareTimerInterface; @@ -61,4 +61,4 @@ namespace NewOS return 1000 / Seconds(time); } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/KernelKit/UserHeap.hpp b/Kernel/KernelKit/UserHeap.hpp index 681896a8..6f125fdc 100644 --- a/Kernel/KernelKit/UserHeap.hpp +++ b/Kernel/KernelKit/UserHeap.hpp @@ -20,7 +20,7 @@ #define kUserHeapMaxSz (4096) #define kUserHeapMag (0xFAF0FEF0) -namespace NewOS +namespace Kernel { typedef enum { @@ -43,4 +43,4 @@ namespace NewOS /// @param pointer The process heap pointer. /// @return Int32 rt_free_heap(voidPtr pointer); -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/KernelKit/XCOFF.hxx b/Kernel/KernelKit/XCOFF.hxx index fbcfa5e7..f5063900 100644 --- a/Kernel/KernelKit/XCOFF.hxx +++ b/Kernel/KernelKit/XCOFF.hxx @@ -3,7 +3,7 @@ Copyright Zeta Electronics Corporation File: XCOFF.hpp - Purpose: XCOFF for NewOS. + Purpose: XCOFF for Kernel. Revision History: @@ -29,13 +29,13 @@ struct XCoffForkHeader; /// @brief XCoff file header, meant for POWER apps. typedef struct XCoffFileHeader { - NewOS::UInt16 fMagic; - NewOS::UInt16 fTarget; - NewOS::UInt16 fNumSecs; - NewOS::UInt32 fTimeDat; - NewOS::UIntPtr fSymPtr; - NewOS::UInt32 fNumSyms; - NewOS::UInt16 fOptHdr; // ?: Number of bytes in optional header + Kernel::UInt16 fMagic; + Kernel::UInt16 fTarget; + Kernel::UInt16 fNumSecs; + Kernel::UInt32 fTimeDat; + Kernel::UIntPtr fSymPtr; + Kernel::UInt32 fNumSyms; + Kernel::UInt16 fOptHdr; // ?: Number of bytes in optional header } XCoffFileHeader32, XCoffFileHeader64; #define cForkNameLen (255) @@ -43,9 +43,9 @@ typedef struct XCoffFileHeader /// @brief This the executable manifest fork. typedef struct XCoffForkHeader { - NewOS::Char fPropertiesXMLFork[cForkNameLen]; - NewOS::Char fDynamicLoaderFork[cForkNameLen]; - NewOS::Char fCodeSignFork[cForkNameLen]; + Kernel::Char fPropertiesXMLFork[cForkNameLen]; + Kernel::Char fDynamicLoaderFork[cForkNameLen]; + Kernel::Char fCodeSignFork[cForkNameLen]; } XCoffForkHeader; #endif // ifndef __INC_XCOFF_HXX__ diff --git a/Kernel/Modules/ACPI/ACPI.hxx b/Kernel/Modules/ACPI/ACPI.hxx index 019bcb11..70e2effc 100644 --- a/Kernel/Modules/ACPI/ACPI.hxx +++ b/Kernel/Modules/ACPI/ACPI.hxx @@ -13,7 +13,7 @@ #include <NewKit/Defines.hpp> -namespace NewOS +namespace Kernel { class PACKED SDT { @@ -83,6 +83,6 @@ namespace NewOS UInt32 CreatorRevision; UInt32 AddressArr[]; }; -} // namespace NewOS +} // namespace Kernel #endif // !__ACPI__ diff --git a/Kernel/Modules/ACPI/ACPIFactoryInterface.hxx b/Kernel/Modules/ACPI/ACPIFactoryInterface.hxx index 7fbe6192..e5def104 100644 --- a/Kernel/Modules/ACPI/ACPIFactoryInterface.hxx +++ b/Kernel/Modules/ACPI/ACPIFactoryInterface.hxx @@ -12,7 +12,7 @@ #include <NewKit/Defines.hpp> #include <NewKit/Ref.hpp> -namespace NewOS +namespace Kernel { class ACPIFactoryInterface final { @@ -50,6 +50,6 @@ namespace NewOS SSizeT fEntries; // number of entries, -1 tells that no invalid entries were // found. }; -} // namespace NewOS +} // namespace Kernel #endif // !__ACPI_MANAGER__ diff --git a/Kernel/Modules/AHCI/AHCI.hxx b/Kernel/Modules/AHCI/AHCI.hxx index b090c229..c616cae3 100644 --- a/Kernel/Modules/AHCI/AHCI.hxx +++ b/Kernel/Modules/AHCI/AHCI.hxx @@ -48,172 +48,172 @@ enum typedef struct FisRegH2D final { // DWORD 0 - NewOS::UInt8 FisType; // FIS_TYPE_REG_H2D + Kernel::UInt8 FisType; // FIS_TYPE_REG_H2D - NewOS::UInt8 PortMul : 4; // Port multiplier - NewOS::UInt8 Reserved0 : 3; // Reserved - NewOS::UInt8 CmdOrCtrl : 1; // 1: Command, 0: Control + Kernel::UInt8 PortMul : 4; // Port multiplier + Kernel::UInt8 Reserved0 : 3; // Reserved + Kernel::UInt8 CmdOrCtrl : 1; // 1: Command, 0: Control - NewOS::UInt8 Command; // Command register - NewOS::UInt8 Featurel; // Feature register, 7:0 + Kernel::UInt8 Command; // Command register + Kernel::UInt8 Featurel; // Feature register, 7:0 // DWORD 1 - NewOS::UInt8 Lba0; // LBA low register, 7:0 - NewOS::UInt8 Lba1; // LBA mid register, 15:8 - NewOS::UInt8 Lba2; // LBA high register, 23:16 - NewOS::UInt8 Device; // Device register + Kernel::UInt8 Lba0; // LBA low register, 7:0 + Kernel::UInt8 Lba1; // LBA mid register, 15:8 + Kernel::UInt8 Lba2; // LBA high register, 23:16 + Kernel::UInt8 Device; // Device register // DWORD 2 - NewOS::UInt8 Lba3; // LBA register, 31:24 - NewOS::UInt8 Lba4; // LBA register, 39:32 - NewOS::UInt8 Lba5; // LBA register, 47:40 - NewOS::UInt8 FeatureHigh; // Feature register, 15:8 + Kernel::UInt8 Lba3; // LBA register, 31:24 + Kernel::UInt8 Lba4; // LBA register, 39:32 + Kernel::UInt8 Lba5; // LBA register, 47:40 + Kernel::UInt8 FeatureHigh; // Feature register, 15:8 // DWORD 3 - NewOS::UInt8 CountLow; // Count register, 7:0 - NewOS::UInt8 CountHigh; // Count register, 15:8 - NewOS::UInt8 Icc; // Isochronous command completion - NewOS::UInt8 Control; // Control register + Kernel::UInt8 CountLow; // Count register, 7:0 + Kernel::UInt8 CountHigh; // Count register, 15:8 + Kernel::UInt8 Icc; // Isochronous command completion + Kernel::UInt8 Control; // Control register // DWORD 4 - NewOS::UInt8 Reserved1[4]; // Reserved + Kernel::UInt8 Reserved1[4]; // Reserved } FisRegH2D; typedef struct FisRegD2H final { // DWORD 0 - NewOS::UInt8 FisType; // FIS_TYPE_REG_D2H + Kernel::UInt8 FisType; // FIS_TYPE_REG_D2H - NewOS::UInt8 PortMul : 4; // Port multiplier - NewOS::UInt8 Reserved0 : 2; // Reserved - NewOS::UInt8 InterruptBit : 1; // Interrupt bit - NewOS::UInt8 Reserved1 : 1; // Reserved + Kernel::UInt8 PortMul : 4; // Port multiplier + Kernel::UInt8 Reserved0 : 2; // Reserved + Kernel::UInt8 InterruptBit : 1; // Interrupt bit + Kernel::UInt8 Reserved1 : 1; // Reserved - NewOS::UInt8 Status; // Status register - NewOS::UInt8 Rrror; // Error register + Kernel::UInt8 Status; // Status register + Kernel::UInt8 Rrror; // Error register // DWORD 1 - NewOS::UInt8 Lba0; // LBA low register, 7:0 - NewOS::UInt8 Lba1; // LBA mid register, 15:8 - NewOS::UInt8 Lba2; // LBA high register, 23:16 - NewOS::UInt8 Device; // Device register + Kernel::UInt8 Lba0; // LBA low register, 7:0 + Kernel::UInt8 Lba1; // LBA mid register, 15:8 + Kernel::UInt8 Lba2; // LBA high register, 23:16 + Kernel::UInt8 Device; // Device register // DWORD 2 - NewOS::UInt8 Lba3; // LBA register, 31:24 - NewOS::UInt8 Lba4; // LBA register, 39:32 - NewOS::UInt8 Lba5; // LBA register, 47:40 - NewOS::UInt8 Rsv2; // Reserved + Kernel::UInt8 Lba3; // LBA register, 31:24 + Kernel::UInt8 Lba4; // LBA register, 39:32 + Kernel::UInt8 Lba5; // LBA register, 47:40 + Kernel::UInt8 Rsv2; // Reserved // DWORD 3 - NewOS::UInt8 CountLow; // Count register, 7:0 - NewOS::UInt8 CountHigh; // Count register, 15:8 - NewOS::UInt8 Rsv3[2]; // Reserved + Kernel::UInt8 CountLow; // Count register, 7:0 + Kernel::UInt8 CountHigh; // Count register, 15:8 + Kernel::UInt8 Rsv3[2]; // Reserved // DWORD 4 - NewOS::UInt8 Rsv4[4]; // Reserved + Kernel::UInt8 Rsv4[4]; // Reserved } FisRegD2H; typedef struct FisData final { // DWORD 0 - NewOS::UInt8 FisType; // FIS_TYPE_DATA + Kernel::UInt8 FisType; // FIS_TYPE_DATA - NewOS::UInt8 PortMul : 4; // Port multiplier - NewOS::UInt8 Reserved0 : 4; // Reserved + Kernel::UInt8 PortMul : 4; // Port multiplier + Kernel::UInt8 Reserved0 : 4; // Reserved - NewOS::UInt8 Reserved1[2]; // Reserved + Kernel::UInt8 Reserved1[2]; // Reserved // DWORD 1 ~ N - NewOS::UInt32 Data[1]; // Payload + Kernel::UInt32 Data[1]; // Payload } FisData; typedef struct FisPioSetup final { // DWORD 0 - NewOS::UInt8 FisType; // FIS_TYPE_PIO_SETUP + Kernel::UInt8 FisType; // FIS_TYPE_PIO_SETUP - NewOS::UInt8 PortMul : 4; // Port multiplier - NewOS::UInt8 Reserved0 : 1; // Reserved - NewOS::UInt8 DTD : 1; // Data transfer direction, 1 - device to host - NewOS::UInt8 InterruptBit : 1; // Interrupt bit - NewOS::UInt8 Reserved1 : 1; + Kernel::UInt8 PortMul : 4; // Port multiplier + Kernel::UInt8 Reserved0 : 1; // Reserved + Kernel::UInt8 DTD : 1; // Data transfer direction, 1 - device to host + Kernel::UInt8 InterruptBit : 1; // Interrupt bit + Kernel::UInt8 Reserved1 : 1; - NewOS::UInt8 Status; // Status register - NewOS::UInt8 Error; // Error register + Kernel::UInt8 Status; // Status register + Kernel::UInt8 Error; // Error register // DWORD 1 - NewOS::UInt8 Lba0; // LBA low register, 7:0 - NewOS::UInt8 Lba1; // LBA mid register, 15:8 - NewOS::UInt8 Lba2; // LBA high register, 23:16 - NewOS::UInt8 Device; // Device register + Kernel::UInt8 Lba0; // LBA low register, 7:0 + Kernel::UInt8 Lba1; // LBA mid register, 15:8 + Kernel::UInt8 Lba2; // LBA high register, 23:16 + Kernel::UInt8 Device; // Device register // DWORD 2 - NewOS::UInt8 Lba3; // LBA register, 31:24 - NewOS::UInt8 Lba4; // LBA register, 39:32 - NewOS::UInt8 Lba5; // LBA register, 47:40 - NewOS::UInt8 Rsv2; // Reserved + Kernel::UInt8 Lba3; // LBA register, 31:24 + Kernel::UInt8 Lba4; // LBA register, 39:32 + Kernel::UInt8 Lba5; // LBA register, 47:40 + Kernel::UInt8 Rsv2; // Reserved // DWORD 3 - NewOS::UInt8 CountLow; // Count register, 7:0 - NewOS::UInt8 CountHigh; // Count register, 15:8 - NewOS::UInt8 Rsv3; // Reserved - NewOS::UInt8 EStatus; // New value of status register + Kernel::UInt8 CountLow; // Count register, 7:0 + Kernel::UInt8 CountHigh; // Count register, 15:8 + Kernel::UInt8 Rsv3; // Reserved + Kernel::UInt8 EStatus; // New value of status register // DWORD 4 - NewOS::UInt16 TranferCount; // Transfer count - NewOS::UInt8 Rsv4[2]; // Reserved + Kernel::UInt16 TranferCount; // Transfer count + Kernel::UInt8 Rsv4[2]; // Reserved } FisPioSetup; typedef struct FisDmaSetup final { // DWORD 0 - NewOS::UInt8 FisType; // FIS_TYPE_DMA_SETUP + Kernel::UInt8 FisType; // FIS_TYPE_DMA_SETUP - NewOS::UInt8 PortMul : 4; // Port multiplier - NewOS::UInt8 Reserved0 : 1; // Reserved - NewOS::UInt8 DTD : 1; // Data transfer direction, 1 - device to host - NewOS::UInt8 InterruptBit : 1; // Interrupt bit - NewOS::UInt8 AutoEnable : 1; // Auto-activate. Specifies if DMA Activate FIS is needed + Kernel::UInt8 PortMul : 4; // Port multiplier + Kernel::UInt8 Reserved0 : 1; // Reserved + Kernel::UInt8 DTD : 1; // Data transfer direction, 1 - device to host + Kernel::UInt8 InterruptBit : 1; // Interrupt bit + Kernel::UInt8 AutoEnable : 1; // Auto-activate. Specifies if DMA Activate FIS is needed - NewOS::UInt8 Reserved1[2]; // Reserved + Kernel::UInt8 Reserved1[2]; // Reserved // DWORD 1&2 - NewOS::UInt64 DmaBufferId; // DMA Buffer Identifier. Used to Identify DMA buffer in + Kernel::UInt64 DmaBufferId; // DMA Buffer Identifier. Used to Identify DMA buffer in // host memory. SATA Spec says host specific and not in // Spec. Trying AHCI spec might work. // DWORD 3 - NewOS::UInt32 Rsvd; // More reserved + Kernel::UInt32 Rsvd; // More reserved // DWORD 4 - NewOS::UInt32 DmabufOffset; // Byte offset into buffer. First 2 bits must be 0 + Kernel::UInt32 DmabufOffset; // Byte offset into buffer. First 2 bits must be 0 // DWORD 5 - NewOS::UInt32 TransferCount; // Number of bytes to transfer. Bit 0 must be 0 + Kernel::UInt32 TransferCount; // Number of bytes to transfer. Bit 0 must be 0 // DWORD 6 - NewOS::UInt32 Reserved3; // Reserved + Kernel::UInt32 Reserved3; // Reserved } FisDmaSetup; typedef struct FisDevBits final { // DWORD 0 - NewOS::UInt8 FisType; // FIS_TYPE_DMA_SETUP (A1h) + Kernel::UInt8 FisType; // FIS_TYPE_DMA_SETUP (A1h) - NewOS::UInt8 Reserved0 : 5; // Reserved - NewOS::UInt8 R0 : 1; - NewOS::UInt8 InterruptBit : 1; - NewOS::UInt8 N : 1; + Kernel::UInt8 Reserved0 : 5; // Reserved + Kernel::UInt8 R0 : 1; + Kernel::UInt8 InterruptBit : 1; + Kernel::UInt8 N : 1; - NewOS::UInt8 StatusLow : 3; - NewOS::UInt8 R1 : 1; - NewOS::UInt8 StatusHigh : 3; + Kernel::UInt8 StatusLow : 3; + Kernel::UInt8 R1 : 1; + Kernel::UInt8 StatusHigh : 3; - NewOS::UInt8 R2 : 1; - NewOS::UInt8 Error; + Kernel::UInt8 R2 : 1; + Kernel::UInt8 Error; // DWORD 1 - NewOS::UInt32 Act; + Kernel::UInt32 Act; } FisDevBits; /// \brief Enable AHCI device bit in GHC register. @@ -223,44 +223,44 @@ typedef struct FisDevBits final typedef struct HbaPort final { - NewOS::UInt32 Clb; // 0x00, command list base address, 1K-byte aligned - NewOS::UInt32 Clbu; // 0x04, command list base address upper 32 bits - NewOS::UInt32 Fb; // 0x08, FIS base address, 256-byte aligned - NewOS::UInt32 Fbu; // 0x0C, FIS base address upper 32 bits - NewOS::UInt32 Is; // 0x10, interrupt status - NewOS::UInt32 Ie; // 0x14, interrupt enable - NewOS::UInt32 Cmd; // 0x18, command and status - NewOS::UInt32 Reserved0; // 0x1C, Reserved - NewOS::UInt32 Tfd; // 0x20, task file data - NewOS::UInt32 Sig; // 0x24, signature - NewOS::UInt32 Ssts; // 0x28, SATA status (SCR0:SStatus) - NewOS::UInt32 Sctl; // 0x2C, SATA control (SCR2:SControl) - NewOS::UInt32 Serr; // 0x30, SATA error (SCR1:SError) - NewOS::UInt32 Sact; // 0x34, SATA active (SCR3:SActive) - NewOS::UInt32 Ci; // 0x38, command issue - NewOS::UInt32 Sntf; // 0x20, SATA notification (SCR4:SNotification) - NewOS::UInt32 Fbs; // 0x40, FIS-based switch control - NewOS::UInt32 Reserved1[11]; // 0x44 ~ 0x6F, Reserved - NewOS::UInt32 Vendor[4]; // 0x70 ~ 0x7F, vendor specific + Kernel::UInt32 Clb; // 0x00, command list base address, 1K-byte aligned + Kernel::UInt32 Clbu; // 0x04, command list base address upper 32 bits + Kernel::UInt32 Fb; // 0x08, FIS base address, 256-byte aligned + Kernel::UInt32 Fbu; // 0x0C, FIS base address upper 32 bits + Kernel::UInt32 Is; // 0x10, interrupt status + Kernel::UInt32 Ie; // 0x14, interrupt enable + Kernel::UInt32 Cmd; // 0x18, command and status + Kernel::UInt32 Reserved0; // 0x1C, Reserved + Kernel::UInt32 Tfd; // 0x20, task file data + Kernel::UInt32 Sig; // 0x24, signature + Kernel::UInt32 Ssts; // 0x28, SATA status (SCR0:SStatus) + Kernel::UInt32 Sctl; // 0x2C, SATA control (SCR2:SControl) + Kernel::UInt32 Serr; // 0x30, SATA error (SCR1:SError) + Kernel::UInt32 Sact; // 0x34, SATA active (SCR3:SActive) + Kernel::UInt32 Ci; // 0x38, command issue + Kernel::UInt32 Sntf; // 0x20, SATA notification (SCR4:SNotification) + Kernel::UInt32 Fbs; // 0x40, FIS-based switch control + Kernel::UInt32 Reserved1[11]; // 0x44 ~ 0x6F, Reserved + Kernel::UInt32 Vendor[4]; // 0x70 ~ 0x7F, vendor specific } HbaPort; typedef struct HbaMem final { // 0x00 - 0x2B, Generic Host Control - NewOS::UInt32 Cap; // 0x00, Host capability - NewOS::UInt32 Ghc; // 0x04, Global host control - NewOS::UInt32 Is; // 0x08, Interrupt status - NewOS::UInt32 Pi; // 0x0C, Port implemented - NewOS::UInt32 Vs; // 0x10, Version - NewOS::UInt32 Ccc_ctl; // 0x14, Command completion coalescing control - NewOS::UInt32 Ccc_pts; // 0x18, Command completion coalescing ports - NewOS::UInt32 Em_loc; // 0x1C, Enclosure management location - NewOS::UInt32 Em_ctl; // 0x20, Enclosure management control - NewOS::UInt32 Cap2; // 0x24, Host capabilities extended - NewOS::UInt32 Bohc; // 0x28, BIOS/OS handoff control and status - - NewOS::UInt16 Resv0; - NewOS::UInt32 Resv2; + Kernel::UInt32 Cap; // 0x00, Host capability + Kernel::UInt32 Ghc; // 0x04, Global host control + Kernel::UInt32 Is; // 0x08, Interrupt status + Kernel::UInt32 Pi; // 0x0C, Port implemented + Kernel::UInt32 Vs; // 0x10, Version + Kernel::UInt32 Ccc_ctl; // 0x14, Command completion coalescing control + Kernel::UInt32 Ccc_pts; // 0x18, Command completion coalescing ports + Kernel::UInt32 Em_loc; // 0x1C, Enclosure management location + Kernel::UInt32 Em_ctl; // 0x20, Enclosure management control + Kernel::UInt32 Cap2; // 0x24, Host capabilities extended + Kernel::UInt32 Bohc; // 0x28, BIOS/OS handoff control and status + + Kernel::UInt16 Resv0; + Kernel::UInt32 Resv2; HbaPort Ports[1]; // 1 ~ 32 } HbaMem; @@ -268,61 +268,61 @@ typedef struct HbaMem final typedef struct HbaCmdHeader final { // DW0 - NewOS::UInt8 Cfl : 5; // Command FIS length in DWORDS, 2 ~ 16 - NewOS::UInt8 Atapi : 1; // ATAPI - NewOS::UInt8 Write : 1; // Write, 1: H2D, 0: D2H - NewOS::UInt8 Prefetchable : 1; // Prefetchable + Kernel::UInt8 Cfl : 5; // Command FIS length in DWORDS, 2 ~ 16 + Kernel::UInt8 Atapi : 1; // ATAPI + Kernel::UInt8 Write : 1; // Write, 1: H2D, 0: D2H + Kernel::UInt8 Prefetchable : 1; // Prefetchable - NewOS::UInt8 Reset : 1; // Reset - NewOS::UInt8 BIST : 1; // BIST - NewOS::UInt8 Clear : 1; // Clear busy upon R_OK - NewOS::UInt8 Reserved0 : 1; // Reserved - NewOS::UInt8 Pmp : 4; // Port multiplier port + Kernel::UInt8 Reset : 1; // Reset + Kernel::UInt8 BIST : 1; // BIST + Kernel::UInt8 Clear : 1; // Clear busy upon R_OK + Kernel::UInt8 Reserved0 : 1; // Reserved + Kernel::UInt8 Pmp : 4; // Port multiplier port - NewOS::UInt16 Prdtl; // Physical region descriptor table length in entries - volatile NewOS::UInt32 Prdbc; // Physical region descriptor byte count transferred + Kernel::UInt16 Prdtl; // Physical region descriptor table length in entries + volatile Kernel::UInt32 Prdbc; // Physical region descriptor byte count transferred - NewOS::UInt32 Ctba; // Command table descriptor base address - NewOS::UInt32 Ctbau; // Command table descriptor base address upper 32 bits + Kernel::UInt32 Ctba; // Command table descriptor base address + Kernel::UInt32 Ctbau; // Command table descriptor base address upper 32 bits - NewOS::UInt32 Reserved1[4]; // Reserved + Kernel::UInt32 Reserved1[4]; // Reserved } HbaCmdHeader; typedef struct HbaFis final { // 0x00 FisDmaSetup Dsfis; // DMA Setup FIS - NewOS::UInt8 Pad0[4]; + Kernel::UInt8 Pad0[4]; // 0x20 FisPioSetup Psfis; // PIO Setup FIS - NewOS::UInt8 Pad1[12]; + Kernel::UInt8 Pad1[12]; // 0x40 FisRegD2H Rfis; // Register – Device to Host FIS - NewOS::UInt8 Pad2[4]; + Kernel::UInt8 Pad2[4]; // 0x58 FisDevBits Sdbfis; // Set Device Bit FIS // 0x60 - NewOS::UInt8 Ufis[64]; + Kernel::UInt8 Ufis[64]; // 0xA0 - NewOS::UInt8 Rsv[0x100 - 0xA0]; + Kernel::UInt8 Rsv[0x100 - 0xA0]; } HbaFis; typedef struct HbaPrdtEntry final { - NewOS::UInt32 Dba; // Data base address - NewOS::UInt32 Dbau; // Data base address upper 32 bits - NewOS::UInt32 Reserved0; // Reserved + Kernel::UInt32 Dba; // Data base address + Kernel::UInt32 Dbau; // Data base address upper 32 bits + Kernel::UInt32 Reserved0; // Reserved // DW3 - NewOS::UInt32 Dbc : 22; // Byte count, 4M max - NewOS::UInt32 Reserved1 : 9; // Reserved - NewOS::UInt32 InterruptBit : 1; // Interrupt on completion + Kernel::UInt32 Dbc : 22; // Byte count, 4M max + Kernel::UInt32 Reserved1 : 9; // Reserved + Kernel::UInt32 InterruptBit : 1; // Interrupt on completion } HbaPrdtEntry; typedef struct HbaCmdTbl final { - NewOS::UInt8 Cfis[64]; // Command FIS - NewOS::UInt8 Acmd[16]; // ATAPI command, 12 or 16 bytes - NewOS::UInt8 Rsv[48]; // Reserved + Kernel::UInt8 Cfis[64]; // Command FIS + Kernel::UInt8 Acmd[16]; // ATAPI command, 12 or 16 bytes + Kernel::UInt8 Rsv[48]; // Reserved struct HbaPrdtEntry prdtEntries[1]; // Physical region descriptor table entries, 0 ~ 65535 } HbaCmdTbl; @@ -333,9 +333,9 @@ typedef struct HbaCmdTbl final /// @brief Initializes an AHCI disk. /// @param PortsImplemented the amount of port that have been detected. /// @return -NewOS::Boolean drv_std_init(NewOS::UInt16& PortsImplemented); +Kernel::Boolean drv_std_init(Kernel::UInt16& PortsImplemented); -NewOS::Boolean drv_std_detected(NewOS::Void); +Kernel::Boolean drv_std_detected(Kernel::Void); /// @brief Read from disk. /// @param Lba @@ -343,7 +343,7 @@ NewOS::Boolean drv_std_detected(NewOS::Void); /// @param SectorSz /// @param Size /// @return -NewOS::Void drv_std_read(NewOS::UInt64 Lba, NewOS::Char* Buf, NewOS::SizeT SectorSz, NewOS::SizeT Size); +Kernel::Void drv_std_read(Kernel::UInt64 Lba, Kernel::Char* Buf, Kernel::SizeT SectorSz, Kernel::SizeT Size); /// @brief Write to disk. /// @param Lba @@ -351,18 +351,18 @@ NewOS::Void drv_std_read(NewOS::UInt64 Lba, NewOS::Char* Buf, NewOS::SizeT Secto /// @param SectorSz /// @param Size /// @return -NewOS::Void drv_std_write(NewOS::UInt64 Lba, NewOS::Char* Buf, NewOS::SizeT SectorSz, NewOS::SizeT Size); +Kernel::Void drv_std_write(Kernel::UInt64 Lba, Kernel::Char* Buf, Kernel::SizeT SectorSz, Kernel::SizeT Size); /// @brief get sector count. -NewOS::SizeT drv_std_get_sector_count(); +Kernel::SizeT drv_std_get_sector_count(); /// @brief get device size. -NewOS::SizeT drv_std_get_drv_size(); +Kernel::SizeT drv_std_get_drv_size(); /// @brief get sector count. -NewOS::SizeT drv_std_get_sector_count(); +Kernel::SizeT drv_std_get_sector_count(); /// @brief get device size. -NewOS::SizeT drv_std_get_drv_size(); +Kernel::SizeT drv_std_get_drv_size(); #endif // ifdef __KERNEL__ diff --git a/Kernel/Modules/ATA/ATA.hxx b/Kernel/Modules/ATA/ATA.hxx index 98732c72..9a65c065 100644 --- a/Kernel/Modules/ATA/ATA.hxx +++ b/Kernel/Modules/ATA/ATA.hxx @@ -134,23 +134,23 @@ enum #if defined(__ATA_PIO__) || defined(__ATA_DMA__) -NewOS::Boolean drv_std_init(NewOS::UInt16 Bus, NewOS::UInt8 Drive, NewOS::UInt16& OutBus, NewOS::UInt8& OutMaster); +Kernel::Boolean drv_std_init(Kernel::UInt16 Bus, Kernel::UInt8 Drive, Kernel::UInt16& OutBus, Kernel::UInt8& OutMaster); -NewOS::Boolean drv_std_detected(NewOS::Void); +Kernel::Boolean drv_std_detected(Kernel::Void); -NewOS::Void drv_std_select(NewOS::UInt16 Bus); +Kernel::Void drv_std_select(Kernel::UInt16 Bus); -NewOS::Boolean drv_std_wait_io(NewOS::UInt16 IO); +Kernel::Boolean drv_std_wait_io(Kernel::UInt16 IO); -NewOS::Void drv_std_read(NewOS::UInt64 Lba, NewOS::UInt16 IO, NewOS::UInt8 Master, NewOS::Char* Buf, NewOS::SizeT SectorSz, NewOS::SizeT Size); +Kernel::Void drv_std_read(Kernel::UInt64 Lba, Kernel::UInt16 IO, Kernel::UInt8 Master, Kernel::Char* Buf, Kernel::SizeT SectorSz, Kernel::SizeT Size); -NewOS::Void drv_std_write(NewOS::UInt64 Lba, NewOS::UInt16 IO, NewOS::UInt8 Master, NewOS::Char* Buf, NewOS::SizeT SectorSz, NewOS::SizeT Size); +Kernel::Void drv_std_write(Kernel::UInt64 Lba, Kernel::UInt16 IO, Kernel::UInt8 Master, Kernel::Char* Buf, Kernel::SizeT SectorSz, Kernel::SizeT Size); /// @brief get sector count. -NewOS::SizeT drv_std_get_sector_count(); +Kernel::SizeT drv_std_get_sector_count(); /// @brief get device size. -NewOS::SizeT drv_std_get_drv_size(); +Kernel::SizeT drv_std_get_drv_size(); #endif // ifdef __KERNEL__ #endif // ifndef __ATA_PIO__ || __AHCI__ diff --git a/Kernel/Modules/CoreCG/Accessibility.hxx b/Kernel/Modules/CoreCG/Accessibility.hxx index d3f14f58..7878de4f 100644 --- a/Kernel/Modules/CoreCG/Accessibility.hxx +++ b/Kernel/Modules/CoreCG/Accessibility.hxx @@ -12,7 +12,7 @@ #include <Modules/CoreCG/Lerp.hxx> #include <ArchKit/ArchKit.hpp> -namespace NewOS +namespace Kernel { inline Bool cKTSyncCall = false; @@ -43,4 +43,4 @@ namespace NewOS return kHandoverHeader->f_GOP.f_Height; } }; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Modules/CoreCG/CoreCG.hxx b/Kernel/Modules/CoreCG/CoreCG.hxx index df65df0c..013cb08a 100644 --- a/Kernel/Modules/CoreCG/CoreCG.hxx +++ b/Kernel/Modules/CoreCG/CoreCG.hxx @@ -8,7 +8,7 @@ #include <NewKit/Defines.hpp> -#define GXInit() NewOS::SizeT __GXCursor = 0 +#define GXInit() Kernel::SizeT __GXCursor = 0 #define GXRgba(R, G, B) (UInt32)(R | G | B) @@ -20,11 +20,11 @@ #define GXDrawAlphaImg(ImgPtr, _Height, _Width, BaseX, BaseY) \ __GXCursor = 0; \ \ - for (NewOS::SizeT i = BaseX; i < (_Height + BaseX); ++i) \ + for (Kernel::SizeT i = BaseX; i < (_Height + BaseX); ++i) \ { \ - for (NewOS::SizeT u = BaseY; u < (_Width + BaseY); ++u) \ + for (Kernel::SizeT u = BaseY; u < (_Width + BaseY); ++u) \ { \ - *(((volatile NewOS::UInt32*)(kHandoverHeader->f_GOP.f_The + \ + *(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ i + \ 4 * u))) |= ImgPtr[__GXCursor]; \ @@ -37,11 +37,11 @@ #define GXDrawImg(ImgPtr, _Height, _Width, BaseX, BaseY) \ __GXCursor = 0; \ \ - for (NewOS::SizeT i = BaseX; i < (_Height + BaseX); ++i) \ + for (Kernel::SizeT i = BaseX; i < (_Height + BaseX); ++i) \ { \ - for (NewOS::SizeT u = BaseY; u < (_Width + BaseY); ++u) \ + for (Kernel::SizeT u = BaseY; u < (_Width + BaseY); ++u) \ { \ - *(((volatile NewOS::UInt32*)(kHandoverHeader->f_GOP.f_The + \ + *(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ i + \ 4 * u))) = ImgPtr[__GXCursor]; \ @@ -53,11 +53,11 @@ /// @brief Cleans a resource. #define GXClear(_Height, _Width, BaseX, BaseY) \ \ - for (NewOS::SizeT i = BaseX; i < _Height + BaseX; ++i) \ + for (Kernel::SizeT i = BaseX; i < _Height + BaseX; ++i) \ { \ - for (NewOS::SizeT u = BaseY; u < _Width + BaseY; ++u) \ + for (Kernel::SizeT u = BaseY; u < _Width + BaseY; ++u) \ { \ - *(((volatile NewOS::UInt32*)(kHandoverHeader->f_GOP.f_The + \ + *(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ i + \ 4 * u))) = gxClearClr; \ @@ -67,11 +67,11 @@ /// @brief Draws inside a zone. #define GXDraw(_Clr, _Height, _Width, BaseX, BaseY) \ \ - for (NewOS::SizeT i = BaseX; i < (_Width + BaseX); ++i) \ + for (Kernel::SizeT i = BaseX; i < (_Width + BaseX); ++i) \ { \ - for (NewOS::SizeT u = BaseY; u < (_Height + BaseY); ++u) \ + for (Kernel::SizeT u = BaseY; u < (_Height + BaseY); ++u) \ { \ - *(((volatile NewOS::UInt32*)(kHandoverHeader->f_GOP.f_The + \ + *(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ i + \ 4 * u))) = _Clr; \ diff --git a/Kernel/Modules/Flash/Flash.hxx b/Kernel/Modules/Flash/Flash.hxx index d75539b6..10c3d520 100644 --- a/Kernel/Modules/Flash/Flash.hxx +++ b/Kernel/Modules/Flash/Flash.hxx @@ -10,10 +10,10 @@ /// @brief get sector count. /// @return drive sector count. -NewOS::SizeT drv_std_get_sector_count(); +Kernel::SizeT drv_std_get_sector_count(); /// @brief get device size. /// @return drive size -NewOS::SizeT drv_std_get_drv_size(); +Kernel::SizeT drv_std_get_drv_size(); #endif // ifdef __FLASH_MEM__ diff --git a/Kernel/Modules/HPET/Defines.hxx b/Kernel/Modules/HPET/Defines.hxx index b0366ad2..6bd097c5 100644 --- a/Kernel/Modules/HPET/Defines.hxx +++ b/Kernel/Modules/HPET/Defines.hxx @@ -14,29 +14,29 @@ #include <NewKit/Defines.hpp> #include <Modules/ACPI/ACPI.hxx> -namespace NewOS +namespace Kernel { struct PACKED HPETAddressStructure final { - NewOS::UInt8 AddressSpaceId; // 0 - system memory, 1 - system I/O - NewOS::UInt8 RegisterBitWidth; - NewOS::UInt8 RegisterBitOffset; - NewOS::UInt8 Reserved; - NewOS::UInt64 Address; + Kernel::UInt8 AddressSpaceId; // 0 - system memory, 1 - system I/O + Kernel::UInt8 RegisterBitWidth; + Kernel::UInt8 RegisterBitOffset; + Kernel::UInt8 Reserved; + Kernel::UInt64 Address; }; struct PACKED HPETHeader final : public SDT { - NewOS::UInt8 HardwareRevId; - NewOS::UInt8 ComparatorCount : 5; - NewOS::UInt8 CounterSize : 1; - NewOS::UInt8 Reserved : 1; - NewOS::UInt8 LegacyReplacement : 1; - NewOS::UInt16 PciVendorId; + Kernel::UInt8 HardwareRevId; + Kernel::UInt8 ComparatorCount : 5; + Kernel::UInt8 CounterSize : 1; + Kernel::UInt8 Reserved : 1; + Kernel::UInt8 LegacyReplacement : 1; + Kernel::UInt16 PciVendorId; HPETAddressStructure Address; - NewOS::UInt8 HpetNumber; - NewOS::UInt16 MinimumTick; - NewOS::UInt8 PageProtection; + Kernel::UInt8 HpetNumber; + Kernel::UInt16 MinimumTick; + Kernel::UInt8 PageProtection; }; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Modules/LTE/IO.hxx b/Kernel/Modules/LTE/IO.hxx index ac24776a..1aaee7bf 100644 --- a/Kernel/Modules/LTE/IO.hxx +++ b/Kernel/Modules/LTE/IO.hxx @@ -16,13 +16,13 @@ Purpose: LTE I/O. /// @brief Long Term Evolution I/O routines.
/// @brief Turn on SIM slot.
-NewOS::Boolean lte_turn_on_slot(NewOS::Int32 slot);
+Kernel::Boolean lte_turn_on_slot(Kernel::Int32 slot);
/// @brief Turn off SIM slot.
-NewOS::Boolean lte_turn_off_slot(NewOS::Int32 slot);
+Kernel::Boolean lte_turn_off_slot(Kernel::Int32 slot);
/// @brief Send AT command.
-NewOS::Boolean lte_send_at_command(NewOS::Char* buf,
- NewOS::Size bufSz);
+Kernel::Boolean lte_send_at_command(Kernel::Char* buf,
+ Kernel::Size bufSz);
#endif // ifndef _INC_NETWORK_LTE_IO_HXX_
diff --git a/Kernel/Modules/MBCI/MBCI.hxx b/Kernel/Modules/MBCI/MBCI.hxx index f19a0192..e8b48501 100644 --- a/Kernel/Modules/MBCI/MBCI.hxx +++ b/Kernel/Modules/MBCI/MBCI.hxx @@ -23,7 +23,7 @@ #define cMBCIZeroSz (8) #define cMBCIMagic "MBCI " -namespace NewOS +namespace Kernel { struct MBCIHostInterface; struct MBCIPacketACK; @@ -80,4 +80,4 @@ namespace NewOS kMBCIHostKindDaisyChain, kMBCIHostKindStartExtended = __UINT16_MAX__, /// Extended vendor table. }; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Modules/PS2/PS2MouseInterface.hxx b/Kernel/Modules/PS2/PS2MouseInterface.hxx index 124d4380..62104a49 100644 --- a/Kernel/Modules/PS2/PS2MouseInterface.hxx +++ b/Kernel/Modules/PS2/PS2MouseInterface.hxx @@ -17,7 +17,7 @@ #include <CompilerKit/CompilerKit.hxx> #include <NewKit/Defines.hpp> -namespace NewOS +namespace Kernel { /// @brief PS/2 Mouse driver interface class PS2MouseInterface final @@ -109,4 +109,4 @@ namespace NewOS return HAL::In8(0x60); } }; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Modules/ReadMe.txt b/Kernel/Modules/ReadMe.txt index acbc3de7..ea2bab42 100644 --- a/Kernel/Modules/ReadMe.txt +++ b/Kernel/Modules/ReadMe.txt @@ -1,5 +1,5 @@ ============== -NewOS Modules +Kernel Modules ============== =============== diff --git a/Kernel/Modules/SCSI/SCSI.hxx b/Kernel/Modules/SCSI/SCSI.hxx index a0feb649..ed291ae7 100644 --- a/Kernel/Modules/SCSI/SCSI.hxx +++ b/Kernel/Modules/SCSI/SCSI.hxx @@ -11,4 +11,4 @@ /// @file SCSI.hxx /// @brief Serial SCSI driver. -typedef NewOS::UInt16 scsi_packet_type[12]; +typedef Kernel::UInt16 scsi_packet_type[12]; diff --git a/Kernel/Modules/XHCI/Defines.hxx b/Kernel/Modules/XHCI/Defines.hxx index 91147a58..00c41851 100644 --- a/Kernel/Modules/XHCI/Defines.hxx +++ b/Kernel/Modules/XHCI/Defines.hxx @@ -16,7 +16,7 @@ #include <NewKit/Defines.hpp> -using namespace NewOS; +using namespace Kernel; #define kUSBCommand (UInt16)0x0 #define kUSBStatus (UInt16)0x2 diff --git a/Kernel/NetworkKit/IP.hpp b/Kernel/NetworkKit/IP.hpp index 63a35182..e6ab2e83 100644 --- a/Kernel/NetworkKit/IP.hpp +++ b/Kernel/NetworkKit/IP.hpp @@ -11,7 +11,7 @@ #include <NewKit/Ref.hpp> #include <NewKit/String.hpp> -namespace NewOS +namespace Kernel { class RawIPAddress6; class RawIPAddress; @@ -80,4 +80,4 @@ namespace NewOS static ErrorOr<StringView> ToStringView(Ref<RawIPAddress> ipv4); static bool IpCheckVersion4(const char* ip); }; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/NetworkKit/IPCEP.hxx b/Kernel/NetworkKit/IPCEP.hxx index 262a374b..48b5b6fd 100644 --- a/Kernel/NetworkKit/IPCEP.hxx +++ b/Kernel/NetworkKit/IPCEP.hxx @@ -23,7 +23,7 @@ #define cRemoteHeaderMagic (0x4950434) -namespace NewOS +namespace Kernel { /// @brief 128-bit IPC address. struct PACKED IPCEPAddress final @@ -74,6 +74,6 @@ namespace NewOS /// @retval true packet is correct. /// @retval false packet is incorrect and process has crashed. Bool ipc_sanitize_packet(IPCEPMessageHeader* pckt); -} // namespace NewOS +} // namespace Kernel #endif // _INC_IPC_ENDPOINT_HXX_ diff --git a/Kernel/NetworkKit/MAC.hxx b/Kernel/NetworkKit/MAC.hxx index 725e3413..2860f9be 100644 --- a/Kernel/NetworkKit/MAC.hxx +++ b/Kernel/NetworkKit/MAC.hxx @@ -10,7 +10,7 @@ #include <NewKit/Defines.hpp> #include <NewKit/String.hpp> -namespace NewOS +namespace Kernel { class MacAddressGetter; @@ -26,4 +26,4 @@ namespace NewOS Array<WideChar, 12>& AsBytes(); }; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/NetworkKit/NetworkDevice.hpp b/Kernel/NetworkKit/NetworkDevice.hpp index b2c29b62..b3e3103e 100644 --- a/Kernel/NetworkKit/NetworkDevice.hpp +++ b/Kernel/NetworkKit/NetworkDevice.hpp @@ -12,7 +12,7 @@ /// @note Can either work with: Ethernet, GPRS, WiFi -namespace NewOS +namespace Kernel { struct NetworkDeviceCommand; class NetworkDevice; @@ -73,7 +73,7 @@ namespace NewOS /// @brief LTE device. using LTENetworkDevice = NetworkDevice; -} // namespace NewOS +} // namespace Kernel #include <NetworkKit/NetworkDevice.inl> diff --git a/Kernel/NewKit/ApplicationInterface.hxx b/Kernel/NewKit/ApplicationInterface.hxx index 46d95095..66737db7 100644 --- a/Kernel/NewKit/ApplicationInterface.hxx +++ b/Kernel/NewKit/ApplicationInterface.hxx @@ -20,12 +20,12 @@ typedef struct _ApplicationInterface final { /// @brief Releases the object exit the process on main object. - NewOS::Void (*Release)(struct _Application* Self, NewOS::Int32 ExitCode); + Kernel::Void (*Release)(struct _Application* Self, Kernel::Int32 ExitCode); /// @brief Invoke a function from the application object. - NewOS::IntPtr (*Invoke)(struct _Application* Self, NewOS::Int32 Sel, ...); + Kernel::IntPtr (*Invoke)(struct _Application* Self, Kernel::Int32 Sel, ...); /// @brief Query a new application object from a GUID. /// @note this doesn't query a process, it query a registered object withtin that app. - NewOS::Void (*Query)(struct _Application* Self, NewOS::VoidPtr* Dst, NewOS::SizeT SzDst, NewOS::XRN::GUIDSequence GuidOf); + Kernel::Void (*Query)(struct _Application* Self, Kernel::VoidPtr* Dst, Kernel::SizeT SzDst, Kernel::XRN::GUIDSequence GuidOf); } ApplicationInterface, *ApplicationInterfaceRef; #define app_cast reinterpret_cast<ApplicationInterfaceRef> diff --git a/Kernel/NewKit/Array.hpp b/Kernel/NewKit/Array.hpp index b0b94584..447d2616 100644 --- a/Kernel/NewKit/Array.hpp +++ b/Kernel/NewKit/Array.hpp @@ -9,7 +9,7 @@ #include <NewKit/ErrorOr.hpp> #include <NewKit/Defines.hpp> -namespace NewOS +namespace Kernel { template <typename T, Size N> class Array final @@ -58,4 +58,4 @@ namespace NewOS private: T fArray[N]; }; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/NewKit/ArrayList.hpp b/Kernel/NewKit/ArrayList.hpp index 9afcfcbe..e701f10b 100644 --- a/Kernel/NewKit/ArrayList.hpp +++ b/Kernel/NewKit/ArrayList.hpp @@ -8,7 +8,7 @@ #include <NewKit/Defines.hpp> -namespace NewOS +namespace Kernel { template <typename T> class ArrayList final @@ -55,4 +55,4 @@ namespace NewOS { return ArrayList<ValueType>{val}; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/NewKit/Atom.hpp b/Kernel/NewKit/Atom.hpp index f7e686cd..69d485fb 100644 --- a/Kernel/NewKit/Atom.hpp +++ b/Kernel/NewKit/Atom.hpp @@ -7,7 +7,7 @@ #include <NewKit/Defines.hpp> -namespace NewOS +namespace Kernel { template <typename T> class Atom final @@ -43,4 +43,4 @@ namespace NewOS private: T fArrayOfAtoms; }; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/NewKit/Crc32.hpp b/Kernel/NewKit/Crc32.hpp index b32b92ff..c7d42710 100644 --- a/Kernel/NewKit/Crc32.hpp +++ b/Kernel/NewKit/Crc32.hpp @@ -1,7 +1,7 @@ /* * ======================================================== * - * NewOS Date Added: 13/02/2023 + * Kernel Date Added: 13/02/2023 * Copyright Zeta Electronics Corporation, all rights reserved. * * ======================================================== @@ -14,9 +14,9 @@ #define kCrcCnt (256) -namespace NewOS +namespace Kernel { UInt ke_calculate_crc32(const Char* crc, UInt len) noexcept; -} // namespace NewOS +} // namespace Kernel #endif // !__CRC32_H__ diff --git a/Kernel/NewKit/Defines.hpp b/Kernel/NewKit/Defines.hpp index 00fb5df9..af8978da 100644 --- a/Kernel/NewKit/Defines.hpp +++ b/Kernel/NewKit/Defines.hpp @@ -22,8 +22,8 @@ #endif #endif -/// @brief NewOS namespace. -namespace NewOS +/// @brief The **newoskrnl** namespace where it's API resides. +namespace Kernel { using voidPtr = void*; using VoidPtr = void*; @@ -131,17 +131,17 @@ namespace NewOS return type.template As<Y>(); } }; -} // namespace NewOS +} // namespace Kernel #define DEDUCE_ENDIAN(address, value) \ - (((reinterpret_cast<NewOS::Char*>(address)[0]) == (value)) \ - ? (NewOS::Endian::kEndianBig) \ - : (NewOS::Endian::kEndianLittle)) + (((reinterpret_cast<Kernel::Char*>(address)[0]) == (value)) \ + ? (Kernel::Endian::kEndianBig) \ + : (Kernel::Endian::kEndianLittle)) #define Yes (true) #define No (false) -#define VoidStar NewOS::voidPtr +#define VoidStar Kernel::voidPtr #ifdef INIT #undef INIT diff --git a/Kernel/NewKit/ErrorOr.hpp b/Kernel/NewKit/ErrorOr.hpp index 343039b5..34697d8a 100644 --- a/Kernel/NewKit/ErrorOr.hpp +++ b/Kernel/NewKit/ErrorOr.hpp @@ -1,7 +1,7 @@ /* * ======================================================== * - * NewOS + * Kernel * Copyright Zeta Electronics Corporation, all rights reserved. * * ======================================================== @@ -12,7 +12,7 @@ #include <NewKit/Defines.hpp> #include <NewKit/Ref.hpp> -namespace NewOS +namespace Kernel { using ErrorT = UInt; @@ -69,4 +69,4 @@ namespace NewOS using ErrorOrAny = ErrorOr<voidPtr>; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/NewKit/Function.hpp b/Kernel/NewKit/Function.hpp index 12ae03f3..186c1961 100644 --- a/Kernel/NewKit/Function.hpp +++ b/Kernel/NewKit/Function.hpp @@ -3,7 +3,7 @@ #include <NewKit/Defines.hpp> -namespace NewOS +namespace Kernel { template <typename T, typename... Args> class Function final @@ -48,6 +48,6 @@ namespace NewOS T(*fFn) (Args... args); }; -} // namespace NewOS +} // namespace Kernel #endif // !_INC_FUNCTION_HPP__ diff --git a/Kernel/NewKit/Json.hpp b/Kernel/NewKit/Json.hpp index 33431c57..b2a0d872 100644 --- a/Kernel/NewKit/Json.hpp +++ b/Kernel/NewKit/Json.hpp @@ -15,14 +15,14 @@ #include <NewKit/String.hpp> #include <NewKit/Utils.hpp> -namespace NewOS +namespace Kernel { /// @brief Json value class class JsonType final { public: explicit JsonType() - : NewOS::JsonType(1, 1) + : Kernel::JsonType(1, 1) { } @@ -115,4 +115,4 @@ namespace NewOS }; using JsonStream = Stream<JsonStreamTrait, JsonType>; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/NewKit/KernelCheck.hpp b/Kernel/NewKit/KernelCheck.hpp index 046cab3d..ae1eec51 100644 --- a/Kernel/NewKit/KernelCheck.hpp +++ b/Kernel/NewKit/KernelCheck.hpp @@ -9,14 +9,14 @@ #include <NewKit/Defines.hpp> -namespace NewOS +namespace Kernel { void ke_runtime_check(bool bExpression, const char* file, const char* line); } #define MUST_PASS_COMPILER(EXPR, MSG) static_assert(EXPR, MSG) #define __MUST_PASS(EXPR, FILE, LINE) \ - NewOS::ke_runtime_check(EXPR, FILE, STRINGIFY(LINE)) + Kernel::ke_runtime_check(EXPR, FILE, STRINGIFY(LINE)) #define MUST_PASS(EXPR) __MUST_PASS(EXPR, __FILE__, __LINE__) #define assert(EXPR) MUST_PASS(EXPR, RUNTIME_CHECK_EXPRESSION) @@ -38,7 +38,7 @@ enum RUNTIME_CHECK RUNTIME_CHECK_COUNT, }; -namespace NewOS +namespace Kernel { class DumpManager final { @@ -50,7 +50,7 @@ namespace NewOS }; void ke_stop(const Int& id); -} // namespace NewOS +} // namespace Kernel #ifdef TRY #undef TRY diff --git a/Kernel/NewKit/Macros.hpp b/Kernel/NewKit/Macros.hpp index e267b523..1f121a37 100644 --- a/Kernel/NewKit/Macros.hpp +++ b/Kernel/NewKit/Macros.hpp @@ -25,7 +25,7 @@ #ifndef ARRAY_SIZE #define ARRAY_SIZE(a) \ (((sizeof(a) / sizeof(*(a))) / \ - (static_cast<NewOS::Size>(!(sizeof(a) % sizeof(*(a))))))) + (static_cast<Kernel::Size>(!(sizeof(a) % sizeof(*(a))))))) #endif #ifndef ALIGN diff --git a/Kernel/NewKit/MutableArray.hpp b/Kernel/NewKit/MutableArray.hpp index 6be9c15e..6f30b0f9 100644 --- a/Kernel/NewKit/MutableArray.hpp +++ b/Kernel/NewKit/MutableArray.hpp @@ -38,7 +38,7 @@ // FIXME: this is a shitty algorithm, which is consumer hungry. // Remove and occurences of that, and remove that class. -namespace NewOS +namespace Kernel { template <typename T> class MutableArray; @@ -149,7 +149,7 @@ namespace NewOS MutableLinkedList<T>* fFirstNode{nullptr}; /* Number of nodes inside of this dynamic array. */ - NewOS::SizeT fNodeCount{0}; + Kernel::SizeT fNodeCount{0}; private: // don't remove that @@ -234,6 +234,6 @@ namespace NewOS MutableLinkedList<T>* fFirstNode{nullptr}; /* Number of nodes inside of this dynamic array. */ - NewOS::SizeT fNodeCount{0}; + Kernel::SizeT fNodeCount{0}; }; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/NewKit/OwnPtr.hpp b/Kernel/NewKit/OwnPtr.hpp index c07f5119..2d7cf65b 100644 --- a/Kernel/NewKit/OwnPtr.hpp +++ b/Kernel/NewKit/OwnPtr.hpp @@ -11,7 +11,7 @@ #include <NewKit/KernelCheck.hpp> #include <NewKit/Ref.hpp> -namespace NewOS +namespace Kernel { template <typename T> class OwnPtr; @@ -91,4 +91,4 @@ namespace NewOS return ret; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/NewKit/PageAllocator.hpp b/Kernel/NewKit/PageAllocator.hpp index 5f307d79..40da5129 100644 --- a/Kernel/NewKit/PageAllocator.hpp +++ b/Kernel/NewKit/PageAllocator.hpp @@ -9,7 +9,7 @@ #include <NewKit/Defines.hpp> #include <NewKit/PageManager.hpp> -namespace NewOS +namespace Kernel { namespace Detail { @@ -17,4 +17,4 @@ namespace NewOS void exec_disable(UIntPtr addr); bool page_disable(UIntPtr addr); } // namespace Detail -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/NewKit/PageManager.hpp b/Kernel/NewKit/PageManager.hpp index 030d839f..233ced0a 100644 --- a/Kernel/NewKit/PageManager.hpp +++ b/Kernel/NewKit/PageManager.hpp @@ -17,7 +17,7 @@ #define kBadAddress (0) #endif // #ifndef kBadAddress -namespace NewOS +namespace Kernel { class PageManager; @@ -78,4 +78,4 @@ namespace NewOS friend PTEWrapper; friend class Pmm; }; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/NewKit/Pair.hpp b/Kernel/NewKit/Pair.hpp index 058a579d..7a7df020 100644 --- a/Kernel/NewKit/Pair.hpp +++ b/Kernel/NewKit/Pair.hpp @@ -8,7 +8,7 @@ #include <NewKit/Defines.hpp> -namespace NewOS +namespace Kernel { -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/NewKit/Pmm.hpp b/Kernel/NewKit/Pmm.hpp index b6b22382..fc020fea 100644 --- a/Kernel/NewKit/Pmm.hpp +++ b/Kernel/NewKit/Pmm.hpp @@ -10,7 +10,7 @@ #include <NewKit/PageManager.hpp> #include <NewKit/Ref.hpp> -namespace NewOS +namespace Kernel { class Pmm; class PTEWrapper; @@ -41,4 +41,4 @@ namespace NewOS private: Ref<PageManager> fPageManager; }; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/NewKit/Ref.hpp b/Kernel/NewKit/Ref.hpp index 5f942baf..0d5550fa 100644 --- a/Kernel/NewKit/Ref.hpp +++ b/Kernel/NewKit/Ref.hpp @@ -10,7 +10,7 @@ #include <NewKit/Defines.hpp> #include <NewKit/KernelCheck.hpp> -namespace NewOS +namespace Kernel { template <typename T> class Ref final @@ -86,4 +86,4 @@ namespace NewOS private: Ref<T> fRef{nullptr}; }; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/NewKit/Stream.hpp b/Kernel/NewKit/Stream.hpp index 11dfec63..bd64910e 100644 --- a/Kernel/NewKit/Stream.hpp +++ b/Kernel/NewKit/Stream.hpp @@ -10,7 +10,7 @@ #include <NewKit/Defines.hpp> #include <NewKit/Ref.hpp> -namespace NewOS +namespace Kernel { template <typename StreamTrait, typename Kind> class Stream final @@ -55,4 +55,4 @@ namespace NewOS Ref<StreamTrait> fStream; Ref<Kind> fKind; }; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/NewKit/String.hpp b/Kernel/NewKit/String.hpp index 14286ca0..f9ab9aa4 100644 --- a/Kernel/NewKit/String.hpp +++ b/Kernel/NewKit/String.hpp @@ -10,7 +10,7 @@ #include <NewKit/ErrorOr.hpp> #include <NewKit/KernelCheck.hpp> -namespace NewOS +namespace Kernel { class StringView final { @@ -73,4 +73,4 @@ namespace NewOS static const char* Format(const char* fmt, const char* from); static bool Equals(const char* lhs, const char* rhs); }; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/NewKit/Utils.hpp b/Kernel/NewKit/Utils.hpp index d162c25c..22192135 100644 --- a/Kernel/NewKit/Utils.hpp +++ b/Kernel/NewKit/Utils.hpp @@ -9,7 +9,7 @@ #include <NewKit/Defines.hpp> -namespace NewOS +namespace Kernel { Int rt_copy_memory(const voidPtr src, voidPtr dst, Size len); Int rt_move_memory(const voidPtr src, voidPtr dst, Size len); @@ -26,4 +26,4 @@ namespace NewOS Int rt_to_lower(Int c); voidPtr rt_string_in_string(const char* in, const char* needle); char* rt_string_has_char(char* str, const char chr); -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/NewKit/Variant.hpp b/Kernel/NewKit/Variant.hpp index 2e097b9d..ee14216a 100644 --- a/Kernel/NewKit/Variant.hpp +++ b/Kernel/NewKit/Variant.hpp @@ -9,7 +9,7 @@ #include <NewKit/Defines.hpp> #include <NewKit/String.hpp> -namespace NewOS +namespace Kernel { class Variant final { @@ -51,4 +51,4 @@ namespace NewOS voidPtr fPtr{nullptr}; VariantKind fKind{VariantKind::kUndefined}; }; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/CodeManager.cxx b/Kernel/Sources/CodeManager.cxx index 9f374c18..91b6c99e 100644 --- a/Kernel/Sources/CodeManager.cxx +++ b/Kernel/Sources/CodeManager.cxx @@ -8,7 +8,7 @@ #include <KernelKit/CodeManager.hpp> #include <KernelKit/ProcessScheduler.hxx> -namespace NewOS +namespace Kernel { /// @brief Executes a new process from a function. kernel code only. /// @note This sets up a new stack, anything on the main function that calls the kernel will not be accessible. @@ -27,4 +27,4 @@ namespace NewOS return ProcessScheduler::The().Leak().Add(refProc); } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/Crc32.cxx b/Kernel/Sources/Crc32.cxx index f46ceaa8..8c555dc5 100644 --- a/Kernel/Sources/Crc32.cxx +++ b/Kernel/Sources/Crc32.cxx @@ -9,7 +9,7 @@ // @file CRC32.cpp // @brief Check sequence implementation. -namespace NewOS +namespace Kernel { /// @brief The CRC32 table. UInt kCrcTbl[kCrcCnt] = { @@ -71,4 +71,4 @@ namespace NewOS // return (~crc); also works, does the same thing. return (crc ^ 0xffffffff); } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/CxxAbi.cxx b/Kernel/Sources/CxxAbi.cxx index efc908d7..febffbc4 100644 --- a/Kernel/Sources/CxxAbi.cxx +++ b/Kernel/Sources/CxxAbi.cxx @@ -13,17 +13,17 @@ atexit_func_entry_t __atexit_funcs[kDSOMaxObjects]; uarch_t __atexit_func_count; /// @brief Dynamic Shared Object Handle. -NewOS::UIntPtr __dso_handle; +Kernel::UIntPtr __dso_handle; EXTERN_C void __cxa_pure_virtual() { - NewOS::kcout << "newoskrnl: C++ placeholder method.\n"; + Kernel::kcout << "newoskrnl: C++ placeholder method.\n"; } EXTERN_C void ___chkstk_ms() { - NewOS::err_bug_check_raise(); - NewOS::err_bug_check(); + Kernel::err_bug_check_raise(); + Kernel::err_bug_check(); } #ifdef __NEWOS_ARM64__ diff --git a/Kernel/Sources/DriveManager.cxx b/Kernel/Sources/DriveManager.cxx index fa4b8298..039a4e00 100644 --- a/Kernel/Sources/DriveManager.cxx +++ b/Kernel/Sources/DriveManager.cxx @@ -13,7 +13,7 @@ /// @file DriveManager.cxx /// @brief Kernel drive manager. -namespace NewOS +namespace Kernel { static UInt16 kATAIO = 0U; static UInt8 kATAMaster = 0U; @@ -146,4 +146,4 @@ namespace NewOS return trait; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/FS/NewFS.cxx b/Kernel/Sources/FS/NewFS.cxx index 20451f96..1eef02d8 100644 --- a/Kernel/Sources/FS/NewFS.cxx +++ b/Kernel/Sources/FS/NewFS.cxx @@ -18,7 +18,7 @@ #include <FirmwareKit/EPM.hxx> #include <KernelKit/ProcessScheduler.hxx> -using namespace NewOS; +using namespace Kernel; ///! BUGS: 0 @@ -943,7 +943,7 @@ SizeT NewFSParser::Tell(_Input _Output NewCatalog* catalog) return 0; } -namespace NewOS::Detail +namespace Kernel::Detail { /***********************************************************************************/ /// @brief Construct NewFS drives. @@ -978,6 +978,6 @@ namespace NewOS::Detail return true; } -} // namespace NewOS::Detail +} // namespace Kernel::Detail #endif // ifdef __FSKIT_NEWFS__ diff --git a/Kernel/Sources/FileManager.cxx b/Kernel/Sources/FileManager.cxx index 11830252..35913b85 100644 --- a/Kernel/Sources/FileManager.cxx +++ b/Kernel/Sources/FileManager.cxx @@ -8,9 +8,9 @@ #include <NewKit/Utils.hpp> /// BUGS: 0 -//! @brief File manager for NewOS. +//! @brief File manager for Kernel. -namespace NewOS +namespace Kernel { static FilesystemManagerInterface* kMounted = nullptr; @@ -189,4 +189,4 @@ namespace NewOS return fImpl; } #endif // __FSKIT_NEWFS__ -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/Framebuffer.cxx b/Kernel/Sources/Framebuffer.cxx index d6a4e124..205291bb 100644 --- a/Kernel/Sources/Framebuffer.cxx +++ b/Kernel/Sources/Framebuffer.cxx @@ -19,16 +19,16 @@ * */ -using namespace NewOS; +using namespace Kernel; -namespace NewOS +namespace Kernel { const UInt32 kRgbRed = 0x000000FF; const UInt32 kRgbGreen = 0x0000FF00; const UInt32 kRgbBlue = 0x00FF0000; const UInt32 kRgbBlack = 0x00000000; const UInt32 kRgbWhite = 0xFFFFFFFF; -} // namespace NewOS +} // namespace Kernel /** * @brief Get Pixel at @@ -73,11 +73,11 @@ Ref<FramebufferContext*>& Framebuffer::Leak() Framebuffer& Framebuffer::DrawRect(SizeT width, SizeT height, SizeT x, SizeT y, UInt32 color) { - for (NewOS::SizeT i = x; i < width + x; ++i) + for (Kernel::SizeT i = x; i < width + x; ++i) { - for (NewOS::SizeT u = y; u < height + y; ++u) + for (Kernel::SizeT u = y; u < height + y; ++u) { - *(((volatile NewOS::UInt32*)(fFrameBufferAddr.Leak()->fBase + + *(((volatile Kernel::UInt32*)(fFrameBufferAddr.Leak()->fBase + 4 * fFrameBufferAddr.Leak()->fBpp * i + 4 * u))) = color; } @@ -88,7 +88,7 @@ Framebuffer& Framebuffer::DrawRect(SizeT width, SizeT height, SizeT x, SizeT y, Framebuffer& Framebuffer::PutPixel(SizeT x, SizeT y, UInt32 color) { - *(((volatile NewOS::UInt32*)(fFrameBufferAddr.Leak()->fBase + + *(((volatile Kernel::UInt32*)(fFrameBufferAddr.Leak()->fBase + 4 * fFrameBufferAddr.Leak()->fBpp * x + 4 * y))) = color; diff --git a/Kernel/Sources/GUIDWizard.cxx b/Kernel/Sources/GUIDWizard.cxx index 9347f022..0af8e289 100644 --- a/Kernel/Sources/GUIDWizard.cxx +++ b/Kernel/Sources/GUIDWizard.cxx @@ -17,7 +17,7 @@ // @brief Size of UUID. #define kUUIDSize 37 -namespace NewOS::XRN::Version1 +namespace Kernel::XRN::Version1 { auto make_sequence(const ArrayList<UShort>& uuidSeq) -> Ref<GUIDSequence*> { @@ -62,4 +62,4 @@ namespace NewOS::XRN::Version1 return ErrorOr<Ref<StringView>>{-1}; } -} // namespace NewOS::XRN::Version1 +} // namespace Kernel::XRN::Version1 diff --git a/Kernel/Sources/GUIDWrapper.cxx b/Kernel/Sources/GUIDWrapper.cxx index e453227b..259c76e2 100644 --- a/Kernel/Sources/GUIDWrapper.cxx +++ b/Kernel/Sources/GUIDWrapper.cxx @@ -6,6 +6,6 @@ #include <CFKit/GUIDWrapper.hpp> -namespace NewOS::XRN +namespace Kernel::XRN { } diff --git a/Kernel/Sources/HError.cxx b/Kernel/Sources/HError.cxx index 39915f65..23d63953 100644 --- a/Kernel/Sources/HError.cxx +++ b/Kernel/Sources/HError.cxx @@ -7,7 +7,7 @@ #include <KernelKit/HError.hpp> #include <NewKit/KernelCheck.hpp> -namespace NewOS +namespace Kernel { STATIC Bool cRaise = false; @@ -29,4 +29,4 @@ namespace NewOS if (!cRaise) cRaise = true; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/HalPageAlloc.cxx b/Kernel/Sources/HalPageAlloc.cxx index 3df68501..0339745b 100644 --- a/Kernel/Sources/HalPageAlloc.cxx +++ b/Kernel/Sources/HalPageAlloc.cxx @@ -15,9 +15,9 @@ #include <NewKit/Defines.hpp> #include <NewKit/KernelCheck.hpp> -STATIC NewOS::Boolean kAllocationInProgress = false; +STATIC Kernel::Boolean kAllocationInProgress = false; -namespace NewOS +namespace Kernel { namespace HAL { @@ -106,4 +106,4 @@ namespace NewOS return hal_try_alloc_new_page(rw, user, size); } } // namespace HAL -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/IndexableProperty.cxx b/Kernel/Sources/IndexableProperty.cxx index 7e609037..5cb1d54a 100644 --- a/Kernel/Sources/IndexableProperty.cxx +++ b/Kernel/Sources/IndexableProperty.cxx @@ -16,7 +16,7 @@ #define kMaxLenIndexer 256 -namespace NewOS +namespace Kernel { namespace Indexer { @@ -56,4 +56,4 @@ namespace NewOS } } } // namespace Indexer -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/Json.cxx b/Kernel/Sources/Json.cxx index 48e215b8..16a74765 100644 --- a/Kernel/Sources/Json.cxx +++ b/Kernel/Sources/Json.cxx @@ -6,7 +6,7 @@ #include <NewKit/Json.hpp> -using namespace NewOS; +using namespace Kernel; /// @brief Undefined object, is null in length. -INIT(NewOS::JsonType::kUndefined, NewOS::JsonType); +INIT(Kernel::JsonType::kUndefined, Kernel::JsonType); diff --git a/Kernel/Sources/KeMain.cxx b/Kernel/Sources/KeMain.cxx index e5ffc4fa..7ec96539 100644 --- a/Kernel/Sources/KeMain.cxx +++ b/Kernel/Sources/KeMain.cxx @@ -24,30 +24,30 @@ #include <NewKit/Utils.hpp> #include <KernelKit/CodeManager.hpp> -namespace NewOS::Detail +namespace Kernel::Detail { /// @brief Filesystem auto installer, additional checks are also done by the class. class FilesystemInstaller final { - NewOS::NewFilesystemManager* fNewFS{nullptr}; + Kernel::NewFilesystemManager* fNewFS{nullptr}; public: /// @brief wizard constructor. explicit FilesystemInstaller() { - if (NewOS::FilesystemManagerInterface::GetMounted()) + if (Kernel::FilesystemManagerInterface::GetMounted()) { /// Mounted partition, cool! - NewOS::kcout + Kernel::kcout << "newoskrnl: No need to create for a NewFS partition here...\r"; } else { /// Not mounted partition, auto-mount. ///! Mounts a NewFS block. - fNewFS = new NewOS::NewFilesystemManager(); + fNewFS = new Kernel::NewFilesystemManager(); - NewOS::FilesystemManagerInterface::Mount(fNewFS); + Kernel::FilesystemManagerInterface::Mount(fNewFS); if (fNewFS->GetParser()) { @@ -57,13 +57,13 @@ namespace NewOS::Detail "C:\\Boot\\", "C:\\System\\", "C:\\Support\\", "C:\\Applications\\", "C:\\Users\\", "C:\\Library\\", "C:\\Mount\\", "C:\\DCIM\\", "C:\\Storage\\"}; - for (NewOS::SizeT dirIndx = 0UL; dirIndx < cDirCount; ++dirIndx) + for (Kernel::SizeT dirIndx = 0UL; dirIndx < cDirCount; ++dirIndx) { auto catalogDir = fNewFS->GetParser()->GetCatalog(cDirStr[dirIndx]); if (catalogDir) { - NewOS::kcout << "newoskrnl: Already here\r"; + Kernel::kcout << "newoskrnl: Already here\r"; delete catalogDir; continue; @@ -74,23 +74,23 @@ namespace NewOS::Detail NewFork theFork{0}; - const NewOS::Char* cSrcName = cFolderInfo; + const Kernel::Char* cSrcName = cFolderInfo; - NewOS::rt_copy_memory((NewOS::VoidPtr)(cSrcName), theFork.ForkName, - NewOS::rt_string_len(cSrcName)); + Kernel::rt_copy_memory((Kernel::VoidPtr)(cSrcName), theFork.ForkName, + Kernel::rt_string_len(cSrcName)); - NewOS::rt_copy_memory((NewOS::VoidPtr)(catalogDir->Name), + Kernel::rt_copy_memory((Kernel::VoidPtr)(catalogDir->Name), theFork.CatalogName, - NewOS::rt_string_len(catalogDir->Name)); + Kernel::rt_string_len(catalogDir->Name)); delete catalogDir; theFork.DataSize = kNewFSForkSize; theFork.ResourceId = 0; - theFork.ResourceKind = NewOS::kNewFSRsrcForkKind; - theFork.Kind = NewOS::kNewFSDataForkKind; + theFork.ResourceKind = Kernel::kNewFSRsrcForkKind; + theFork.Kind = Kernel::kNewFSDataForkKind; - NewOS::StringView metadataFolder(kNewFSSectorSz); + Kernel::StringView metadataFolder(kNewFSSectorSz); metadataFolder += "<p>Kind: folder</p>\r<p>Created by: system</p>\r<p>Edited by: " @@ -100,14 +100,14 @@ namespace NewOS::Detail metadataFolder += cDirStr[dirIndx]; metadataFolder += "</p>\r"; - const NewOS::SizeT metadataSz = kNewFSSectorSz; + const Kernel::SizeT metadataSz = kNewFSSectorSz; auto catalogSystem = fNewFS->GetParser()->GetCatalog(cDirStr[dirIndx]); fNewFS->GetParser()->CreateFork(catalogSystem, theFork); fNewFS->GetParser()->WriteCatalog( - catalogSystem, (NewOS::VoidPtr)(metadataFolder.CData()), + catalogSystem, (Kernel::VoidPtr)(metadataFolder.CData()), metadataSz, cFolderInfo); delete catalogSystem; @@ -117,12 +117,12 @@ namespace NewOS::Detail NewCatalog* catalogDisk = this->fNewFS->GetParser()->GetCatalog("C:\\Mount\\SIM:"); - const NewOS::Char* cSrcName = "DISK-INF"; + const Kernel::Char* cSrcName = "DISK-INF"; if (catalogDisk) { - auto bufferInfoDisk = (NewOS::Char*)this->fNewFS->GetParser()->ReadCatalog(catalogDisk, kNewFSSectorSz, cSrcName); - NewOS::kcout << bufferInfoDisk << NewOS::end_line(); + auto bufferInfoDisk = (Kernel::Char*)this->fNewFS->GetParser()->ReadCatalog(catalogDisk, kNewFSSectorSz, cSrcName); + Kernel::kcout << bufferInfoDisk << Kernel::end_line(); delete bufferInfoDisk; delete catalogDisk; @@ -132,37 +132,37 @@ namespace NewOS::Detail catalogDisk = (NewCatalog*)this->Leak()->CreateAlias("C:\\Mount\\SIM:"); - NewOS::StringView diskFolder(kNewFSSectorSz); + Kernel::StringView diskFolder(kNewFSSectorSz); diskFolder += - "<p>Kind: alias to SIM</p>\r<p>Created by: system</p>\r<p>Edited " + "<p>Kind: alias to SIM Card</p>\r<p>Created by: system</p>\r<p>Edited " "by: " - "system</p>\r<p>Volume Type: SIM</p>\r"; + "system</p>\r<p>Volume Type: SIM Card</p>\r"; diskFolder += "<p>Root: "; - diskFolder += NewOS::NewFilesystemHelper::Root(); + diskFolder += Kernel::NewFilesystemHelper::Root(); diskFolder += "</p>\r"; NewFork theDiskFork{0}; - NewOS::rt_copy_memory((NewOS::VoidPtr)(cSrcName), theDiskFork.ForkName, - NewOS::rt_string_len(cSrcName)); + Kernel::rt_copy_memory((Kernel::VoidPtr)(cSrcName), theDiskFork.ForkName, + Kernel::rt_string_len(cSrcName)); - NewOS::rt_copy_memory((NewOS::VoidPtr)(catalogDisk->Name), + Kernel::rt_copy_memory((Kernel::VoidPtr)(catalogDisk->Name), theDiskFork.CatalogName, - NewOS::rt_string_len(catalogDisk->Name)); + Kernel::rt_string_len(catalogDisk->Name)); theDiskFork.DataSize = kNewFSForkSize; theDiskFork.ResourceId = 0; - theDiskFork.ResourceKind = NewOS::kNewFSRsrcForkKind; - theDiskFork.Kind = NewOS::kNewFSDataForkKind; + theDiskFork.ResourceKind = Kernel::kNewFSRsrcForkKind; + theDiskFork.Kind = Kernel::kNewFSDataForkKind; fNewFS->GetParser()->CreateFork(catalogDisk, theDiskFork); fNewFS->GetParser()->WriteCatalog(catalogDisk, - (NewOS::VoidPtr)diskFolder.CData(), + (Kernel::VoidPtr)diskFolder.CData(), kNewFSSectorSz, cSrcName); - NewOS::kcout << diskFolder.CData() << NewOS::end_line(); + Kernel::kcout << diskFolder.CData() << Kernel::end_line(); delete catalogDisk; } @@ -175,7 +175,7 @@ namespace NewOS::Detail /// @brief Grab the disk's NewFS reference. /// @return NewFilesystemManager the filesystem interface - NewOS::NewFilesystemManager* Leak() + Kernel::NewFilesystemManager* Leak() { return fNewFS; } @@ -184,38 +184,38 @@ namespace NewOS::Detail /// @brief Loads necessary servers for the kernel -> user mode switch. /// @param void no args. /// @return void no return value. - STATIC NewOS::Void ke_launch_srv(NewOS::Void) + STATIC Kernel::Void ke_launch_srv(Kernel::Void) { // load security server. - NewOS::PEFLoader secureSrv("C:\\System\\securesrv.exe"); + Kernel::PEFLoader launchDevil("C:\\System\\launchd"); - if (!secureSrv.IsLoaded()) + if (!launchDevil.IsLoaded()) { - NewOS::ke_stop(RUNTIME_CHECK_FAILED); + Kernel::ke_stop(RUNTIME_CHECK_FAILED); } - NewOS::Utils::execute_from_image(secureSrv, - NewOS::ProcessHeader::kAppKind); + Kernel::Utils::execute_from_image(launchDevil, + Kernel::ProcessHeader::kAppKind); /// load middleware service. - NewOS::PEFLoader middlewareSvc("C:\\System\\middlewaresvc.exe"); + Kernel::PEFLoader stageBoard("C:\\System\\stageboard"); - if (!middlewareSvc.IsLoaded()) + if (!stageBoard.IsLoaded()) { - NewOS::ke_stop(RUNTIME_CHECK_FAILED); + Kernel::ke_stop(RUNTIME_CHECK_FAILED); } - NewOS::Utils::execute_from_image(middlewareSvc, - NewOS::ProcessHeader::kAppKind); + Kernel::Utils::execute_from_image(stageBoard, + Kernel::ProcessHeader::kAppKind); } -} // namespace NewOS::Detail +} // namespace Kernel::Detail /// @brief Application entrypoint. /// @param Void /// @return Void -EXTERN_C NewOS::Void KeMain(NewOS::Void) +EXTERN_C Kernel::Void KeMain(Kernel::Void) { /// Now run kernel loop, until no process are running. - NewOS::Detail::FilesystemInstaller(); // automatic filesystem creation. - NewOS::Detail::ke_launch_srv(); + Kernel::Detail::FilesystemInstaller(); // automatic filesystem creation. + Kernel::Detail::ke_launch_srv(); } diff --git a/Kernel/Sources/KernelCheck.cxx b/Kernel/Sources/KernelCheck.cxx index e0e61ab2..6eb5429c 100644 --- a/Kernel/Sources/KernelCheck.cxx +++ b/Kernel/Sources/KernelCheck.cxx @@ -14,8 +14,8 @@ EXTERN_C [[noreturn]] void ke_wait_for_debugger() while (true) { #ifdef __NEWOS_AMD64__ - NewOS::HAL::rt_cli(); - NewOS::HAL::rt_halt(); + Kernel::HAL::rt_cli(); + Kernel::HAL::rt_halt(); #endif } } @@ -23,9 +23,9 @@ EXTERN_C [[noreturn]] void ke_wait_for_debugger() /* Each error code is attributed with an ID, which will prompt a string onto the * screen. Wait for debugger... */ -namespace NewOS +namespace Kernel { - void ke_stop(const NewOS::Int& id) + void ke_stop(const Kernel::Int& id) { kcout << "*** STOP *** \r"; kcout << "*** Kernel has trigerred a runtime stop. *** \r"; @@ -105,7 +105,7 @@ namespace NewOS #endif // __DEBUG__ - NewOS::ke_stop(RUNTIME_CHECK_FAILED); // Runtime Check failed + Kernel::ke_stop(RUNTIME_CHECK_FAILED); // Runtime Check failed } } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/KernelHeap.cxx b/Kernel/Sources/KernelHeap.cxx index 770e11da..7bfd9c07 100644 --- a/Kernel/Sources/KernelHeap.cxx +++ b/Kernel/Sources/KernelHeap.cxx @@ -16,7 +16,7 @@ #define kKernelHeapMagic (0xD4D7D5) #define kKernelHeapHeaderPaddingSz (16U) -namespace NewOS +namespace Kernel { STATIC SizeT kHeapCount = 0UL; STATIC PageManager kHeapPageManager; @@ -192,4 +192,4 @@ namespace NewOS return false; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/LockDelegate.cxx b/Kernel/Sources/LockDelegate.cxx index e2134f60..6f0aa1d4 100644 --- a/Kernel/Sources/LockDelegate.cxx +++ b/Kernel/Sources/LockDelegate.cxx @@ -6,7 +6,7 @@ #include <KernelKit/LockDelegate.hpp> -namespace NewOS +namespace Kernel { /// Leave it empty for now. -} // namespace NewOS
\ No newline at end of file +} // namespace Kernel
\ No newline at end of file diff --git a/Kernel/Sources/Network/IP.cxx b/Kernel/Sources/Network/IP.cxx index 46cdc662..676e12a8 100644 --- a/Kernel/Sources/Network/IP.cxx +++ b/Kernel/Sources/Network/IP.cxx @@ -7,7 +7,7 @@ #include <NetworkKit/IP.hpp> #include <NewKit/Utils.hpp> -namespace NewOS +namespace Kernel { char* RawIPAddress::Address() { @@ -123,4 +123,4 @@ namespace NewOS return true; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/Network/IPCEP.cxx b/Kernel/Sources/Network/IPCEP.cxx index 930969fb..1869035b 100644 --- a/Kernel/Sources/Network/IPCEP.cxx +++ b/Kernel/Sources/Network/IPCEP.cxx @@ -8,7 +8,7 @@ #include <KernelKit/HError.hpp> #include <KernelKit/ProcessScheduler.hxx> -using namespace NewOS; +using namespace Kernel; /// @internal /// @brief The internal sanitize function. @@ -56,7 +56,7 @@ _Fail: return false; } -namespace NewOS +namespace Kernel { /// @brief Sanitize packet function /// @retval true packet is correct. diff --git a/Kernel/Sources/Network/NetworkDevice.cxx b/Kernel/Sources/Network/NetworkDevice.cxx index 24af10eb..4ee633e8 100644 --- a/Kernel/Sources/Network/NetworkDevice.cxx +++ b/Kernel/Sources/Network/NetworkDevice.cxx @@ -7,7 +7,7 @@ #include <NetworkKit/NetworkDevice.hpp> #include <NewKit/Utils.hpp> -namespace NewOS +namespace Kernel { /// \brief Getter for fNetworkName. const char* NetworkDevice::Name() const @@ -32,4 +32,4 @@ namespace NewOS return true; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/New+Delete.cxx b/Kernel/Sources/New+Delete.cxx index 66912fb8..d87df3e6 100644 --- a/Kernel/Sources/New+Delete.cxx +++ b/Kernel/Sources/New+Delete.cxx @@ -12,7 +12,7 @@ void* operator new[](size_t sz) if (sz == 0) ++sz; - return NewOS::ke_new_ke_heap(sz, true, false); + return Kernel::ke_new_ke_heap(sz, true, false); } void* operator new(size_t sz) @@ -20,7 +20,7 @@ void* operator new(size_t sz) if (sz == 0) ++sz; - return NewOS::ke_new_ke_heap(sz, true, false); + return Kernel::ke_new_ke_heap(sz, true, false); } void operator delete[](void* ptr) @@ -28,7 +28,7 @@ void operator delete[](void* ptr) if (ptr == nullptr) return; - NewOS::ke_delete_ke_heap(ptr); + Kernel::ke_delete_ke_heap(ptr); } void operator delete(void* ptr) @@ -36,7 +36,7 @@ void operator delete(void* ptr) if (ptr == nullptr) return; - NewOS::ke_delete_ke_heap(ptr); + Kernel::ke_delete_ke_heap(ptr); } void operator delete(void* ptr, size_t sz) @@ -46,5 +46,5 @@ void operator delete(void* ptr, size_t sz) NEWOS_UNUSED(sz); - NewOS::ke_delete_ke_heap(ptr); + Kernel::ke_delete_ke_heap(ptr); } diff --git a/Kernel/Sources/NewFS+FileManager.cxx b/Kernel/Sources/NewFS+FileManager.cxx index 724175b8..2658d784 100644 --- a/Kernel/Sources/NewFS+FileManager.cxx +++ b/Kernel/Sources/NewFS+FileManager.cxx @@ -12,7 +12,7 @@ /// @brief NewFS File manager. /// BUGS: 0 -namespace NewOS +namespace Kernel { /// @brief C++ constructor NewFilesystemManager::NewFilesystemManager() @@ -84,6 +84,6 @@ namespace NewOS { return kNewFSSeparator; } -} // namespace NewOS +} // namespace Kernel #endif // ifdef __FSKIT_NEWFS__ diff --git a/Kernel/Sources/NewFS+IO.cxx b/Kernel/Sources/NewFS+IO.cxx index fc2a3842..884f8c11 100644 --- a/Kernel/Sources/NewFS+IO.cxx +++ b/Kernel/Sources/NewFS+IO.cxx @@ -26,7 +26,7 @@ #define NEWFS_WRITE(DRV, TRAITS, MP) (MP->DRV()).fOutput(&TRAITS) #define NEWFS_READ(DRV, TRAITS, MP) (MP->DRV()).fInput(&TRAITS) -using namespace NewOS; +using namespace Kernel; /// @brief Read from newfs disk. /// @param Mnt mounted interface. diff --git a/Kernel/Sources/NewFS+Journal.cxx b/Kernel/Sources/NewFS+Journal.cxx index 83f2fe66..f69744cc 100644 --- a/Kernel/Sources/NewFS+Journal.cxx +++ b/Kernel/Sources/NewFS+Journal.cxx @@ -13,10 +13,10 @@ ///! @file NewFS+Journal.cxx ///! @brief Journaling for NewFS. -namespace NewOS::Journal +namespace Kernel::Journal { -} // namespace NewOS::Journal +} // namespace Kernel::Journal -using namespace NewOS; +using namespace Kernel; #endif // ifdef __FSKIT_NEWFS__ diff --git a/Kernel/Sources/PEFCodeManager.cxx b/Kernel/Sources/PEFCodeManager.cxx index 09f6e90e..6f06ac37 100644 --- a/Kernel/Sources/PEFCodeManager.cxx +++ b/Kernel/Sources/PEFCodeManager.cxx @@ -13,7 +13,7 @@ #include <NewKit/OwnPtr.hpp> #include <NewKit/String.hpp> -namespace NewOS +namespace Kernel { namespace Detail { @@ -238,4 +238,4 @@ namespace NewOS { return kPefApplicationMime; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/PEFSharedObject.cxx b/Kernel/Sources/PEFSharedObject.cxx index 0d5949f1..3e7ec9eb 100644 --- a/Kernel/Sources/PEFSharedObject.cxx +++ b/Kernel/Sources/PEFSharedObject.cxx @@ -1,7 +1,7 @@ /* * ======================================================== * - * NewOS + * Kernel * Copyright Zeta Electronics Corporation, all rights reserved. * * ======================================================== @@ -24,7 +24,7 @@ ------------------------------------------- */ -using namespace NewOS; +using namespace Kernel; /***********************************************************************************/ /// @file SharedObjectRT.cxx diff --git a/Kernel/Sources/PRDT.cxx b/Kernel/Sources/PRDT.cxx index 57b57d40..73dadbab 100644 --- a/Kernel/Sources/PRDT.cxx +++ b/Kernel/Sources/PRDT.cxx @@ -8,7 +8,7 @@ #include <NewKit/String.hpp> #include <StorageKit/PRDT.hpp> -namespace NewOS +namespace Kernel { /// @brief constructs a new PRD. /// @param prd PRD reference. @@ -19,4 +19,4 @@ namespace NewOS prd.Leak().fSectorCount = 0x0; prd.Leak().fEndBit = 0x0; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/PageAllocator.cxx b/Kernel/Sources/PageAllocator.cxx index 11e21c4d..27006885 100644 --- a/Kernel/Sources/PageAllocator.cxx +++ b/Kernel/Sources/PageAllocator.cxx @@ -9,7 +9,7 @@ #include <NewKit/PageAllocator.hpp> /// @brief Internal namespace, used internally by kernel. -namespace NewOS::Detail +namespace Kernel::Detail { VoidPtr create_page_wrapper(Boolean rw, Boolean user, SizeT pageSz) { @@ -49,4 +49,4 @@ namespace NewOS::Detail return false; } -} // namespace NewOS::Detail +} // namespace Kernel::Detail diff --git a/Kernel/Sources/PageManager.cxx b/Kernel/Sources/PageManager.cxx index 413c830f..35693310 100644 --- a/Kernel/Sources/PageManager.cxx +++ b/Kernel/Sources/PageManager.cxx @@ -16,7 +16,7 @@ //! null deref will throw (Page Zero detected, aborting app!) #define kProtectedRegionEnd (512) -namespace NewOS +namespace Kernel { PTEWrapper::PTEWrapper(Boolean Rw, Boolean User, Boolean ExecDisable, UIntPtr VirtAddr) : fRw(Rw), @@ -64,7 +64,7 @@ namespace NewOS PTEWrapper PageManager::Request(Boolean Rw, Boolean User, Boolean ExecDisable, SizeT Sz) { // Store PTE wrapper right after PTE. - VoidPtr ptr = NewOS::HAL::hal_alloc_page(Rw, User, Sz); + VoidPtr ptr = Kernel::HAL::hal_alloc_page(Rw, User, Sz); return PTEWrapper{Rw, User, ExecDisable, reinterpret_cast<UIntPtr>(ptr)}; } @@ -115,4 +115,4 @@ namespace NewOS { return this->fExecDisable; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/PermissionSelector.cxx b/Kernel/Sources/PermissionSelector.cxx index 939a9648..e5cfd409 100644 --- a/Kernel/Sources/PermissionSelector.cxx +++ b/Kernel/Sources/PermissionSelector.cxx @@ -1,7 +1,7 @@ /* * ======================================================== * - * NewOS + * Kernel * Copyright Zeta Electronics Corporation, all rights reserved. * * File: PermissionSelector.cpp @@ -15,7 +15,7 @@ /// bugs 0 -namespace NewOS +namespace Kernel { PermissionSelector::PermissionSelector(const Int32& sel) : fRing((RingKind)sel) @@ -44,4 +44,4 @@ namespace NewOS { return this->fRing; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/Pmm.cxx b/Kernel/Sources/Pmm.cxx index dc1168bd..22813206 100644 --- a/Kernel/Sources/Pmm.cxx +++ b/Kernel/Sources/Pmm.cxx @@ -15,7 +15,7 @@ #include <HALKit/AMD64/Processor.hpp> #endif -namespace NewOS +namespace Kernel { /// @brief Pmm constructor. Pmm::Pmm() @@ -93,4 +93,4 @@ namespace NewOS return true; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/ProcessScheduler.cxx b/Kernel/Sources/ProcessScheduler.cxx index ddeff7f2..316a9362 100644 --- a/Kernel/Sources/ProcessScheduler.cxx +++ b/Kernel/Sources/ProcessScheduler.cxx @@ -21,7 +21,7 @@ /* This file handles the process scheduling. */ /***********************************************************************************/ -namespace NewOS +namespace Kernel { /***********************************************************************************/ /// @brief Exit Code global @@ -397,4 +397,4 @@ namespace NewOS { return mTeam.AsArray().Count() == 0; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/ProcessTeam.cxx b/Kernel/Sources/ProcessTeam.cxx index f01841a6..b55ae855 100644 --- a/Kernel/Sources/ProcessTeam.cxx +++ b/Kernel/Sources/ProcessTeam.cxx @@ -11,7 +11,7 @@ #include <KernelKit/ProcessScheduler.hxx> -namespace NewOS +namespace Kernel { /// @brief Process list array getter. /// @return The list of process to schedule. @@ -33,6 +33,6 @@ namespace NewOS { return mCurrentProcess; } -} // namespace NewOS +} // namespace Kernel // last rev 05-03-24 diff --git a/Kernel/Sources/Property.cxx b/Kernel/Sources/Property.cxx index 285d7aaa..db1e0579 100644 --- a/Kernel/Sources/Property.cxx +++ b/Kernel/Sources/Property.cxx @@ -6,7 +6,7 @@ #include <CFKit/Property.hpp> -namespace NewOS +namespace Kernel { Property::Property(const StringView& sw) : fName(sw) @@ -25,4 +25,4 @@ namespace NewOS { return fAction; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/SMPManager.cxx b/Kernel/Sources/SMPManager.cxx index f00fbee1..8b0aca9b 100644 --- a/Kernel/Sources/SMPManager.cxx +++ b/Kernel/Sources/SMPManager.cxx @@ -11,10 +11,10 @@ ///! BUGS: 0 ///! @file SMPManager.cxx -///! @brief This file handles multi processing in NewOS. +///! @brief This file handles multi processing in Kernel. ///! @brief Multi processing is needed for multi-tasking operations. -namespace NewOS +namespace Kernel { ///! A HardwareThread class takes care of it's owned hardware thread. ///! It has a stack for it's core. @@ -244,4 +244,4 @@ namespace NewOS { return fThreadList.Count(); } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/Semaphore.cxx b/Kernel/Sources/Semaphore.cxx index 45fccbca..bef37fa8 100644 --- a/Kernel/Sources/Semaphore.cxx +++ b/Kernel/Sources/Semaphore.cxx @@ -7,7 +7,7 @@ #include <KernelKit/ProcessScheduler.hxx> #include <KernelKit/Semaphore.hpp> -namespace NewOS +namespace Kernel { bool Semaphore::Unlock() noexcept { @@ -59,4 +59,4 @@ namespace NewOS } } } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/Storage/AHCIDeviceInterface.cxx b/Kernel/Sources/Storage/AHCIDeviceInterface.cxx index 3d5632db..0366efe9 100644 --- a/Kernel/Sources/Storage/AHCIDeviceInterface.cxx +++ b/Kernel/Sources/Storage/AHCIDeviceInterface.cxx @@ -6,7 +6,7 @@ #include <StorageKit/AHCI.hpp> -using namespace NewOS; +using namespace Kernel; /// @brief Class constructor /// @param Out Disk output diff --git a/Kernel/Sources/Storage/ATADeviceInterface.cxx b/Kernel/Sources/Storage/ATADeviceInterface.cxx index 95aded72..8c45f31b 100644 --- a/Kernel/Sources/Storage/ATADeviceInterface.cxx +++ b/Kernel/Sources/Storage/ATADeviceInterface.cxx @@ -6,7 +6,7 @@ #include <StorageKit/ATA.hpp> -using namespace NewOS; +using namespace Kernel; /// @brief Class constructor /// @param Out Disk output diff --git a/Kernel/Sources/Storage/NVMEDeviceInterface.cxx b/Kernel/Sources/Storage/NVMEDeviceInterface.cxx index 1b85392e..9b2da7c2 100644 --- a/Kernel/Sources/Storage/NVMEDeviceInterface.cxx +++ b/Kernel/Sources/Storage/NVMEDeviceInterface.cxx @@ -6,10 +6,10 @@ #include <StorageKit/NVME.hpp> -namespace NewOS +namespace Kernel { const char* NVMEDeviceInterface::Name() const { return ("NVMEDeviceInterface"); } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/String.cxx b/Kernel/Sources/String.cxx index fab12226..8dd4b7bf 100644 --- a/Kernel/Sources/String.cxx +++ b/Kernel/Sources/String.cxx @@ -8,7 +8,7 @@ #include <NewKit/Utils.hpp> #include <KernelKit/DebugOutput.hpp> -namespace NewOS +namespace Kernel { Char* StringView::Data() { @@ -245,4 +245,4 @@ namespace NewOS return *this; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/ThreadLocalStorage.cxx b/Kernel/Sources/ThreadLocalStorage.cxx index 904488c1..40a7a75f 100644 --- a/Kernel/Sources/ThreadLocalStorage.cxx +++ b/Kernel/Sources/ThreadLocalStorage.cxx @@ -1,7 +1,7 @@ /* * ======================================================== * - * NewOS + * Kernel * Copyright Zeta Electronics Corporation, all rights reserved. * * ======================================================== @@ -17,7 +17,7 @@ /// @brief TLS implementation in kernel. /***********************************************************************************/ -using namespace NewOS; +using namespace Kernel; /** * @brief Check for cookie inside TIB. @@ -44,7 +44,7 @@ Boolean tls_check_tib(ThreadInformationBlock* tib) * @param stackPtr The call frame. * @return */ -EXTERN_C Void tls_check_syscall_impl(NewOS::VoidPtr TIB) noexcept +EXTERN_C Void tls_check_syscall_impl(Kernel::VoidPtr TIB) noexcept { if (!TIB) return; diff --git a/Kernel/Sources/Timer.cxx b/Kernel/Sources/Timer.cxx index 8a26e50c..38e58b70 100644 --- a/Kernel/Sources/Timer.cxx +++ b/Kernel/Sources/Timer.cxx @@ -9,7 +9,7 @@ ///! BUGS: 0 ///! @file Timer.cxx -using namespace NewOS; +using namespace Kernel; /// @brief Unimplemented as it is an interface. Int32 HardwareTimerInterface::Wait() noexcept diff --git a/Kernel/Sources/URL.cxx b/Kernel/Sources/URL.cxx index 80f4d9d5..8d31da7c 100644 --- a/Kernel/Sources/URL.cxx +++ b/Kernel/Sources/URL.cxx @@ -10,7 +10,7 @@ /// BUGS: 0 -namespace NewOS +namespace Kernel { URL::URL(StringView& strUrl) : fUrlView(strUrl, false) @@ -93,4 +93,4 @@ namespace NewOS return Ref<ErrorOr<StringView>>(loc); } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/UserHeap.cxx b/Kernel/Sources/UserHeap.cxx index f20e30f8..453d1f30 100644 --- a/Kernel/Sources/UserHeap.cxx +++ b/Kernel/Sources/UserHeap.cxx @@ -16,7 +16,7 @@ /// KernelHeap.cxx /// BUGS: 0 -namespace NewOS +namespace Kernel { /** * @brief Process Heap Header @@ -253,4 +253,4 @@ namespace NewOS return -1; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/Utils.cxx b/Kernel/Sources/Utils.cxx index a307d416..37269ca1 100644 --- a/Kernel/Sources/Utils.cxx +++ b/Kernel/Sources/Utils.cxx @@ -7,7 +7,7 @@ #include <NewKit/Utils.hpp> #include <KernelKit/DebugOutput.hpp> -namespace NewOS +namespace Kernel { Int rt_string_cmp(const Char* src, const Char* cmp, Size size) { @@ -208,45 +208,45 @@ namespace NewOS return str; } -} // namespace NewOS +} // namespace Kernel //////////////////////////////////////////////////////////////////////////////////////// /// Exported C functions //////////////////////////////////////////////////////////////////////////////////////// /// @brief memset in C++ -EXTERN_C void memset(void* dst, char src, NewOS::SizeT len) +EXTERN_C void memset(void* dst, char src, Kernel::SizeT len) { - NewOS::rt_set_memory(dst, src, len); + Kernel::rt_set_memory(dst, src, len); } /// @brief memcpy in C++ -EXTERN_C void memcpy(void* dst, void* src, NewOS::SizeT len) +EXTERN_C void memcpy(void* dst, void* src, Kernel::SizeT len) { - NewOS::rt_copy_memory(src, dst, len); + Kernel::rt_copy_memory(src, dst, len); } /// @brief memmove in C++ -EXTERN_C void* memmove(void* dst, void* src, NewOS::SizeT len) +EXTERN_C void* memmove(void* dst, void* src, Kernel::SizeT len) { - NewOS::rt_copy_memory(src, dst, len); + Kernel::rt_copy_memory(src, dst, len); return dst; } /// @brief strlen definition in C++. -EXTERN_C NewOS::SizeT strlen(const char* whatToCheck) +EXTERN_C Kernel::SizeT strlen(const char* whatToCheck) { - return NewOS::rt_string_len(whatToCheck); + return Kernel::rt_string_len(whatToCheck); } /// @brief memcmp in C++ -EXTERN_C NewOS::SizeT memcmp(void* dst, void* src, NewOS::SizeT len) +EXTERN_C Kernel::SizeT memcmp(void* dst, void* src, Kernel::SizeT len) { - return NewOS::rt_string_cmp((char*)src, (char*)dst, len); + return Kernel::rt_string_cmp((char*)src, (char*)dst, len); } /// @brief strcmp in C++ -EXTERN_C NewOS::SizeT strcmp(char* dst, char* src, NewOS::SizeT len) +EXTERN_C Kernel::SizeT strcmp(char* dst, char* src, Kernel::SizeT len) { - return NewOS::rt_string_cmp(src, dst, len); + return Kernel::rt_string_cmp(src, dst, len); } diff --git a/Kernel/Sources/Variant.cxx b/Kernel/Sources/Variant.cxx index fa74029d..7630f5db 100644 --- a/Kernel/Sources/Variant.cxx +++ b/Kernel/Sources/Variant.cxx @@ -6,7 +6,7 @@ #include <NewKit/Variant.hpp> -namespace NewOS +namespace Kernel { const Char* Variant::ToString() { @@ -21,4 +21,4 @@ namespace NewOS } } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/StorageKit/AHCI.hpp b/Kernel/StorageKit/AHCI.hpp index 3ccdce7a..af4a1327 100644 --- a/Kernel/StorageKit/AHCI.hpp +++ b/Kernel/StorageKit/AHCI.hpp @@ -10,7 +10,7 @@ #include <KernelKit/DriveManager.hxx> #include <NewKit/OwnPtr.hpp> -namespace NewOS +namespace Kernel { class AHCIDeviceInterface : public DeviceInterface<MountpointInterface*> { @@ -30,4 +30,4 @@ namespace NewOS private: void (*fCleanup)(void); }; -} // namespace NewOS
\ No newline at end of file +} // namespace Kernel
\ No newline at end of file diff --git a/Kernel/StorageKit/ATA.hpp b/Kernel/StorageKit/ATA.hpp index cfbe0da4..5c03f7ae 100644 --- a/Kernel/StorageKit/ATA.hpp +++ b/Kernel/StorageKit/ATA.hpp @@ -11,7 +11,7 @@ #include <NewKit/OwnPtr.hpp> #include <NewKit/Utils.hpp> -namespace NewOS +namespace Kernel { /// @brief ATA device interface type. class ATADeviceInterface : public DeviceInterface<MountpointInterface*> @@ -36,4 +36,4 @@ namespace NewOS private: void (*fCleanup)(void); }; -} // namespace NewOS
\ No newline at end of file +} // namespace Kernel
\ No newline at end of file diff --git a/Kernel/StorageKit/NVME.hpp b/Kernel/StorageKit/NVME.hpp index eda71b8d..c7ff0e66 100644 --- a/Kernel/StorageKit/NVME.hpp +++ b/Kernel/StorageKit/NVME.hpp @@ -10,7 +10,7 @@ #include <KernelKit/DriveManager.hxx> #include <NewKit/OwnPtr.hpp> -namespace NewOS +namespace Kernel { class NVMEDeviceInterface : public DeviceInterface<MountpointInterface*> { @@ -40,4 +40,4 @@ namespace NewOS private: void (*fCleanup)(void); }; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/StorageKit/PRDT.hpp b/Kernel/StorageKit/PRDT.hpp index f7ed9013..522e96fb 100644 --- a/Kernel/StorageKit/PRDT.hpp +++ b/Kernel/StorageKit/PRDT.hpp @@ -10,9 +10,9 @@ #include <KernelKit/PCI/Iterator.hpp> #include <NewKit/Ref.hpp> -#define kPrdtTransferSize (sizeof(NewOS::UShort)) +#define kPrdtTransferSize (sizeof(Kernel::UShort)) -namespace NewOS +namespace Kernel { /// @brief Tranfer information about PRD. enum kPRDTTransfer @@ -33,4 +33,4 @@ namespace NewOS void construct_prdt(Ref<PRDT>& prd); EXTERN_C Int32 kPRDTTransferStatus; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/amd64-efi.make b/Kernel/amd64-efi.make index e88741fc..7624c6fd 100644 --- a/Kernel/amd64-efi.make +++ b/Kernel/amd64-efi.make @@ -33,7 +33,7 @@ COPY = cp # Add assembler, linker, and object files variables. ASMFLAGS = -f win64 -# NewOS subsystem is 17 and entrypoint is __ImageStart +# Kernel subsystem is 17 and entrypoint is __ImageStart LDFLAGS = -e __ImageStart --subsystem=17 LDOBJ = Objects/*.obj |