summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2024-12-30 20:26:54 +0100
committerAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2024-12-30 20:26:54 +0100
commit224e747b04022a5b8f8577fd730e907febf90a75 (patch)
tree1b8018bf33a9f504afc91a1d950b1bccaf9bf763
parent7f66876e3778273c9522961c6c67fe7bc3a16a35 (diff)
Add missing LPC error codes
Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
-rw-r--r--compile_flags.txt1
-rw-r--r--dev/Kernel/KernelKit/Heap.h6
-rw-r--r--dev/LibSCI/GPU.h20
-rw-r--r--dev/LibSCI/LPC.h2
-rw-r--r--dev/LibSCI/Macros.h6
-rw-r--r--dev/LibSCI/SysCalls.h20
-rw-r--r--dev/LibSCI/doc/LibSCI.drawio (renamed from dev/LibSCI/doc/SCIKit.drawio)0
-rw-r--r--dev/LibSCI/sci.json20
8 files changed, 17 insertions, 58 deletions
diff --git a/compile_flags.txt b/compile_flags.txt
index 763d789f..a1e6af54 100644
--- a/compile_flags.txt
+++ b/compile_flags.txt
@@ -1,5 +1,6 @@
-Idev/Kernel
-Idev/
+-Idev/LibSCI
-Idev/Boot/
-Iprivate/tools
-Idev/Boot/BootKit
diff --git a/dev/Kernel/KernelKit/Heap.h b/dev/Kernel/KernelKit/Heap.h
index f7d5d766..6ba146c0 100644
--- a/dev/Kernel/KernelKit/Heap.h
+++ b/dev/Kernel/KernelKit/Heap.h
@@ -7,9 +7,9 @@
#ifndef INC_KERNEL_HEAP_H
#define INC_KERNEL_HEAP_H
-// last-rev 30/01/24
-// file: Heap.h
-// description: heap allocation support.
+/// @date 30/01/24
+/// @file: Heap.h
+/// @brief: heap allocation support.
#include <NewKit/KernelPanic.h>
#include <KernelKit/LPC.h>
diff --git a/dev/LibSCI/GPU.h b/dev/LibSCI/GPU.h
index 2b0189e7..185c2c1f 100644
--- a/dev/LibSCI/GPU.h
+++ b/dev/LibSCI/GPU.h
@@ -12,14 +12,16 @@ Purpose: GFX System Calls.
#include <SCI.h>
-// ------------------------------------------------------------------------------------------ //
-// GPU API.
-// ------------------------------------------------------------------------------------------ //
-
-// ------------------------------------------------------------------------------------------ //
-// @brief Command buffer structure type.
-// ------------------------------------------------------------------------------------------ //
-struct GPU_CMD_BUFFER final
+struct GPUCmdBuffer;
+
+/// ------------------------------------------------------------------------------------------ //
+/// @brief GPU API.
+/// ------------------------------------------------------------------------------------------ //
+
+/// ------------------------------------------------------------------------------------------ //
+/// @brief Command buffer structure type.
+/// ------------------------------------------------------------------------------------------ //
+struct GPUCmdBuffer final
{
SizeT X, Y, Z;
VoidPtr FrameData;
@@ -45,6 +47,6 @@ IMPORT_C GPUObject GPUNewFromDeviceName(_Input const Char* device_name);
IMPORT_C SInt32 GPUDisposeDevice(GPUObject gpu_handle, Bool cancel_all, Bool flush_all);
-IMPORT_C SInt32 GPUSendCmdBufferListWithCnt(GPU_CMD_BUFFER** cmd_list, SizeT cmd_list_cnt);
+IMPORT_C SInt32 GPUSendCmdBufferListWithCnt(GPUCmdBuffer** cmd_list, SizeT cmd_list_cnt);
#endif // ifndef SCIKIT_GPU_H
diff --git a/dev/LibSCI/LPC.h b/dev/LibSCI/LPC.h
index d178effd..a00d8249 100644
--- a/dev/LibSCI/LPC.h
+++ b/dev/LibSCI/LPC.h
@@ -48,6 +48,8 @@ inline constexpr ErrObject kErrorIPC = 59;
inline constexpr ErrObject kErrorSign = 60;
inline constexpr ErrObject kErrorInvalidCreds = 61;
inline constexpr ErrObject kErrorCDTrayBroken = 62;
+inline constexpr ErrObject kErrorUnrecoverableDisk = 63;
+inline constexpr ErrObject kErrorFileLocked = 64;
inline constexpr ErrObject kErrorUnimplemented = 0;
/// @brief The last error reported by the system to the process.
diff --git a/dev/LibSCI/Macros.h b/dev/LibSCI/Macros.h
index 092ea30e..52608749 100644
--- a/dev/LibSCI/Macros.h
+++ b/dev/LibSCI/Macros.h
@@ -48,9 +48,3 @@ typedef IOObject FSObject;
typedef SCIObject DLLObject;
typedef SCIObject ThreadObject;
typedef SCIObject SocketObject;
-
-#ifdef SYSCALL_DECL
-#undef SYSCALL_DECL
-#endif // SYSCALL_DECL
-
-#define SYSCALL_DECL(NAME, ...) IMPORT_C VoidPtr NAME(__VA_ARGS__);
diff --git a/dev/LibSCI/SysCalls.h b/dev/LibSCI/SysCalls.h
deleted file mode 100644
index 5a04675d..00000000
--- a/dev/LibSCI/SysCalls.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* -------------------------------------------
-
-Copyright (C) 2024, Theater Quality Corp, all rights reserved.
-
-File: Macros.h
-Purpose: LibSCI Macros header.
-
-------------------------------------------- */
-
-#pragma once
-
-#include <Macros.h>
-
-/// @brief In this file we define filesystem calls.
-
-SYSCALL_DECL(FCloseFile, const SCIObject handle);
-SYSCALL_DECL(FOpenFile, const Char* name, const Char* rest);
-SYSCALL_DECL(FSeekFile, const SCIObject handle, const SizeT pos);
-SYSCALL_DECL(FReadFile, const SCIObject handle, const Char* out_buf, const SizeT out_buf_size);
-SYSCALL_DECL(FWriteFile, const SCIObject handle, const Char* out_buf, const SizeT out_buf_size);
diff --git a/dev/LibSCI/doc/SCIKit.drawio b/dev/LibSCI/doc/LibSCI.drawio
index 132eacc1..132eacc1 100644
--- a/dev/LibSCI/doc/SCIKit.drawio
+++ b/dev/LibSCI/doc/LibSCI.drawio
diff --git a/dev/LibSCI/sci.json b/dev/LibSCI/sci.json
deleted file mode 100644
index 34f4fb0a..00000000
--- a/dev/LibSCI/sci.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "compiler_path": "x86_64-w64-mingw32-g++",
- "compiler_std": "c++20",
- "headers_path": ["../", "./"],
- "sources_path": ["src/*.cc", "src/*.o"],
- "output_name": "LibSCI.dylib",
- "compiler_flags": [
- "-fPIC",
- "-ffreestanding",
- "-shared",
- "-fno-rtti",
- "-fno-exceptions",
- "-Wl,--subsystem=17"
- ],
- "cpp_macros": [
- "kSCIVersion=0x0100",
- "kSCIVersionHighest=0x0100",
- "kSCIVersionLowest=0x0100"
- ]
-}