summaryrefslogtreecommitdiffhomepage
path: root/src/libDDK/DriverKit
diff options
context:
space:
mode:
Diffstat (limited to 'src/libDDK/DriverKit')
-rw-r--r--src/libDDK/DriverKit/ObjectKit/Base.hpp (renamed from src/libDDK/DriverKit/ObjectKit/Base.h)5
-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
3 files changed, 13 insertions, 12 deletions
diff --git a/src/libDDK/DriverKit/ObjectKit/Base.h b/src/libDDK/DriverKit/ObjectKit/Base.hpp
index bf557352..869e6ec1 100644
--- a/src/libDDK/DriverKit/ObjectKit/Base.h
+++ b/src/libDDK/DriverKit/ObjectKit/Base.hpp
@@ -10,7 +10,7 @@
#define DDK_DRIVER_IMPL \
final: \
- public \
+ public \
::Kernel::DDK::IDriverBase
/// @author Amlal El Mahrouss
@@ -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; }
@@ -41,7 +42,7 @@ class IDriverBase {
/// @author @amlel-el-mahrouss
template <typename Driver>
concept IsValidDriver = requires(Driver drv) {
- {drv.IsActive() && drv.Type() > kInvalidType};
+ { drv.IsActive() && drv.Type() > kInvalidType };
};
} // namespace Kernel::DDK
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