diff options
| author | Jon Santmyer <jon@jonsantmyer.com> | 2025-08-11 19:04:26 -0400 |
|---|---|---|
| committer | Jon Santmyer <jon@jonsantmyer.com> | 2025-08-11 19:04:26 -0400 |
| commit | f466364b8a3858e7b3f19258d142851cb4a7e6d6 (patch) | |
| tree | a22819dc585c44a6dd0cdd5c6856420443a031eb /include | |
| parent | c4f8ef91f18d854a4ede7a94e95b2eab898d6963 (diff) | |
| download | jove-kernel-f466364b8a3858e7b3f19258d142851cb4a7e6d6.tar.gz jove-kernel-f466364b8a3858e7b3f19258d142851cb4a7e6d6.tar.bz2 jove-kernel-f466364b8a3858e7b3f19258d142851cb4a7e6d6.zip | |
remove _initData, replace with enum indexesmain
Diffstat (limited to 'include')
| -rw-r--r-- | include/arch/x86_64/object.h | 12 | ||||
| -rw-r--r-- | include/device/uart.h | 2 | ||||
| -rw-r--r-- | include/jove.h | 1 | ||||
| -rw-r--r-- | include/object.h | 13 | ||||
| -rw-r--r-- | include/syscall.h | 4 |
5 files changed, 12 insertions, 20 deletions
diff --git a/include/arch/x86_64/object.h b/include/arch/x86_64/object.h index 6512049..770487b 100644 --- a/include/arch/x86_64/object.h +++ b/include/arch/x86_64/object.h @@ -7,18 +7,6 @@ #define KERNEL_STACKBYTES 4096 #endif -typedef struct jove_InitData -{ - uint8_t log_object; - uint16_t untyped_data_dir; - uint16_t processor_dir; - uint8_t pm_object; //Page mapping object. - uint16_t initrd_dir; //Init ramdisk files directory. - uint8_t tcb_object; - uint8_t message_object; - uintptr_t message_object_address; -} init_data_t; - typedef struct jove_ThreadControlBlock { void *stack; diff --git a/include/device/uart.h b/include/device/uart.h index 9e5c3d3..ba36cbb 100644 --- a/include/device/uart.h +++ b/include/device/uart.h @@ -5,6 +5,6 @@ #include "object.h" -void uart_write(objdir_t *dir, path_byte_t *path, const char *s, size_t w); +void uart_write(objdir_t *dir, size_t pathw, path_byte_t *path, const char *s, size_t w); #endif diff --git a/include/jove.h b/include/jove.h index cbe1a77..63d2ce9 100644 --- a/include/jove.h +++ b/include/jove.h @@ -8,7 +8,6 @@ extern void (*_kernel_end)(void); #include "object.h" extern objdir_t _initDirectory; -extern init_data_t _initData; NORETURN void hcf(void); diff --git a/include/object.h b/include/object.h index 190b082..94e6b15 100644 --- a/include/object.h +++ b/include/object.h @@ -3,9 +3,16 @@ #include <stdint.h> -#if defined(__x86_64__) -#include "arch/x86_64/object.h" -#endif +enum { + INIT_OBJECT_ROOTDIR = 0, + INIT_OBJECT_PAGEMAP, + INIT_OBJECT_PROCESSOR_DIR, + INIT_OBJECT_UNTYPED_DIR, + INIT_OBJECT_INITRD_DIR, + INIT_OBJECT_TCB, + INIT_OBJECT_MESSAGE, + INIT_OBJECT_LOG +}; enum { diff --git a/include/syscall.h b/include/syscall.h index e70ba82..9025f57 100644 --- a/include/syscall.h +++ b/include/syscall.h @@ -21,12 +21,10 @@ enum /**@ENUM objdir invokes*/ enum { - /*[target path][u8 funcid][u8 ret]*/ - INVOKE_OBJDIR_NMEMB = 0, /*[target path][u8 funcid][u8 memb][u16 ret]*/ INVOKE_OBJDIR_GETMEMB, /*[target path][u8 funcid][u8 ret]*/ - INVOKE_OBJDIR_LASTFREE + INVOKE_OBJDIR_LASTMEMB }; /**@ENUM untyped invokes*/ enum |