diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libDDK/DriverKit/ObjectKit/Base.hpp (renamed from src/libDDK/DriverKit/ObjectKit/Base.h) | 1 | ||||
| -rw-r--r-- | src/libDDK/DriverKit/ObjectKit/Checksum.hpp (renamed from src/libDDK/DriverKit/ObjectKit/Checksum.h) | 12 | ||||
| -rw-r--r-- | src/libDDK/DriverKit/ObjectKit/DriverKit.hpp (renamed from src/libDDK/DriverKit/ObjectKit/DriverKit.h) | 8 | ||||
| -rw-r--r-- | src/libDDK/src/KernelDriverBase.cpp | 2 |
4 files changed, 12 insertions, 11 deletions
diff --git a/src/libDDK/DriverKit/ObjectKit/Base.h b/src/libDDK/DriverKit/ObjectKit/Base.hpp index 5b483617..869e6ec1 100644 --- a/src/libDDK/DriverKit/ObjectKit/Base.h +++ b/src/libDDK/DriverKit/ObjectKit/Base.hpp @@ -29,6 +29,7 @@ class IDriverBase { IDriverBase& operator=(const IDriverBase&) = default; IDriverBase(const IDriverBase&) = default; +public: using PtrType = void*; virtual constexpr bool IsCastable() { return false; } diff --git a/src/libDDK/DriverKit/ObjectKit/Checksum.h b/src/libDDK/DriverKit/ObjectKit/Checksum.hpp index 927bbb77..d1973161 100644 --- a/src/libDDK/DriverKit/ObjectKit/Checksum.h +++ b/src/libDDK/DriverKit/ObjectKit/Checksum.hpp @@ -6,11 +6,12 @@ #ifndef DRIVERKIT_CHECKSUM_H #define DRIVERKIT_CHECKSUM_H -#include <DriverKit/ObjectKit/Base.h> +#include <DriverKit/ObjectKit/Base.hpp> namespace Kernel::DDK { -using IndexableBlob = char*; +using Blob = char*; +using IndexableBlob = Blob; using Indexable = char; /// @note This uses the FNV 64-bit variant. @@ -22,19 +23,18 @@ inline uintptr_t rtl_checksum(const IndexableBlob path) { const uintptr_t kFNVPrime = 0x100000001b3ULL; uintptr_t hash = kFNVSeed; - IndexableBlob path_ = path; while (*path_) { - hash ^= (Indexable) (*path_++); + hash ^= (Indexable) (*path_); + ++path_; + hash *= kFNVPrime; } return hash; } -using Blob = void*; - } // namespace Kernel::DDK #endif diff --git a/src/libDDK/DriverKit/ObjectKit/DriverKit.h b/src/libDDK/DriverKit/ObjectKit/DriverKit.hpp index 3fc883fa..a5604c77 100644 --- a/src/libDDK/DriverKit/ObjectKit/DriverKit.h +++ b/src/libDDK/DriverKit/ObjectKit/DriverKit.hpp @@ -3,10 +3,10 @@ // Licensed under the Apache License, Version 2.0 (see LICENSE file) // Official repository: https://github.com/ne-foss-org/nekernel -#ifndef DRIVERKIT_DDK_H -#define DRIVERKIT_DDK_H +#ifndef DRIVERKIT_OBJECTKIT_DDK_H +#define DRIVERKIT_OBJECTKIT_DDK_H -#include <DriverKit/ObjectKit/Base.h> -#include <DriverKit/ObjectKit/Checksum.h> +#include <DriverKit/ObjectKit/Base.hpp> +#include <DriverKit/ObjectKit/Checksum.hpp> #endif diff --git a/src/libDDK/src/KernelDriverBase.cpp b/src/libDDK/src/KernelDriverBase.cpp index c81de2cf..67fd7466 100644 --- a/src/libDDK/src/KernelDriverBase.cpp +++ b/src/libDDK/src/KernelDriverBase.cpp @@ -3,4 +3,4 @@ // Licensed under the Apache License, Version 2.0 (see LICENSE file) // Official repository: https://github.com/ne-foss-org/nekernel -#include <DriverKit/ObjectKit/Base.h> +#include <DriverKit/ObjectKit/Base.hpp> |
