diff options
Diffstat (limited to 'src/libDDK')
| -rw-r--r-- | src/libDDK/DriverKit/c++/checksum.h | 33 | ||||
| -rw-r--r-- | src/libDDK/DriverKit/c++/ddk.h | 4 | ||||
| -rw-r--r-- | src/libDDK/DriverKit/c++/driver_base.h | 5 | ||||
| -rw-r--r-- | src/libDDK/DriverKit/ddk.h | 16 | ||||
| -rw-r--r-- | src/libDDK/src/ddk_kernel_call.c | 9 |
5 files changed, 49 insertions, 18 deletions
diff --git a/src/libDDK/DriverKit/c++/checksum.h b/src/libDDK/DriverKit/c++/checksum.h index 34a49675..4cc87423 100644 --- a/src/libDDK/DriverKit/c++/checksum.h +++ b/src/libDDK/DriverKit/c++/checksum.h @@ -1,10 +1,39 @@ -// Copyright 2024-2025, Amlal El Mahrouss (amlal@nekernel.org) +// Copyright 2024-2026, Amlal El Mahrouss (amlal@nekernel.org) // Licensed under the Apache License, Version 2.0 (see LICENSE file) // Official repository: https://github.com/nekernel-org/nekernel #ifndef DRIVERKIT_CHECKSUM_H #define DRIVERKIT_CHECKSUM_H -/// @todo Driver checksum +#include <DriverKit/c++/driver_base.h> + +namespace Kernel::DDK { + +using IndexableBlob = Char*; + +/// @note This uses the FNV 64-bit variant. +/// @brief Performs a checksum computation for a memory region. +inline UInt64 rtl_checksum(const IndexableBlob path) { + if (!path || *path == 0) return 0; + + const UInt64 kFNVSeed = 0xcbf29ce484222325ULL; + const UInt64 kFNVPrime = 0x100000001b3ULL; + + UInt64 hash = kFNVSeed; + + IndexableBlob path_ = path; + + while (*path_) { + hash ^= (Char) (*path_++); + hash *= kFNVPrime; + } + + return hash; +} + +using Blob = VoidPtr; + +} + #endif diff --git a/src/libDDK/DriverKit/c++/ddk.h b/src/libDDK/DriverKit/c++/ddk.h index f9b6b8d1..857a65a7 100644 --- a/src/libDDK/DriverKit/c++/ddk.h +++ b/src/libDDK/DriverKit/c++/ddk.h @@ -1,11 +1,11 @@ -// Copyright 2024-2025, Amlal El Mahrouss (amlal@nekernel.org) +// Copyright 2024-2026, Amlal El Mahrouss (amlal@nekernel.org) // Licensed under the Apache License, Version 2.0 (see LICENSE file) // Official repository: https://github.com/nekernel-org/nekernel #ifndef DRIVERKIT_DDK_H #define DRIVERKIT_DDK_H -#include <DriverKit/c++/checksum.h> #include <DriverKit/c++/driver_base.h> +#include <DriverKit/c++/checksum.h> #endif diff --git a/src/libDDK/DriverKit/c++/driver_base.h b/src/libDDK/DriverKit/c++/driver_base.h index e5147b77..82e5bd44 100644 --- a/src/libDDK/DriverKit/c++/driver_base.h +++ b/src/libDDK/DriverKit/c++/driver_base.h @@ -5,11 +5,12 @@ #ifndef DRIVERKIT_DRIVER_BASE_H #define DRIVERKIT_DRIVER_BASE_H +#include <CompilerKit/CompilerKit.h> #include <libDDK/DriverKit/macros.h> #define DDK_DRIVER_IMPL \ final: \ - public \ + public \ ::Kernel::DDK::IDriverBase /// @author Amlal El Mahrouss @@ -38,7 +39,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/ddk.h b/src/libDDK/DriverKit/ddk.h index fa6a90ed..2ff2db9e 100644 --- a/src/libDDK/DriverKit/ddk.h +++ b/src/libDDK/DriverKit/ddk.h @@ -10,11 +10,18 @@ struct DDK_STATUS_STRUCT; struct DDK_OBJECT_MANIFEST; +typedef void* ptr_t; + +typedef ptr_t addr_t; + +typedef ptr_t vaddr_t; +typedef ptr_t paddr_t; + /// \brief Object handle manifest. struct DDK_OBJECT_MANIFEST DDK_FINAL { char* p_name; int32_t p_kind; - void* p_object; + ptr_t p_object; }; /// \brief DDK status ping structure. @@ -25,13 +32,6 @@ struct DDK_STATUS_STRUCT DDK_FINAL { struct DDK_OBJECT_MANIFEST* s_object; }; -typedef void* ptr_t; - -typedef ptr_t addr_t; - -typedef ptr_t vaddr_t; -typedef ptr_t paddr_t; - /// @brief Call Kernel procedure. /// @param name the procedure name. /// @param cnt number of elements in **dat** diff --git a/src/libDDK/src/ddk_kernel_call.c b/src/libDDK/src/ddk_kernel_call.c index d69b1f59..2c75ee07 100644 --- a/src/libDDK/src/ddk_kernel_call.c +++ b/src/libDDK/src/ddk_kernel_call.c @@ -13,7 +13,7 @@ /// @brief this is an internal call, do not use it. DDK_EXTERN ATTRIBUTE(naked) /* */ - ptr_t __ke_call_dispatch(const int32_t name, int32_t cnt, void* data, size_t sz); +ptr_t __ke_call_dispatch(const int32_t name, int32_t cnt, void* data, size_t sz); /// @brief This function hashes the path into a FNV symbol. /// @param path the path to hash. @@ -51,7 +51,7 @@ DDK_EXTERN void* ke_call_dispatch(const char* name, int32_t cnt, void* data, siz /// @param slot system call slot /// @param slotFn, syscall slot. DDK_EXTERN void ke_set_syscall(const int slot, void (*slotFn)(void* a0)) { - ke_call_dispatch("ke_set_syscall", slot, slotFn, 1); + ke_call_dispatch("ke_set_syscall", slot, (ptr_t)slotFn, 1); } /// @brief Get a Kernel object. @@ -72,6 +72,7 @@ DDK_EXTERN struct DDK_OBJECT_MANIFEST* ke_get_obj(const int slot, const char* na /// @param name the object's name. /// @param ddk_pr pointer to a object's DDK_OBJECT_MANIFEST. /// @return property's object. -DDK_EXTERN void* ke_set_obj(const int slot, const struct DDK_OBJECT_MANIFEST* ddk_pr) { - return ke_call_dispatch("cfkit_set_kobj", slot, (void*) ddk_pr, 1); +DDK_EXTERN void* ke_set_obj(const int slot, const struct DDK_OBJECT_MANIFEST* ddk_ptr) { + if (ddk_ptr == nil) return nil; + return ke_call_dispatch("cfkit_set_kobj", slot, (void*) ddk_ptr, 1); } |
