diff options
| author | Amlal <amlal@nekernel.org> | 2025-04-25 13:08:33 +0200 |
|---|---|---|
| committer | Amlal <amlal@nekernel.org> | 2025-04-25 13:08:33 +0200 |
| commit | fb790b07aeba8e22e4190cf3e1834d11ecde6c96 (patch) | |
| tree | 4cec7d1b321307b1d5935577631dae116a658a37 /dev/ddk | |
| parent | 63a2d92c5dfe976175cda024ec01905d11b43738 (diff) | |
dev: better .clang-format, ran format command.
Signed-off-by: Amlal <amlal@nekernel.org>
Diffstat (limited to 'dev/ddk')
| -rw-r--r-- | dev/ddk/DDKKit/ddk.h | 52 | ||||
| -rw-r--r-- | dev/ddk/DDKKit/dev.h | 21 | ||||
| -rw-r--r-- | dev/ddk/DDKKit/io.h | 4 | ||||
| -rw-r--r-- | dev/ddk/DDKKit/str.h | 6 | ||||
| -rw-r--r-- | dev/ddk/src/ddk_alloc.c | 32 | ||||
| -rw-r--r-- | dev/ddk/src/ddk_dev.c | 22 | ||||
| -rw-r--r-- | dev/ddk/src/ddk_io.c | 41 | ||||
| -rw-r--r-- | dev/ddk/src/ddk_kernel_call.c | 36 | ||||
| -rw-r--r-- | dev/ddk/src/ddk_rt_cxx.cc | 24 | ||||
| -rw-r--r-- | dev/ddk/src/ddk_str.c | 40 | ||||
| -rw-r--r-- | dev/ddk/src/ddk_ver.c | 12 |
11 files changed, 130 insertions, 160 deletions
diff --git a/dev/ddk/DDKKit/ddk.h b/dev/ddk/DDKKit/ddk.h index 04d067ae..b7bcd52c 100644 --- a/dev/ddk/DDKKit/ddk.h +++ b/dev/ddk/DDKKit/ddk.h @@ -1,36 +1,36 @@ /* ------------------------------------------- - Copyright Amlal El Mahrouss. + Copyright Amlal El Mahrouss. - FILE: ddk.h - PURPOSE: DDK Driver model base header. + FILE: ddk.h + PURPOSE: DDK Driver model base header. ------------------------------------------- */ #pragma once -#include <stdint.h> #include <stddef.h> +#include <stdint.h> #if defined(__cplusplus) -#define BOOL bool -#define YES true -#define NO false +#define BOOL bool +#define YES true +#define NO false #define DDK_EXTERN extern "C" __declspec(dllexport) -#define nil nullptr +#define nil nullptr #undef NULL -#define NULL 0 +#define NULL 0 #define DDK_FINAL final #else -#define BOOL char -#define YES 1 -#define NO 0 +#define BOOL char +#define YES 1 +#define NO 0 #define DDK_EXTERN extern __declspec(dllexport) -#define nil ((void*)0) +#define nil ((void*) 0) #undef NULL -#define NULL ((void*)0) +#define NULL ((void*) 0) #define DDK_FINAL -#endif // defined(__cplusplus) +#endif // defined(__cplusplus) #ifndef __DDK__ #undef DDK_EXTERN @@ -45,26 +45,24 @@ #ifndef __NEOSKRNL__ #error !!! Do not include header in EL0/Ring 3 mode !!! -#endif // __MINOSKRNL__ +#endif // __MINOSKRNL__ struct DDK_STATUS_STRUCT; struct DDK_OBJECT_MANIFEST; /// \brief Object handle manifest. -struct DDK_OBJECT_MANIFEST DDK_FINAL -{ - char* p_name; - int32_t p_kind; - void* p_object; +struct DDK_OBJECT_MANIFEST DDK_FINAL { + char* p_name; + int32_t p_kind; + void* p_object; }; /// \brief DDK status ping structure. -struct DDK_STATUS_STRUCT DDK_FINAL -{ - int32_t s_action_id; - int32_t s_issuer_id; - int32_t s_group_id; - void* s_object; +struct DDK_STATUS_STRUCT DDK_FINAL { + int32_t s_action_id; + int32_t s_issuer_id; + int32_t s_group_id; + void* s_object; }; /// @brief Call Kernel procedure. diff --git a/dev/ddk/DDKKit/dev.h b/dev/ddk/DDKKit/dev.h index 80cb77c9..6c8a828e 100644 --- a/dev/ddk/DDKKit/dev.h +++ b/dev/ddk/DDKKit/dev.h @@ -1,9 +1,9 @@ /* ------------------------------------------- - Copyright Amlal El Mahrouss. + Copyright Amlal El Mahrouss. - File: dev.h - Purpose: DDK device support. + File: dev.h + Purpose: DDK device support. ------------------------------------------- */ @@ -16,14 +16,13 @@ struct _DDK_DEVICE; #define DDK_DEVICE_NAME_LEN (255) /// @brief Kernel Device driver. -typedef struct _DDK_DEVICE DDK_FINAL -{ - char d_name[DDK_DEVICE_NAME_LEN]; // the device name. Could be /./DEVICE_NAME/ - void* (*d_read)(void* arg, int len); // read from device. - void (*d_write)(void* arg, int len); - void (*d_wait)(void); // write to device. - struct _DDK_DEVICE* (*d_open)(const char* path); // open device. - void (*d_close)(struct _DDK_DEVICE* dev); // close device. +typedef struct _DDK_DEVICE DDK_FINAL { + char d_name[DDK_DEVICE_NAME_LEN]; // the device name. Could be /./DEVICE_NAME/ + void* (*d_read)(void* arg, int len); // read from device. + void (*d_write)(void* arg, int len); + void (*d_wait)(void); // write to device. + struct _DDK_DEVICE* (*d_open)(const char* path); // open device. + void (*d_close)(struct _DDK_DEVICE* dev); // close device. } DDK_DEVICE, *DDK_DEVICE_PTR; /// @brief Open a new device from path. diff --git a/dev/ddk/DDKKit/io.h b/dev/ddk/DDKKit/io.h index 076af518..28396608 100644 --- a/dev/ddk/DDKKit/io.h +++ b/dev/ddk/DDKKit/io.h @@ -1,8 +1,8 @@ /* ------------------------------------------- - Copyright Amlal El Mahrouss. + Copyright Amlal El Mahrouss. - Purpose: DDK Text I/O. + Purpose: DDK Text I/O. ------------------------------------------- */ diff --git a/dev/ddk/DDKKit/str.h b/dev/ddk/DDKKit/str.h index cb4a7d36..fbf6506d 100644 --- a/dev/ddk/DDKKit/str.h +++ b/dev/ddk/DDKKit/str.h @@ -1,8 +1,8 @@ /* ------------------------------------------- - Copyright Amlal El Mahrouss. + Copyright Amlal El Mahrouss. - Purpose: DDK Strings. + Purpose: DDK Strings. ------------------------------------------- */ @@ -14,4 +14,4 @@ /// @file str.h DDK_EXTERN size_t kstrlen(const char* in); -DDK_EXTERN int kstrncpy(char* dst, const char* src, size_t len); +DDK_EXTERN int kstrncpy(char* dst, const char* src, size_t len); diff --git a/dev/ddk/src/ddk_alloc.c b/dev/ddk/src/ddk_alloc.c index 17d83d13..6daafb7e 100644 --- a/dev/ddk/src/ddk_alloc.c +++ b/dev/ddk/src/ddk_alloc.c @@ -1,36 +1,32 @@ /* ------------------------------------------- - Copyright Amlal El Mahrouss. + Copyright Amlal El Mahrouss. - Purpose: DDK allocator. + Purpose: DDK allocator. ------------------------------------------- */ #include <DDKKit/ddk.h> /** - \brief Allocates a new heap on the Kernel's side. - \param sz the size of the heap block. - \return the newly allocated pointer. + \brief Allocates a new heap on the Kernel's side. + \param sz the size of the heap block. + \return the newly allocated pointer. */ -DDK_EXTERN void* kalloc(size_t sz) -{ - if (!sz) - ++sz; +DDK_EXTERN void* kalloc(size_t sz) { + if (!sz) ++sz; - void* ptr = ke_call("mm_new_heap", 1, &sz, sizeof(size_t)); + void* ptr = ke_call("mm_new_heap", 1, &sz, sizeof(size_t)); - return ptr; + return ptr; } /** - \brief Frees a pointer from the heap. - \param ptr the pointer to free. + \brief Frees a pointer from the heap. + \param ptr the pointer to free. */ -DDK_EXTERN void kfree(void* ptr) -{ - if (!ptr) - return; +DDK_EXTERN void kfree(void* ptr) { + if (!ptr) return; - ke_call("mm_delete_heap", 1, ptr, 0); + ke_call("mm_delete_heap", 1, ptr, 0); } diff --git a/dev/ddk/src/ddk_dev.c b/dev/ddk/src/ddk_dev.c index 86b8466f..281e48c7 100644 --- a/dev/ddk/src/ddk_dev.c +++ b/dev/ddk/src/ddk_dev.c @@ -1,8 +1,8 @@ /* ------------------------------------------- - Copyright Amlal El Mahrouss. + Copyright Amlal El Mahrouss. - Purpose: DDK Text I/O. + Purpose: DDK Text I/O. ------------------------------------------- */ @@ -10,21 +10,17 @@ #include <DDKKit/str.h> /// @brief Open a new binary device from path. -DDK_EXTERN DDK_DEVICE_PTR open(const char* devicePath) -{ - if (!devicePath) - return nil; +DDK_EXTERN DDK_DEVICE_PTR open(const char* devicePath) { + if (!devicePath) return nil; - return ke_call("sk_open_dev", 1, (void*)devicePath, kstrlen(devicePath)); + return ke_call("sk_open_dev", 1, (void*) devicePath, kstrlen(devicePath)); } /// @brief Close any device. /// @param device valid device. -DDK_EXTERN BOOL close(DDK_DEVICE_PTR device) -{ - if (!device) - return NO; +DDK_EXTERN BOOL close(DDK_DEVICE_PTR device) { + if (!device) return NO; - ke_call("sk_close_dev", 1, device, sizeof(DDK_DEVICE)); - return YES; + ke_call("sk_close_dev", 1, device, sizeof(DDK_DEVICE)); + return YES; } diff --git a/dev/ddk/src/ddk_io.c b/dev/ddk/src/ddk_io.c index c0e672bd..ba6d4e55 100644 --- a/dev/ddk/src/ddk_io.c +++ b/dev/ddk/src/ddk_io.c @@ -1,37 +1,32 @@ /* ------------------------------------------- - Copyright Amlal El Mahrouss. + Copyright Amlal El Mahrouss. - Purpose: DDK Text I/O. + Purpose: DDK Text I/O. ------------------------------------------- */ #include <DDKKit/io.h> -DDK_EXTERN void kputc(const char ch) -{ - char assembled[2] = {0}; - assembled[0] = ch; - assembled[1] = 0; +DDK_EXTERN void kputc(const char ch) { + char assembled[2] = {0}; + assembled[0] = ch; + assembled[1] = 0; - ke_call("ke_put_string", 1, assembled, 1); + ke_call("ke_put_string", 1, assembled, 1); } /// @brief print string to UART. /// @param message UART to transmit. -DDK_EXTERN void kprint(const char* message) -{ - if (!message) - return; - if (*message == 0) - return; - - size_t index = 0; - size_t len = kstrlen(message); - - while (index < len) - { - kputc(message[index]); - ++index; - } +DDK_EXTERN void kprint(const char* message) { + if (!message) return; + if (*message == 0) return; + + size_t index = 0; + size_t len = kstrlen(message); + + while (index < len) { + kputc(message[index]); + ++index; + } } diff --git a/dev/ddk/src/ddk_kernel_call.c b/dev/ddk/src/ddk_kernel_call.c index e929eae4..b5c494f7 100644 --- a/dev/ddk/src/ddk_kernel_call.c +++ b/dev/ddk/src/ddk_kernel_call.c @@ -1,8 +1,8 @@ /* ------------------------------------------- - Copyright Amlal El Mahrouss. + Copyright Amlal El Mahrouss. - Purpose: DDK Kernel call. + Purpose: DDK Kernel call. ------------------------------------------- */ @@ -10,7 +10,8 @@ #include <stdarg.h> /// @brief this is an internal call, do not use it. -DDK_EXTERN ATTRIBUTE(naked) void* ke_call_dispatch(const char* name, int32_t cnt, void* data, size_t sz); +DDK_EXTERN ATTRIBUTE(naked) void* ke_call_dispatch(const char* name, int32_t cnt, void* data, + size_t sz); /// @brief Interupt Kernel and call it's RPC. /// @param KernelRpcName RPC name @@ -19,34 +20,30 @@ DDK_EXTERN ATTRIBUTE(naked) void* ke_call_dispatch(const char* name, int32_t cnt /// @param sz The size of the whole data pointer. /// @retval void* Kernel call was successful. /// @retval nil Kernel call failed, call KernelLastError(void) -DDK_EXTERN void* ke_call(const char* name, int32_t cnt, void* data, size_t sz) -{ - if (!name || *name == 0 || cnt == 0) - return nil; +DDK_EXTERN void* ke_call(const char* name, int32_t cnt, void* data, size_t sz) { + if (!name || *name == 0 || cnt == 0) return nil; - return ke_call_dispatch(name, cnt, data, sz); + return ke_call_dispatch(name, cnt, data, 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_add_syscall(const int slot, void (*slotFn)(void* a0)) { + ke_call("ke_add_syscall", slot, slotFn, 1); } /// @brief Get a Kernel object. /// @param slot property id (always 0) /// @param name the object's name. /// @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); +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); - if (!manifest) - return nil; + if (!manifest) return nil; - return manifest; + return manifest; } /// @brief Set a Kernel object. @@ -54,7 +51,6 @@ 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("cf_set_kobj", slot, (void*)ddk_pr, 1); +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); } diff --git a/dev/ddk/src/ddk_rt_cxx.cc b/dev/ddk/src/ddk_rt_cxx.cc index da62b88d..7daf0fcc 100644 --- a/dev/ddk/src/ddk_rt_cxx.cc +++ b/dev/ddk/src/ddk_rt_cxx.cc @@ -1,29 +1,25 @@ /* ------------------------------------------- - Copyright Amlal El Mahrouss. + Copyright Amlal El Mahrouss. - Purpose: DDK C++ runtime. + Purpose: DDK C++ runtime. ------------------------------------------- */ #include <DDKKit/ddk.h> -void* operator new(size_t sz) -{ - return kalloc(sz); +void* operator new(size_t sz) { + return kalloc(sz); } -void operator delete(void* ptr) -{ - kfree(ptr); +void operator delete(void* ptr) { + kfree(ptr); } -void* operator new[](size_t sz) -{ - return kalloc(sz); +void* operator new[](size_t sz) { + return kalloc(sz); } -void operator delete[](void* ptr) -{ - kfree(ptr); +void operator delete[](void* ptr) { + kfree(ptr); } diff --git a/dev/ddk/src/ddk_str.c b/dev/ddk/src/ddk_str.c index 5b5c615a..d50a5d03 100644 --- a/dev/ddk/src/ddk_str.c +++ b/dev/ddk/src/ddk_str.c @@ -1,40 +1,34 @@ /* ------------------------------------------- - Copyright Amlal El Mahrouss. + Copyright Amlal El Mahrouss. - Purpose: DDK Strings. + Purpose: DDK Strings. ------------------------------------------- */ #include <DDKKit/str.h> -DDK_EXTERN size_t kstrlen(const char* in) -{ - if (in == nil) - return 0; +DDK_EXTERN size_t kstrlen(const char* in) { + if (in == nil) return 0; - if (*in == 0) - return 0; + if (*in == 0) return 0; - size_t index = 0; + size_t index = 0; - while (in[index] != 0) - { - ++index; - } + while (in[index] != 0) { + ++index; + } - return index; + return index; } -DDK_EXTERN int kstrncpy(char* dst, const char* src, size_t len) -{ - size_t index = 0; +DDK_EXTERN int kstrncpy(char* dst, const char* src, size_t len) { + size_t index = 0; - while (index != len) - { - dst[index] = src[index]; - ++index; - } + while (index != len) { + dst[index] = src[index]; + ++index; + } - return index; + return index; } diff --git a/dev/ddk/src/ddk_ver.c b/dev/ddk/src/ddk_ver.c index eae27744..b2370b23 100644 --- a/dev/ddk/src/ddk_ver.c +++ b/dev/ddk/src/ddk_ver.c @@ -1,8 +1,8 @@ /* -------------------------------------------
- Copyright Amlal El Mahrouss.
+ Copyright Amlal El Mahrouss.
- Purpose: DDK version symbols.
+ Purpose: DDK version symbols.
------------------------------------------- */
@@ -10,16 +10,16 @@ #ifndef kDDKVersionHighest
#define kDDKVersionHighest 1
-#endif // !kDDKVersionHighest
+#endif // !kDDKVersionHighest
#ifndef kDDKVersionLowest
#define kDDKVersionLowest 1
-#endif // !kDDKVersionLowest
+#endif // !kDDKVersionLowest
#ifndef kDDKVersion
#define kDDKVersion 1
-#endif // !kDDKVersion
+#endif // !kDDKVersion
int32_t kApiVersionHighest = kDDKVersionHighest;
int32_t kApiVersionLowest = kDDKVersionLowest;
-int32_t kApiVersion = kDDKVersion;
+int32_t kApiVersion = kDDKVersion;
|
