chore: kernel API build

moodyhunter · Feb 9, 2025 · d1af7ae · d1af7ae
1 parent dc49657
commit d1af7ae
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -74,7 +74,11 @@ add_subdirectory(kernel)
 include(add_mos_library)
 add_subdirectory(libs)
 
-add_subdirectory(userspace)
+if (__MOS_HAS_NO_COMPILER)
+    message(WARNING "Skipping userspace build because __MOS_HAS_NO_COMPILER is set.")
+else()
+    add_subdirectory(userspace)
+endif()
 add_subdirectory(tools)
 
 # include custom configuration

diff --git a/...4/include/public/mos/platform_syscall.hpp → ...v64/include/public/mos/platform_syscall.h b/...4/include/public/mos/platform_syscall.hpp → ...v64/include/public/mos/platform_syscall.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <mos/mos_global.h>
-#include <mos/types.hpp>
+#include <mos/types.h>
 
 enum
 {

diff --git a/...4/include/public/mos/platform_syscall.hpp → ..._64/include/public/mos/platform_syscall.h b/...4/include/public/mos/platform_syscall.hpp → ..._64/include/public/mos/platform_syscall.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include <mos/mos_global.h>
-#include <mos/types.hpp>
+#include <mos/types.h>
 
 enum
 {

diff --git a/kernel/arch/x86_64/x86_platform_api.cpp b/kernel/arch/x86_64/x86_platform_api.cpp
@@ -10,7 +10,7 @@
 #include <mos/mm/physical/pmm.hpp>
 #include <mos/mos_global.h>
 #include <mos/platform/platform.hpp>
-#include <mos/platform_syscall.hpp>
+#include <mos/platform_syscall.h>
 #include <mos/syslog/printk.hpp>
 #include <mos/tasks/process.hpp>
 #include <mos/tasks/task_types.hpp>

diff --git a/kernel/filesystem/userfs/userfs.cpp b/kernel/filesystem/userfs/userfs.cpp
@@ -17,7 +17,6 @@
 #include <librpc/rpc_client.h>
 #include <librpc/rpc_server.h>
 #include <mos/filesystem/fs_types.h>
-#include <mos/proto/fs_server.h>
 #include <mos_stdio.hpp>
 #include <mos_stdlib.hpp>
 #include <mos_string.hpp>

diff --git a/kernel/include/private/mos/types.hpp b/kernel/include/private/mos/types.hpp
@@ -75,7 +75,7 @@ class PtrResult
 
     T *get() const
     {
-        return const_cast<T *>(value);
+        return value;
     }
 
     bool isErr() const

diff --git a/kernel/include/public/mos/proto/fs_server.h b/kernel/include/public/mos/proto/fs_server.h
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#define USERFS_SERVER_RPC_NAME "mos.userfs-manager"
+
+#define USERFS_MANAGER_X(ARGS, PB, xarg)                                                                                                                                 \
+    /**/                                                                                                                                                                 \
+    PB(xarg, 0, register_fs, REGISTER_FS, mos_rpc_fs_register_request, mos_rpc_fs_register_response)
+
+#define USERFS_IMPL_X(ARGS, PB, xarg)                                                                                                                                    \
+    PB(xarg, 0, mount, MOUNT, mos_rpc_fs_mount_request, mos_rpc_fs_mount_response)                                                                                       \
+    PB(xarg, 1, readdir, READDIR, mos_rpc_fs_readdir_request, mos_rpc_fs_readdir_response)                                                                               \
+    PB(xarg, 2, lookup, LOOKUP, mos_rpc_fs_lookup_request, mos_rpc_fs_lookup_response)                                                                                   \
+    PB(xarg, 3, readlink, READLINK, mos_rpc_fs_readlink_request, mos_rpc_fs_readlink_response)                                                                           \
+    PB(xarg, 4, getpage, GETPAGE, mos_rpc_fs_getpage_request, mos_rpc_fs_getpage_response)                                                                               \
+    PB(xarg, 5, putpage, PUTPAGE, mos_rpc_fs_putpage_request, mos_rpc_fs_putpage_response)                                                                               \
+    PB(xarg, 6, create_file, CREATE_FILE, mos_rpc_fs_create_file_request, mos_rpc_fs_create_file_response)                                                               \
+    PB(xarg, 7, sync_inode, SYNC_INODE, mos_rpc_fs_sync_inode_request, mos_rpc_fs_sync_inode_response)                                                                   \
+    PB(xarg, 8, unlink, UNLINK, mos_rpc_fs_unlink_request, mos_rpc_fs_unlink_response)\
diff --git a/userspace/drivers/fs/ext4/ext4fs.hpp b/userspace/drivers/fs/ext4/ext4fs.hpp
@@ -17,7 +17,6 @@
 #include <librpc/rpc_server++.hpp>
 #include <memory>
 #include <mos/filesystem/fs_types.h>
-#include <mos/proto/fs_server.h>
 #include <pb_decode.h>
 
 using namespace std::string_literals;

diff --git a/userspace/drivers/fs/ext4/main.cpp b/userspace/drivers/fs/ext4/main.cpp
@@ -2,6 +2,7 @@
 
 #include "blockdev.h"
 #include "ext4fs.hpp"
+#include "mos/proto/fs_server.h"
 #include "proto/blockdev.services.h"
 #include "proto/userfs-manager.services.h"