From c4f8ef91f18d854a4ede7a94e95b2eab898d6963 Mon Sep 17 00:00:00 2001 From: Jon Santmyer Date: Sun, 10 Aug 2025 15:40:19 -0400 Subject: working usermode objdir iteration --- device/initrd.c | 4 ++-- device/uart.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'device') diff --git a/device/initrd.c b/device/initrd.c index 36eefc6..1a04338 100644 --- a/device/initrd.c +++ b/device/initrd.c @@ -68,7 +68,7 @@ tar_parse(tar_block_t *block) .data = (uintptr_t)block }; - klogf("Load file '%s' at %p size %x\n", block->header.name, block + 1, file_size); + klogf("Load file '%s' at %p sie %x\n", block->header.name, block + 1, file_size); block = &block[(file_size / 512) + 1]; if(file_size % 512) block++; @@ -93,7 +93,7 @@ initrd_setup(void) .data = (uintptr_t)&s_initrd_dir }; //Add initrd dir to init object - ((init_data_t*)_initDirectory.entries[1].data)->initrd_dir = initrd_diri; + _initData.initrd_dir = initrd_diri; } int diff --git a/device/uart.c b/device/uart.c index 6728ab1..5c65207 100644 --- a/device/uart.c +++ b/device/uart.c @@ -1,10 +1,11 @@ #include "device/uart.h" #include "device/portio_uart.h" +#include "object.h" void -uart_write(objdir_t *dir, uint64_t entryi, const char *s, size_t w) +uart_write(objdir_t *dir, path_byte_t *path, const char *s, size_t w) { - objdir_entry_t *entry = objdir_seek(dir, entryi); + objdir_entry_t *entry = objdir_seek(dir, path, 1); if(entry == NULL || entry->type != KO_DEV_UART) return; #ifdef ENABLE_PORTIO_UART -- cgit v1.2.1