Merge branch 'dev' into 0xf00sec-patch-3

6 files changed, 17 insertions, 15 deletions

diff --git a/dev/ddk/DDKKit/ddk.h b/dev/ddk/DDKKit/ddk.h
index 888219c6..5a8929da 100644
--- a/dev/ddk/DDKKit/ddk.h
+++ b/dev/ddk/DDKKit/ddk.h
@@ -40,7 +40,7 @@ DDK_EXTERN void* ke_call(const char* name, int32_t cnt, void* dat, size_t sz);
 /// @brief add a system call.
 /// @param slot system call slot id.
 /// @param slotFn, syscall slot.
-DDK_EXTERN void ke_add_syscall(const int32_t slot, void (*slotFn)(void* a0));
+DDK_EXTERN void ke_set_syscall(const int32_t slot, void (*slotFn)(void* a0));
 
 /// @brief Allocates an heap ptr.
 /// @param sz size of the allocated struct/type.
@@ -65,10 +65,10 @@ DDK_EXTERN struct DDK_OBJECT_MANIFEST* ke_get_obj(const int slot, const char* na
 DDK_EXTERN void* ke_set_obj(const int32_t slot, const struct DDK_OBJECT_MANIFEST* ddk_pr);
 
 /// @brief The highest API version of the DDK.
-DDK_EXTERN int32_t kApiVersionHighest;
+DDK_EXTERN uint32_t kApiVersionHighest;
 
 /// @brief The lowest API version of the DDK.
-DDK_EXTERN int32_t kApiVersionLowest;
+DDK_EXTERN uint32_t kApiVersionLowest;
 
 /// @brief API version in BCD.
-DDK_EXTERN int32_t kApiVersion;
+DDK_EXTERN uint32_t kApiVersion;
diff --git a/dev/ddk/src/ddk_kernel_call.c b/dev/ddk/src/ddk_kernel_call.c
index b5c494f7..10f31e18 100644
--- a/dev/ddk/src/ddk_kernel_call.c
+++ b/dev/ddk/src/ddk_kernel_call.c
@@ -29,8 +29,8 @@ DDK_EXTERN void* ke_call(const char* name, int32_t cnt, void* data, size_t sz) {
 /// @brief Add system call.
 /// @param slot system call slot
 /// @param slotFn, syscall slot.
-DDK_EXTERN void ke_add_syscall(const int slot, void (*slotFn)(void* a0)) {
-  ke_call("ke_add_syscall", slot, slotFn, 1);
+DDK_EXTERN void ke_set_syscall(const int slot, void (*slotFn)(void* a0)) {
+  ke_call("ke_set_syscall", slot, slotFn, 1);
 }
 
 /// @brief Get a Kernel object.
@@ -39,7 +39,7 @@ DDK_EXTERN void ke_add_syscall(const int slot, void (*slotFn)(void* a0)) {
 /// @return Object manifest.
 DDK_EXTERN struct DDK_OBJECT_MANIFEST* ke_get_obj(const int slot, const char* name) {
   struct DDK_OBJECT_MANIFEST* manifest =
-      (struct DDK_OBJECT_MANIFEST*) ke_call("cf_get_kobj", slot, (void*) name, 1);
+      (struct DDK_OBJECT_MANIFEST*) ke_call("cfkit_get_kobj", slot, (void*) name, 1);
 
   if (!manifest) return nil;
 
@@ -52,5 +52,5 @@ DDK_EXTERN struct DDK_OBJECT_MANIFEST* ke_get_obj(const int slot, const char* na
 /// @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("cf_set_kobj", slot, (void*) ddk_pr, 1);
+  return ke_call("cfkit_set_kobj", slot, (void*) ddk_pr, 1);
 }
diff --git a/dev/ddk/src/ddk_ver.c b/dev/ddk/src/ddk_ver.c
index b2370b23..41c6c612 100644
--- a/dev/ddk/src/ddk_ver.c
+++ b/dev/ddk/src/ddk_ver.c
@@ -20,6 +20,6 @@
 #define kDDKVersion 1

 #endif  // !kDDKVersion

 

-int32_t kApiVersionHighest = kDDKVersionHighest;

-int32_t kApiVersionLowest  = kDDKVersionLowest;

-int32_t kApiVersion        = kDDKVersion;

+uint32_t kApiVersionHighest = kDDKVersionHighest;

+uint32_t kApiVersionLowest  = kDDKVersionLowest;

+uint32_t kApiVersion        = kDDKVersion;

diff --git a/dev/kernel/NeKit/Crc32.h b/dev/kernel/NeKit/Crc32.h
index 8988f828..0fc35134 100644
--- a/dev/kernel/NeKit/Crc32.h
+++ b/dev/kernel/NeKit/Crc32.h
@@ -16,7 +16,7 @@
 #define kCrcCnt (256)
 
 namespace Kernel {
-UInt32 ke_calculate_crc32(const Char* crc, Int32 len) noexcept;
+UInt32 ke_calculate_crc32(const VoidPtr crc, Int32 len) noexcept;
 }  // namespace Kernel
 
 #endif  // !CRC32_H
diff --git a/dev/kernel/src/Crc32.cc b/dev/kernel/src/Crc32.cc
index fddcb095..46a1d940 100644
--- a/dev/kernel/src/Crc32.cc
+++ b/dev/kernel/src/Crc32.cc
@@ -49,11 +49,13 @@ UInt32 kChecksumPolys[kCrcCnt] = {
 /// @param in the data to compute.
 /// @param len the length of the data.
 /// @return CRC32 of **in**.
-UInt32 ke_calculate_crc32(const Char* in, Int32 len) noexcept {
-  if (!in || *in == 0) return ~0;
+UInt32 ke_calculate_crc32(const VoidPtr inp, Int32 len) noexcept {
+  if (!inp) return ~0;
 
   UInt32 crc = 0xffffffff;
 
+  Char* in = static_cast<Char*>(inp);
+
   while ((len--) > 0) crc = (crc >> 8) ^ kChecksumPolys[(crc ^ *(in++)) & 0xFF];
 
   return ~crc;
diff --git a/dev/misc/BenchKit/X64Chrono.h b/dev/misc/BenchKit/X64Chrono.h
index ac92ebb1..728e7d60 100644
--- a/dev/misc/BenchKit/X64Chrono.h
+++ b/dev/misc/BenchKit/X64Chrono.h
@@ -33,7 +33,7 @@ class X64Chrono BENCHKIT_INTERFACE {
   X64Chrono()           = default;
   ~X64Chrono() override = default;
 
-  NE_COPY_DEFAULT(X64Chrono);
+  NE_COPY_DEFAULT(X64Chrono)
 
  public:
   Void Start() override { fStart = X64ChronoTraits::TickImpl_(); }